diff --git a/.github/classifier.json b/.github/classifier.json
index dad8fe6cb761e7..19bbd7d578d483 100644
--- a/.github/classifier.json
+++ b/.github/classifier.json
@@ -5,34 +5,41 @@
 		"nameToOverrideAccuracyOf": {"accuracy": 0.8}
 	},
 	"labels": {
-		"L10N": {"assign": ["TylerLeonhardt", "csigs"]},
-		"VIM": {"assign": []},
 		"accessibility": { "assign": ["meganrogge"]},
 		"api": {"assign": ["jrieken"]},
 		"api-finalization": {"assign": []},
 		"api-proposal": {"assign": ["jrieken"]},
 		"authentication": {"assign": ["TylerLeonhardt"]},
+		"bisect-ext": {"assign": ["jrieken"]},
+		"bot-proposal": {"assign": ["lramos15"]},
 		"bracket-pair-colorization": {"assign": ["hediet"]},
 		"bracket-pair-guides": {"assign": ["hediet"]},
 		"breadcrumbs": {"assign": ["jrieken"]},
 		"callhierarchy": {"assign": ["jrieken"]},
+		"chrome-devtools": {"assign": ["deepak1556"]},
+		"cloud-changes": {"assign": ["joyceerhl"]},
+		"code-cli": {"assign": ["connor4312"]},
 		"code-lens": {"assign": ["jrieken"]},
-		"color-palette": {"assign": []},
+		"code-server-web": {"assign": ["aeschli"]},
+		"command-center": {"assign": ["jrieken"]},
 		"comments": {"assign": ["alexr00"]},
 		"config": {"assign": ["sandy081"]},
-		"context-keys": {"assign": []},
+		"containers": {"assign": ["chrmarti"]},
+		"context-keys": {"assign": ["alexdima"]},
+		"continue-working-on": {"assign": ["joyceerhl"]},
 		"css-less-scss": {"assign": ["aeschli"]},
 		"custom-editors": {"assign": ["mjbvz"]},
 		"debug": {"assign": ["roblourens"]},
+		"debug-disassembly": {"assign": []},
 		"dialogs": {"assign": ["sbatten"]},
 		"diff-editor": {"assign": ["alexdima"]},
-		"dropdown": {"assign": []},
+		"dropdown": {"assign": ["lramos15"]},
 		"editor-api": {"assign": ["alexdima"]},
 		"editor-autoclosing": {"assign": ["alexdima"]},
 		"editor-autoindent": {"assign": ["rebornix"]},
 		"editor-bracket-matching": {"assign": ["hediet"]},
 		"editor-clipboard": {"assign": ["alexdima", "rebornix"]},
-		"editor-code-actions": {"assign": []},
+		"editor-code-actions": {"assign": ["mjbvz"]},
 		"editor-color-picker": {"assign": ["rebornix"]},
 		"editor-columnselect": {"assign": ["alexdima"]},
 		"editor-commands": {"assign": ["alexdima"]},
@@ -44,58 +51,64 @@
 		"editor-find": {"assign": ["rebornix"]},
 		"editor-folding": {"assign": ["aeschli"]},
 		"editor-highlight": {"assign": ["alexdima"]},
-		"editor-hover": {"assign": []},
+		"editor-hover": {"assign": ["alexdima"]},
 		"editor-indent-detection": {"assign": ["alexdima"]},
 		"editor-indent-guides": {"assign": ["hediet"]},
 		"editor-input": {"assign": ["alexdima"]},
 		"editor-input-IME": {"assign": ["alexdima"]},
+		"editor-insets": {"assign": ["jrieken"]},
 		"editor-minimap": {"assign": ["alexdima"]},
 		"editor-multicursor": {"assign": ["alexdima"]},
-		"editor-parameter-hints": {"assign": []},
+		"editor-parameter-hints": {"assign": ["mjbvz"]},
 		"editor-render-whitespace": {"assign": ["alexdima"]},
 		"editor-rendering": {"assign": ["alexdima"]},
 		"editor-RTL": {"assign": ["alexdima"]},
 		"editor-scrollbar": {"assign": ["alexdima"]},
+		"editor-sorting": {"assign": ["alexdima"]},
+		"editor-sticky-scroll": {"assign": ["jrieken"]},
 		"editor-symbols": {"assign": ["jrieken"]},
 		"editor-synced-region": {"assign": ["aeschli"]},
-		"editor-sticky-scroll": {"assign": ["jrieken"]},
 		"editor-textbuffer": {"assign": ["alexdima", "rebornix"]},
 		"editor-theming": {"assign": ["alexdima"]},
 		"editor-wordnav": {"assign": ["alexdima"]},
 		"editor-wrapping": {"assign": ["alexdima"]},
 		"emmet": {"assign": ["rzhao271"]},
+		"emmet-parse": {"assign": ["rzhao271"]},
 		"error-list": {"assign": ["sandy081"]},
-		"explorer-custom": {"assign": ["sandy081"]},
+		"extension-activation": {"assign": ["joyceerhl", "alexdima"]},
 		"extension-host": {"assign": ["alexdima"]},
+		"extension-prerelease": {"assign": ["sandy081"]},
+		"extension-recommendations": {"assign": ["sandy081"]},
 		"extensions": {"assign": ["sandy081"]},
 		"extensions-development": {"assign": []},
 		"file-decorations": {"assign": ["jrieken"]},
 		"file-encoding": {"assign": ["bpasero"]},
 		"file-explorer": {"assign": ["lramos15"]},
 		"file-glob": {"assign": ["bpasero"]},
-		"file-guess-encoding": {"assign": ["bpasero"]},
 		"file-io": {"assign": ["bpasero"]},
+		"file-nesting": {"assign": ["lramos15"]},
 		"file-watcher": {"assign": ["bpasero"]},
-		"font-rendering": {"assign": []},
-		"formatting": {"assign": []},
+		"font-rendering": {"assign": ["rzhao271"]},
+		"formatting": {"assign": ["jrieken"]},
 		"getting-started": {"assign": ["bhavyaus"]},
 		"ghost-text": {"assign": ["hediet"]},
 		"git": {"assign": ["lszomoru"]},
+		"github": {"assign": ["lszomoru"]},
+		"github-authentication": {"assign": ["TylerLeonhardt"]},
+		"github-repositories": {"assign": ["lszomoru"]},
 		"gpu": {"assign": ["deepak1556"]},
 		"grammar": {"assign": ["mjbvz"]},
-		"grid-view": {"assign": ["joaomoreno"]},
+		"grid-widget": {"assign": ["joaomoreno"]},
 		"html": {"assign": ["aeschli"]},
-		"icon-brand": {"assign": []},
+		"icon-brand": {"assign": ["daviddossett"]},
 		"icons-product": {"assign": ["daviddossett"]},
+		"image-preview": {"assign": ["mjbvz"]},
 		"inlay-hints": {"assign": ["jrieken", "hediet"]},
 		"inline-completions": {"assign": ["hediet"]},
-		"install-update": {"assign": []},
-		"terminal": {"assign": ["meganrogge"]},
-		"terminal-conpty": {"assign": ["meganrogge"]},
-		"terminal-links": {"assign": ["meganrogge"]},
-		"terminal-external": {"assign": ["meganrogge"]},
-		"integration-test": {"assign": []},
-		"intellisense-config": {"assign": []},
+		"install-update": {"assign": ["joaomoreno"]},
+		"intellisense-config": {"assign": ["rzhao271"]},
+		"interactive-playground": {"assign": ["chrmarti"]},
+		"interactive-window": {"assign": ["amunger", "rebornix"]},
 		"ipc": {"assign": ["joaomoreno"]},
 		"issue-bot": {"assign": ["chrmarti"]},
 		"issue-reporter": {"assign": ["TylerLeonhardt"]},
@@ -104,25 +117,73 @@
 		"keybindings": {"assign": ["alexdima"]},
 		"keybindings-editor": {"assign": ["sandy081"]},
 		"keyboard-layout": {"assign": ["alexdima"]},
+		"L10N": {"assign": ["TylerLeonhardt", "csigs"]},
+		"l10n-platform": {"assign": ["TylerLeonhardt"]},
+		"label-provider": {"assign": ["lramos15"]},
 		"languages-basic": {"assign": ["aeschli"]},
 		"languages-diagnostics": {"assign": ["jrieken"]},
+		"languages-guessing": {"assign": ["TylerLeonhardt"]},
 		"layout": {"assign": ["sbatten"]},
 		"lcd-text-rendering": {"assign": []},
-		"list": {"assign": ["joaomoreno"]},
-		"log": {"assign": []},
+		"list-widget": {"assign": ["joaomoreno"]},
+		"live-preview": {"assign": ["andreamah"]},
+		"log": {"assign": ["sandy081"]},
 		"markdown": {"assign": ["mjbvz"]},
 		"marketplace": {"assign": ["isidorn"]},
 		"menus": {"assign": ["sbatten"]},
 		"merge-conflict": {"assign": ["chrmarti"]},
+		"merge-editor": {"assign": ["hediet"]},
+		"merge-editor-workbench": {"assign": ["jrieken"]},
+		"monaco-editor": {"assign": []},
+		"native-file-dialog": {"assign": ["deepak1556"]},
+		"network": {"assign": ["deepak1556"]},
 		"notebook": {"assign": ["rebornix"]},
+		"notebook-api": {"assign": []},
+		"notebook-builtin-renderers": {"assign": []},
+		"notebook-cell-editor": {"assign": []},
+		"notebook-celltoolbar": {"assign": []},
+		"notebook-clipboard": {"assign": []},
+		"notebook-commenting": {"assign": []},
+		"notebook-debugging": {"assign": []},
+		"notebook-diff": {"assign": []},
+		"notebook-dnd": {"assign": []},
+		"notebook-execution": {"assign": []},
+		"notebook-find": {"assign": []},
+		"notebook-folding": {"assign": []},
+		"notebook-getting-started": {"assign": []},
+		"notebook-getting-globaltoolbar": {"assign": []},
+		"notebook-ipynb": {"assign": []},
+		"notebook-kernel": {"assign": []},
+		"notebook-kernel-picker": {"assign": []},
+		"notebook-keybinding": {"assign": []},
+		"notebook-language": {"assign": []},
+		"notebook-layout": {"assign": []},
+		"notebook-markdown": {"assign": []},
+		"notebook-math": {"assign": []},
+		"notebook-minimap": {"assign": []},
+		"notebook-multiselect": {"assign": []},
+		"notebook-output": {"assign": []},
+		"notebook-perf": {"assign": []},
+		"notebook-remote": {"assign": []},
+		"notebook-rendering": {"assign": []},
+		"notebook-serialization": {"assign": []},
+		"notebook-serverless-web": {"assign": []},
+		"notebook-statusbar": {"assign": []},
+		"notebook-toc-outline": {"assign": []},
+		"notebook-undo-redo": {"assign": []},
+		"notebook-variables": {"assign": []},
+		"notebook-workbench-integration": {"assign": []},
+		"notebook-workflow": {"assign": []},
+		"open-editors": {"assign": ["lramos15"]},
+		"opener": {"assign": ["mjbvz"]},
 		"outline": {"assign": ["jrieken"]},
-		"output": {"assign": []},
+		"output": {"assign": ["sandy081"]},
 		"perf": {"assign": []},
 		"perf-bloat": {"assign": []},
 		"perf-startup": {"assign": []},
 		"php": {"assign": ["roblourens"]},
 		"portable-mode": {"assign": ["joaomoreno"]},
-		"proxy": {"assign": []},
+		"proxy": {"assign": ["chrmarti"]},
 		"quick-open": {"assign": ["TylerLeonhardt"]},
 		"quick-pick": {"assign": ["TylerLeonhardt"]},
 		"references-viewlet": {"assign": ["jrieken"]},
@@ -130,41 +191,86 @@
 		"remote": {"assign": []},
 		"remote-connection": {"assign": ["alexdima"]},
 		"remote-explorer": {"assign": ["alexr00"]},
+		"remote-tunnel": {"assign": ["aeschli", "connor4312"]},
 		"rename": {"assign": ["jrieken"]},
+		"sandbox": {"assign": ["deepak1556"]},
+		"sash-widget": {"assign": ["joaomoreno"]},
 		"scm": {"assign": ["lszomoru"]},
-		"screencast-mode": {"assign": ["lszomoru"]},
+		"screencast-mode": {"assign": ["joaomoreno"]},
 		"search": {"assign": ["andreamah"]},
-		"search-editor": {"assign": ["roblourens"]},
+		"search-api": {"assign": ["andreamah"]},
+		"search-editor": {"assign": ["andreamah"]},
 		"search-replace": {"assign": ["sandy081"]},
 		"semantic-tokens": {"assign": ["alexdima", "aeschli"]},
+		"server": {"assign": ["alexdima"]},
 		"settings-editor": {"assign": ["rzhao271"]},
+		"settings-search": {"assign": ["rzhao271"]},
 		"settings-sync": {"assign": ["sandy081"]},
+		"settings-sync-server": {"assign": ["Tyriar", "lszomoru"]},
+		"shared-process": {"assign": []},
 		"simple-file-dialog": {"assign": ["alexr00"]},
 		"smart-select": {"assign": ["jrieken"]},
-		"smoke-test": {"assign": []},
 		"snap": {"assign": ["joaomoreno"]},
 		"snippets": {"assign": ["jrieken"]},
-		"splitview": {"assign": ["joaomoreno"]},
+		"splitview-widget": {"assign": ["joaomoreno"]},
+		"ssh": {"assign": ["eleanorjboyd"]},
 		"suggest": {"assign": ["jrieken"]},
+		"table-widget": {"assign": ["joaomoreno"]},
 		"tasks": {"assign": ["meganrogge"], "accuracy": 0.85},
-		"telemetry": {"assign": []},
+		"telemetry": {"assign": ["lramos15"]},
+		"terminal": {"assign": ["meganrogge"]},
+		"terminal-conpty": {"assign": ["meganrogge"]},
+		"terminal-editors": {"assign": ["Tyriar", "meganrogge"]},
+		"terminal-external": {"assign": ["meganrogge"]},
+		"terminal-find": {"assign": ["Tyriar", "meganrogge"]},
+		"terminal-input": {"assign": ["Tyriar", "meganrogge"]},
+		"terminal-layout": {"assign": ["Tyriar", "meganrogge"]},
+		"terminal-links": {"assign": ["Tyriar"]},
+		"terminal-local-echo": {"assign": ["Tyriar", "meganrogge"]},
+		"terminal-persistence": {"assign": ["Tyriar", "meganrogge"]},
+		"terminal-process": {"assign": ["Tyriar", "meganrogge"]},
+		"terminal-profiles": {"assign": ["Tyriar", "meganrogge"]},
+		"terminal-quick-fix": {"assign": ["Tyriar", "meganrogge"]},
+		"terminal-rendering": {"assign": ["Tyriar", "meganrogge"]},
+		"terminal-search": {"assign": ["Tyriar", "meganrogge"]},
+		"terminal-shell-bash": {"assign": ["Tyriar", "meganrogge"]},
+		"terminal-shell-cmd": {"assign": ["Tyriar", "meganrogge"]},
+		"terminal-shell-fish": {"assign": ["Tyriar", "meganrogge"]},
+		"terminal-shell-git-bash": {"assign": ["Tyriar", "meganrogge"]},
+		"terminal-shell-integration": {"assign": ["Tyriar", "meganrogge"]},
+		"terminal-shell-pwsh": {"assign": ["Tyriar", "meganrogge"]},
+		"terminal-shell-zsh": {"assign": ["Tyriar", "meganrogge"]},
+		"terminal-tabs": {"assign": ["meganrogge"]},
+		"terminal-winpty": {"assign": ["Tyriar", "meganrogge"]},
+		"testing": {"assign": ["connor4312"]},
 		"themes": {"assign": ["aeschli"]},
 		"timeline": {"assign": ["lramos15"]},
 		"timeline-git": {"assign": ["lszomoru"]},
+		"timeline-local-history": {"assign": ["bpasero"]},
 		"titlebar": {"assign": ["sbatten"]},
-		"tokenization": {"assign": []},
+		"tokenization": {"assign": ["alexdima"]},
+		"touch/pointer": {"assign": []},
 		"trackpad/scroll": {"assign": []},
-		"tree": {"assign": ["joaomoreno"]},
+		"tree-views": {"assign": ["alexr00"]},
+		"tree-widget": {"assign": ["joaomoreno"]},
+		"typehierarchy": {"assign": ["jrieken"]},
 		"typescript": {"assign": ["mjbvz"]},
 		"undo-redo": {"assign": ["alexdima"]},
-		"unit-test": {"assign": []},
+		"unicode-highlight": {"assign": ["hediet"]},
 		"uri": {"assign": ["jrieken"]},
+		"user-profiles": {"assign": ["sandy081"]},
 		"ux": {"assign": ["daviddossett"]},
-		"variable-resolving": {"assign": []},
+		"variable-resolving": {"assign": ["alexr00"]},
+		"VIM": {"assign": ["alexdima", "rebornix"]},
+		"virtual-workspaces": {"assign": []},
+		"vscode.dev": {"assign": []},
 		"vscode-build": {"assign": []},
+		"vscode-website": {"assign": ["rzhao271"]},
 		"web": {"assign": []},
 		"webview": {"assign": ["mjbvz"]},
+		"webview-views": {"assign": ["mjbvz"]},
 		"workbench-actions": {"assign": ["bpasero"]},
+		"workbench-banner": {"assign": ["lszomoru", "sbatten"]},
 		"workbench-cli": {"assign": ["bpasero"]},
 		"workbench-diagnostics": {"assign": ["Tyriar"]},
 		"workbench-dnd": {"assign": ["bpasero"]},
@@ -174,6 +280,7 @@
 		"workbench-editors": {"assign": ["bpasero"]},
 		"workbench-electron": {"assign": ["deepak1556"]},
 		"workbench-feedback": {"assign": ["bpasero"]},
+		"workbench-fonts": {"assign": []},
 		"workbench-history": {"assign": ["bpasero"]},
 		"workbench-hot-exit": {"assign": ["bpasero"]},
 		"workbench-hover": {"assign": ["Tyriar"]},
@@ -192,9 +299,11 @@
 		"workbench-views": {"assign": ["sbatten"]},
 		"workbench-welcome": {"assign": ["lramos15"]},
 		"workbench-window": {"assign": ["bpasero"]},
+		"workbench-workspace": {"assign": []},
 		"workbench-zen": {"assign": ["sbatten"]},
 		"workspace-edit": {"assign": ["jrieken"]},
 		"workspace-symbols": {"assign": []},
+		"workspace-trust": {"assign": ["lszomoru", "sbatten"]},
 		"zoom": {"assign": ["alexdima"] }
-		}
+	}
 }
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fbc0876623de3d..d750abbc53043f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,7 +27,7 @@ jobs:
         with:
           node-version: 16
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         with:
           python-version: "2.x"
 
diff --git a/.github/workflows/deep-classifier-runner.yml b/.github/workflows/deep-classifier-runner.yml
index a966318ddef89e..c951476c083921 100644
--- a/.github/workflows/deep-classifier-runner.yml
+++ b/.github/workflows/deep-classifier-runner.yml
@@ -33,7 +33,7 @@ jobs:
           token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
           appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
       - name: Set up Python 3.7
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: 3.7
       - name: Install dependencies
diff --git a/.vscode/notebooks/api.github-issues b/.vscode/notebooks/api.github-issues
index 32283ee6eb7e67..46c56072d2987d 100644
--- a/.vscode/notebooks/api.github-issues
+++ b/.vscode/notebooks/api.github-issues
@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"November 2022\""
+    "value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"January 2023\""
   },
   {
     "kind": 1,
diff --git a/.vscode/notebooks/endgame.github-issues b/.vscode/notebooks/endgame.github-issues
index b90826988000f1..7a80f3475cac2b 100644
--- a/.vscode/notebooks/endgame.github-issues
+++ b/.vscode/notebooks/endgame.github-issues
@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n\n\n$MILESTONE=milestone:\"November 2022\""
+    "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n\n$MILESTONE=milestone:\"November 2022\""
   },
   {
     "kind": 1,
diff --git a/.vscode/notebooks/my-endgame.github-issues b/.vscode/notebooks/my-endgame.github-issues
index c601cb9b1ef122..7af5a670fa6b38 100644
--- a/.vscode/notebooks/my-endgame.github-issues
+++ b/.vscode/notebooks/my-endgame.github-issues
@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n\n\n$MILESTONE=milestone:\"November 2022\"\n\n$MINE=assignee:@me"
+    "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n\n$MILESTONE=milestone:\"November 2022\"\n\n$MINE=assignee:@me"
   },
   {
     "kind": 1,
diff --git a/.vscode/notebooks/my-work.github-issues b/.vscode/notebooks/my-work.github-issues
index 4e48c279272627..d8d376dedf6cff 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/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n\n\n// current milestone name\n$milestone=milestone:\"November 2022\""
+    "value": "// list of repos we work in\n$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-markdown-languageservice\n\n// current milestone name\n$milestone=milestone:\"January 2023\""
   },
   {
     "kind": 1,
@@ -92,7 +92,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repos assignee:@me is:open type:issue -label:bug -label:\"info-needed\" -label:feature-request -label:under-discussion -label:debt -label:plan-item -label:upstream -label:polish -label:testplan-item -label:error-telemetry"
+    "value": "$repos assignee:@me is:open type:issue -label:bug -label:\"info-needed\" -label:feature-request -label:under-discussion -label:debt -label:plan-item -label:upstream -label:polish -label:testplan-item -label:error-telemetry -label:engineering"
   },
   {
     "kind": 1,
@@ -102,7 +102,17 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode assignee:@me is:open type:issue -label:\"info-needed\" -label:api -label:api-finalization -label:api-proposal -label:authentication -label:bisect-ext -label:bracket-pair-colorization -label:bracket-pair-guides -label:breadcrumbs -label:callhierarchy -label:chrome-devtools -label:code-lens -label:color-palette -label:comments -label:config -label:context-keys -label:css-less-scss -label:custom-editors -label:debug -label:debug-disassembly -label:dialogs -label:diff-editor -label:dropdown -label:editor -label:editor-autoclosing -label:editor-autoindent -label:editor-bracket-matching -label:editor-clipboard -label:editor-code-actions -label:editor-color-picker -label:editor-columnselect -label:editor-commands -label:editor-comments -label:editor-contrib -label:editor-core -label:editor-drag-and-drop -label:editor-error-widget -label:editor-find -label:editor-folding -label:editor-highlight -label:editor-hover -label:editor-indent-detection -label:editor-indent-guides -label:editor-input -label:editor-input-IME -label:editor-insets -label:editor-minimap -label:editor-multicursor -label:editor-parameter-hints -label:editor-render-whitespace -label:editor-rendering -label:editor-RTL -label:editor-scrollbar -label:editor-symbols -label:editor-synced-region -label:editor-textbuffer -label:editor-theming -label:editor-wordnav -label:editor-wrapping -label:emmet -label:engineering -label:error-list -label:extension-host -label:extension-recommendations -label:extensions -label:extensions-development -label:file-decorations -label:file-encoding -label:file-explorer -label:file-glob -label:file-io -label:file-watcher -label:font-rendering -label:formatting -label:getting-started -label:ghost-text -label:git -label:github -label:gpu -label:grammar -label:grid-view -label:html -label:i18n -label:icon-brand -label:icons-product -label:image-preview -label:inlay-hints -label:inline-completions -label:install-update -label:intellisense-config -label:interactive-window -label:ipc -label:issue-bot -label:issue-reporter -label:javascript -label:json -label:keybindings -label:keybindings-editor -label:keyboard-layout -label:L10N -label:label-provider -label:languages-basic -label:languages-diagnostics -label:languages-guessing -label:layout -label:lcd-text-rendering -label:list -label:live-server -label:log -label:markdown -label:marketplace -label:menus -label:merge-conflict -label:network -label:notebook -label:notebook-api -label:notebook-celltoolbar -label:notebook-diff -label:notebook-dnd -label:notebook-folding -label:notebook-globaltoolbar -label:notebook-ipynb -label:notebook-kernel -label:notebook-keybinding -label:notebook-layout -label:notebook-markdown -label:notebook-minimap -label:notebook-multiselect -label:notebook-output -label:notebook-perf -label:notebook-statusbar -label:open-editors -label:opener -label:outline -label:output -label:perf -label:perf-bloat -label:perf-startup -label:php -label:portable-mode -label:proxy -label:quick-open -label:quick-pick -label:references-viewlet -label:release-notes -label:remote -label:remote-connection -label:remote-explorer -label:remotehub -label:rename -label:sandbox -label:sash -label:scm -label:screencast-mode -label:search -label:search-api -label:search-editor -label:search-replace -label:semantic-tokens -label:settings-editor -label:settings-sync -label:settings-sync-server -label:shared-process -label:simple-file-dialog -label:smart-select -label:snap -label:snippets -label:splitview -label:suggest -label:sync-error-handling -label:table -label:tasks -label:telemetry -label:terminal -label:terminal-conpty -label:terminal-editors -label:terminal-external -label:terminal-links -label:terminal-local-echo -label:terminal-profiles -label:terminal-reconnection -label:terminal-rendering -label:terminal-tabs -label:terminal-winpty -label:testing -label:themes -label:timeline -label:timeline-git -label:titlebar -label:tokenization -label:touch/pointer -label:trackpad/scroll -label:tree-views -label:tree-widget -label:typehierarchy -label:typescript -label:undo-redo -label:uri -label:ux -label:variable-resolving -label:VIM -label:virtual-workspaces -label:vscode-build -label:vscode-website -label:web -label:webview -label:webview-views -label:workbench-actions -label:workbench-cli -label:workbench-diagnostics -label:workbench-dnd -label:workbench-editor-grid -label:workbench-editor-groups -label:workbench-editor-resolver -label:workbench-editors -label:workbench-electron -label:workbench-feedback -label:workbench-history -label:workbench-hot-exit -label:workbench-hover -label:workbench-launch -label:workbench-link -label:workbench-multiroot -label:workbench-notifications -label:workbench-os-integration -label:workbench-rapid-render -label:workbench-run-as-admin -label:workbench-state -label:workbench-status -label:workbench-tabs -label:workbench-touchbar -label:workbench-untitled-editors -label:workbench-views -label:workbench-welcome -label:workbench-window -label:workbench-zen -label:workspace-edit -label:workspace-symbols -label:workspace-trust -label:zoom"
+    "value": "repo:microsoft/vscode assignee:@me is:open type:issue -label:\"info-needed\" -label:api -label:api-finalization -label:api-proposal -label:authentication -label:bisect-ext -label:bracket-pair-colorization -label:bracket-pair-guides -label:breadcrumbs -label:callhierarchy -label:chrome-devtools -label:cloud-changes -label:code-lens -label:color-palette -label:command-center -label:comments -label:config -label:containers -label:context-keys -label:continue-working-on -label:css-less-scss -label:custom-editors -label:debug -label:debug-disassembly -label:dialogs -label:diff-editor -label:dropdown -label:editor-api -label:editor-autoclosing -label:editor-autoindent -label:editor-bracket-matching -label:editor-clipboard -label:editor-code-actions -label:editor-color-picker -label:editor-columnselect -label:editor-commands -label:editor-comments -label:editor-contrib -label:editor-core -label:editor-drag-and-drop -label:editor-error-widget -label:editor-find -label:editor-folding -label:editor-highlight -label:editor-hover -label:editor-indent-detection -label:editor-indent-guides -label:editor-input -label:editor-input-IME -label:editor-insets -label:editor-minimap -label:editor-multicursor -label:editor-parameter-hints -label:editor-render-whitespace -label:editor-rendering -label:editor-RTL -label:editor-scrollbar -label:editor-sorting -label:editor-sticky-scroll -label:editor-symbols -label:editor-synced-region -label:editor-textbuffer -label:editor-theming -label:editor-wordnav -label:editor-wrapping -label:emmet -label:emmet-parse -label:error-list -label:extension-activation -label:extension-host -label:extension-prerelease -label:extension-recommendations -label:extensions -label:extensions-development -label:file-decorations -label:file-encoding -label:file-explorer -label:file-glob -label:file-io -label:file-nesting -label:file-watcher -label:font-rendering -label:formatting -label:getting-started -label:ghost-text -label:git -label:github -label:github-repositories -label:gpu -label:grammar -label:grid-widget -label:html -label:htmlfs -label:icon-brand -label:icons-product -label:image-preview -label:inlay-hints -label:inline-completions -label:install-update -label:intellisense-config -label:interactive-playground -label:interactive-window -label:ipc -label:issue-bot -label:issue-reporter -label:javascript -label:json -label:keybindings -label:keybindings-editor -label:keyboard-layout -label:L10N -label:l10n-platform -label:label-provider -label:languages-basic -label:languages-diagnostics -label:languages-guessing -label:layout -label:lcd-text-rendering -label:list-widget -label:live-preview -label:log -label:markdown -label:marketplace -label:menus -label:merge-conflict -label:merge-editor -label:merge-editor-workbench -label:monaco-editor -label:native-file-dialog -label:network -label:notebook -label:notebook-api -label:notebook-builtin-renderers -label:notebook-cell-editor -label:notebook-celltoolbar -label:notebook-clipboard -label:notebook-commenting -label:notebook-debugging -label:notebook-diff -label:notebook-dnd -label:notebook-execution -label:notebook-find -label:notebook-folding -label:notebook-getting-started -label:notebook-globaltoolbar -label:notebook-ipynb -label:notebook-kernel -label:notebook-kernel-picker -label:notebook-keybinding -label:notebook-language -label:notebook-layout -label:notebook-markdown -label:notebook-math -label:notebook-minimap -label:notebook-multiselect -label:notebook-output -label:notebook-perf -label:notebook-remote -label:notebook-rendering -label:notebook-serialization -label:notebook-serverless-web -label:notebook-statusbar -label:notebook-toc-outline -label:notebook-undo-redo -label:notebook-variables -label:notebook-workbench-integration -label:notebook-workflow -label:open-editors -label:opener -label:outline -label:output -label:packaging -label:perf -label:perf-bloat -label:perf-startup -label:php -label:portable-mode -label:proxy -label:quick-open -label:quick-pick -label:references-viewlet -label:release-notes -label:remote -label:remote-connection -label:remote-explorer -label:remote-tunnel -label:rename -label:sandbox -label:sash-widget -label:scm -label:screencast-mode -label:search -label:search-api -label:search-editor -label:search-replace -label:semantic-tokens -label:server -label:settings-editor -label:settings-sync -label:settings-sync-server -label:shared-process -label:simple-file-dialog -label:smart-select -label:snap -label:snippets -label:splitview-widget -label:ssh -label:suggest -label:sync-error-handling -label:table-widget -label:tasks -label:telemetry -label:terminal -label:terminal-conpty -label:terminal-editors -label:terminal-external -label:terminal-find -label:terminal-input -label:terminal-layout -label:terminal-links -label:terminal-local-echo -label:terminal-persistence -label:terminal-process -label:terminal-profiles -label:terminal-quick-fix -label:terminal-rendering -label:terminal-search -label:terminal-shell-bash -label:terminal-shell-cmd -label:terminal-shell-fish -label:terminal-shell-git-bash -label:terminal-shell-integration -label:terminal-shell-pwsh -label:terminal-shell-zsh -label:terminal-tabs -label:terminal-winpty -label:testing -label:themes -label:timeline -label:timeline-git -label:timeline-local-history -label:tips-and-tricks -label:titlebar -label:tokenization -label:touch/pointer -label:trackpad/scroll -label:tree-views -label:tree-widget -label:typescript -label:undo-redo -label:unicode-highlight -label:untitled-editor-hint -label:uri -label:user-profiles -label:ux -label:variable-resolving -label:VIM -label:virtual-workspaces -label:vscode-website -label:vscode.dev -label:web -label:webview -label:webview-views -label:workbench-actions -label:workbench-banner -label:workbench-cli -label:workbench-diagnostics -label:workbench-dnd -label:workbench-editor-grid -label:workbench-editor-groups -label:workbench-editor-resolver -label:workbench-editors -label:workbench-electron -label:workbench-feedback -label:workbench-fonts -label:workbench-history -label:workbench-hot-exit -label:workbench-hover -label:workbench-launch -label:workbench-link -label:workbench-multiroot -label:workbench-notifications -label:workbench-os-integration -label:workbench-rapid-render -label:workbench-run-as-admin -label:workbench-state -label:workbench-status -label:workbench-tabs -label:workbench-touchbar -label:workbench-untitled-editors -label:workbench-views -label:workbench-welcome -label:workbench-window -label:workbench-workspace -label:workbench-zen -label:workspace-edit -label:workspace-symbols -label:workspace-trust -label:zoom"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "### Missing Milestone"
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$repos assignee:@me is:open type:issue no:milestone -label:info-needed -label:triage-needed"
   },
   {
     "kind": 1,
@@ -138,5 +148,15 @@
     "kind": 2,
     "language": "github-issues",
     "value": "$repos author:@me is:open is:pr review:required"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "⚠️ Changes Requested"
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$repos author:@me is:open is:pr review:changes_requested"
   }
 ]
\ No newline at end of file
diff --git a/.vscode/notebooks/verification.github-issues b/.vscode/notebooks/verification.github-issues
index 7c9f09b9ec78d2..b4ad043d9bfaf3 100644
--- a/.vscode/notebooks/verification.github-issues
+++ b/.vscode/notebooks/verification.github-issues
@@ -12,7 +12,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n\n$milestone=milestone:\"November 2022\""
+    "value": "$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n$milestone=milestone:\"November 2022\""
   },
   {
     "kind": 1,
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 845320922da3aa..7ae8bcef6b9a32 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -110,6 +110,12 @@
 		"git",
 		"sash"
 	],
+	"debug.javascript.terminalOptions": {
+		"outFiles": [
+			"${workspaceFolder}/out/**/*.js",
+			"${workspaceFolder}/build/**/*.js"
+		]
+	},
 	"githubPullRequests.assignCreated": "${user}",
 	"githubPullRequests.defaultMergeMethod": "squash",
 	"application.experimental.rendererProfiling": true
diff --git a/.yarnrc b/.yarnrc
index eded0c0ad66efe..6d4029fb8878db 100644
--- a/.yarnrc
+++ b/.yarnrc
@@ -1,4 +1,4 @@
 disturl "https://electronjs.org/headers"
-target "19.1.6"
+target "19.1.8"
 runtime "electron"
 build_from_source "true"
diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index a48785b38fa0c1..677beb55aae2d8 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -1268,7 +1268,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-jeff-hykin/better-cpp-syntax 1.15.23 - MIT
+jeff-hykin/better-cpp-syntax 1.16.1 - MIT
 https://github.com/jeff-hykin/better-cpp-syntax
 
 MIT License
@@ -2287,7 +2287,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-microsoft/vscode-mssql 1.16.0 - MIT
+microsoft/vscode-mssql 1.17.0 - MIT
 https://github.com/microsoft/vscode-mssql
 
 ------------------------------------------ START OF LICENSE -----------------------------------------
diff --git a/build/.moduleignore b/build/.moduleignore
index c9603b4591b2b6..94514db17b805e 100644
--- a/build/.moduleignore
+++ b/build/.moduleignore
@@ -145,12 +145,13 @@ prebuild-install/**/*
 **/CONTRIBUTING.md
 
 **/*.ts
-!typescript/**/*.d.ts
 
 # Exclude TS files that aren't needed by TS extension
 typescript/lib/tsc.js
 typescript/lib/typescriptServices.js
 typescript/lib/tsserverlibrary.js
+# We still need to include stdlib d.ts
+!typescript/lib/lib*.d.ts
 
 jschardet/index.js
 jschardet/src/**
diff --git a/build/azure-pipelines/exploration-build.yml b/build/azure-pipelines/exploration-build.yml
deleted file mode 100644
index 961211ec91542d..00000000000000
--- a/build/azure-pipelines/exploration-build.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-pool:
-  vmImage: "Ubuntu-16.04"
-
-trigger: none
-pr: none
-
-steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: "16.x"
-
-  - task: AzureKeyVault@1
-    displayName: "Azure Key Vault: Get Secrets"
-    inputs:
-      azureSubscription: "vscode-builds-subscription"
-      KeyVaultName: vscode-build-secrets
-      SecretsFilter: "github-distro-mixin-password"
-
-  - script: |
-      set -e
-
-      cat << EOF > ~/.netrc
-      machine github.com
-      login vscode
-      password $(github-distro-mixin-password)
-      EOF
-
-      git config user.email "vscode@microsoft.com"
-      git config user.name "VSCode"
-
-      git checkout origin/electron-12.x.y
-      git merge origin/main
-
-      # Push main branch into exploration branch
-      git push origin HEAD:electron-12.x.y
-
-    displayName: Sync & Merge Exploration
diff --git a/build/azure-pipelines/linux/cli-build-linux.yml b/build/azure-pipelines/linux/cli-build-linux.yml
index 799c00b93c90e2..044fb29b9b91ba 100644
--- a/build/azure-pipelines/linux/cli-build-linux.yml
+++ b/build/azure-pipelines/linux/cli-build-linux.yml
@@ -1,11 +1,11 @@
 parameters:
-  - name: VSCODE_BUILD_LINUX_ALPINE
+  - name: VSCODE_BUILD_ALPINE
     type: boolean
     default: false
   - name: VSCODE_BUILD_LINUX
     type: boolean
     default: false
-  - name: VSCODE_BUILD_LINUX_ALPINE_ARM64
+  - name: VSCODE_BUILD_ALPINE_ARM64
     type: boolean
     default: false
   - name: VSCODE_BUILD_LINUX_ARM64
@@ -34,7 +34,7 @@ steps:
     displayName: Extract openssl prebuilt
 
   # inspired by: https://github.com/emk/rust-musl-builder/blob/main/Dockerfile
-  - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true)) }}:
+  - ${{ if or(eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true), eq(parameters.VSCODE_BUILD_ALPINE, true)) }}:
     - bash: |
         set -e
         sudo apt-get update
@@ -72,9 +72,9 @@ steps:
   - template: ../cli/install-rust-posix.yml
     parameters:
       targets:
-        - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64, true) }}:
+        - ${{ if eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true) }}:
           - aarch64-unknown-linux-musl
-        - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true) }}:
+        - ${{ if eq(parameters.VSCODE_BUILD_ALPINE, true) }}:
           - x86_64-unknown-linux-musl
         - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARM64, true) }}:
           - aarch64-unknown-linux-gnu
@@ -83,7 +83,7 @@ steps:
         - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true) }}:
           - armv7-unknown-linux-gnueabihf
 
-  - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64, true) }}:
+  - ${{ if eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true) }}:
     - template: ../cli/cli-compile-and-publish.yml
       parameters:
         VSCODE_CLI_TARGET: aarch64-unknown-linux-musl
@@ -94,7 +94,7 @@ steps:
           OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-linux/lib
           OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-linux/include
 
-  - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true) }}:
+  - ${{ if eq(parameters.VSCODE_BUILD_ALPINE, true) }}:
     - template: ../cli/cli-compile-and-publish.yml
       parameters:
         VSCODE_CLI_TARGET: x86_64-unknown-linux-musl
diff --git a/build/azure-pipelines/product-build-pr-cache-win32.yml b/build/azure-pipelines/product-build-pr-cache-win32.yml
new file mode 100644
index 00000000000000..98e999813f0535
--- /dev/null
+++ b/build/azure-pipelines/product-build-pr-cache-win32.yml
@@ -0,0 +1,87 @@
+steps:
+  - checkout: self
+    fetchDepth: 1
+    retryCountOnTaskFailure: 3
+
+  - task: NodeTool@0
+    inputs:
+      versionSpec: "16.x"
+
+  - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
+      exec { node build/setup-npm-registry.js $env:NPM_REGISTRY }
+    condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
+    displayName: Setup NPM Registry
+
+  - powershell: |
+      if (!(Test-Path ".build")) { New-Item -Path ".build" -ItemType Directory }
+      node build/azure-pipelines/common/computeNodeModulesCacheKey.js $(VSCODE_ARCH) > .build/yarnlockhash
+      node build/azure-pipelines/common/computeBuiltInDepsCacheKey.js > .build/builtindepshash
+    displayName: Prepare yarn cache flags
+
+  - task: Cache@2
+    inputs:
+      key: "genericNodeModules | $(Agent.OS) | .build/yarnlockhash"
+      path: .build/node_modules_cache
+      cacheHitVar: NODE_MODULES_RESTORED
+    displayName: Restore node_modules cache
+
+  - task: Cache@2
+    inputs:
+      key: '"builtInDeps" | .build/builtindepshash'
+      path: .build/builtInExtensions
+    displayName: Restore built-in extensions
+
+  - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
+      exec { 7z.exe x .build/node_modules_cache/cache.7z -aos }
+    condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Extract node_modules cache
+
+  - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
+      exec { npm config set registry "$env:NPM_REGISTRY" --location=project }
+      exec { npm config set always-auth=true --location=project }
+      exec { yarn config set registry "$env:NPM_REGISTRY" }
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
+    displayName: Setup NPM & Yarn
+
+  - task: npmAuthenticate@0
+    inputs:
+      workingFile: .npmrc
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
+    displayName: Setup NPM Authentication
+
+  - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
+      . build/azure-pipelines/win32/retry.ps1
+      $ErrorActionPreference = "Stop"
+      $env:npm_config_arch="$(VSCODE_ARCH)"
+      $env:CHILD_CONCURRENCY="1"
+      retry { exec { yarn --frozen-lockfile --check-files } }
+    env:
+      ELECTRON_SKIP_BINARY_DOWNLOAD: 1
+      PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
+      GITHUB_TOKEN: "$(github-distro-mixin-password)"
+    displayName: Install dependencies
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+
+  - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
+      exec { node build/lib/builtInExtensions.js }
+    env:
+      GITHUB_TOKEN: "$(github-distro-mixin-password)"
+    displayName: Download missing built-in extensions
+
+  - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
+      exec { node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt }
+      exec { mkdir -Force .build/node_modules_cache }
+      exec { 7z.exe a .build/node_modules_cache/cache.7z -mx3 `@.build/node_modules_list.txt }
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Create node_modules archive
diff --git a/build/azure-pipelines/product-build-pr.yml b/build/azure-pipelines/product-build-pr.yml
index 2ef55d4d05fc32..94daf187e9c142 100644
--- a/build/azure-pipelines/product-build-pr.yml
+++ b/build/azure-pipelines/product-build-pr.yml
@@ -12,7 +12,7 @@ variables:
   - name: skipComponentGovernanceDetection
     value: true
   - name: NPM_REGISTRY
-    value: 'none'
+    value: "none"
   - name: VSCODE_CIBUILD
     value: ${{ in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI') }}
   - name: VSCODE_PUBLISH
@@ -96,6 +96,57 @@ jobs:
       steps:
         - template: cli/test.yml
 
+    - job: Windowsx64UnitTests
+      displayName: Windows (Unit Tests)
+      pool: vscode-1es-vscode-windows-2019
+      timeoutInMinutes: 30
+      variables:
+        VSCODE_ARCH: x64
+        NPM_ARCH: x64
+      steps:
+        - template: win32/product-build-win32.yml
+          parameters:
+            VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+            VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+            VSCODE_BUILD_TUNNEL_CLI: false
+            VSCODE_RUN_UNIT_TESTS: true
+            VSCODE_RUN_INTEGRATION_TESTS: false
+            VSCODE_RUN_SMOKE_TESTS: false
+
+    - job: Windowsx64IntegrationTests
+      displayName: Windows (Integration Tests)
+      pool: vscode-1es-vscode-windows-2019
+      timeoutInMinutes: 30
+      variables:
+        VSCODE_ARCH: x64
+        NPM_ARCH: x64
+      steps:
+        - template: win32/product-build-win32.yml
+          parameters:
+            VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+            VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+            VSCODE_BUILD_TUNNEL_CLI: false
+            VSCODE_RUN_UNIT_TESTS: false
+            VSCODE_RUN_INTEGRATION_TESTS: true
+            VSCODE_RUN_SMOKE_TESTS: false
+
+    # - job: Windowsx64SmokeTests
+    #   displayName: Windows (Smoke Tests)
+    #   pool: vscode-1es-vscode-windows-2019
+    #   timeoutInMinutes: 30
+    #   variables:
+    #     VSCODE_ARCH: x64
+    #     NPM_ARCH: x64
+    #   steps:
+    #     - template: win32/product-build-win32.yml
+    #       parameters:
+    #         VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+    #         VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+    #         VSCODE_BUILD_TUNNEL_CLI: false
+    #         VSCODE_RUN_UNIT_TESTS: false
+    #         VSCODE_RUN_INTEGRATION_TESTS: false
+    #         VSCODE_RUN_SMOKE_TESTS: true
+
   - ${{ if eq(variables['VSCODE_CIBUILD'], true) }}:
     - job: Linuxx64MaintainNodeModulesCache
       displayName: Linux (Maintain node_modules cache)
@@ -106,6 +157,15 @@ jobs:
       steps:
         - template: product-build-pr-cache.yml
 
+    - job: Windowsx64MaintainNodeModulesCache
+      displayName: Windows (Maintain node_modules cache)
+      pool: vscode-1es-vscode-windows-2019
+      timeoutInMinutes: 30
+      variables:
+        VSCODE_ARCH: x64
+      steps:
+        - template: product-build-pr-cache-win32.yml
+
   # - job: macOSUnitTest
   #   displayName: macOS (Unit Tests)
   #   pool:
@@ -154,46 +214,3 @@ jobs:
   #         VSCODE_RUN_UNIT_TESTS: false
   #         VSCODE_RUN_INTEGRATION_TESTS: false
   #         VSCODE_RUN_SMOKE_TESTS: true
-
-  # - job: WindowsUnitTests
-  #   displayName: Windows (Unit Tests)
-  #   pool: vscode-1es-vscode-windows-2019
-  #   timeoutInMinutes: 60
-  #   variables:
-  #     VSCODE_ARCH: x64
-  #   steps:
-  #     - template: win32/product-build-win32.yml
-  #       parameters:
-  #         VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-  #         VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-  #         VSCODE_RUN_UNIT_TESTS: true
-  #         VSCODE_RUN_INTEGRATION_TESTS: false
-  #         VSCODE_RUN_SMOKE_TESTS: false
-  # - job: WindowsIntegrationTests
-  #   displayName: Windows (Integration Tests)
-  #   pool: vscode-1es-vscode-windows-2019
-  #   timeoutInMinutes: 60
-  #   variables:
-  #     VSCODE_ARCH: x64
-  #   steps:
-  #     - template: win32/product-build-win32.yml
-  #       parameters:
-  #         VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-  #         VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-  #         VSCODE_RUN_UNIT_TESTS: false
-  #         VSCODE_RUN_INTEGRATION_TESTS: true
-  #         VSCODE_RUN_SMOKE_TESTS: false
-  # - job: WindowsSmokeTests
-  #   displayName: Windows (Smoke Tests)
-  #   pool: vscode-1es-vscode-windows-2019
-  #   timeoutInMinutes: 60
-  #   variables:
-  #     VSCODE_ARCH: x64
-  #   steps:
-  #     - template: win32/product-build-win32.yml
-  #       parameters:
-  #         VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-  #         VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-  #         VSCODE_RUN_UNIT_TESTS: false
-  #         VSCODE_RUN_INTEGRATION_TESTS: false
-  #         VSCODE_RUN_SMOKE_TESTS: true
diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index 2bc73858f7feec..6c561a4fb12db6 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -53,12 +53,12 @@ parameters:
     displayName: "🎯 Linux armhf"
     type: boolean
     default: true
-  - name: VSCODE_BUILD_LINUX_ALPINE
-    displayName: "🎯 Alpine Linux x64"
+  - name: VSCODE_BUILD_ALPINE
+    displayName: "🎯 Alpine x64"
     type: boolean
     default: true
-  - name: VSCODE_BUILD_LINUX_ALPINE_ARM64
-    displayName: "🎯 Alpine Linux arm64"
+  - name: VSCODE_BUILD_ALPINE_ARM64
+    displayName: "🎯 Alpine arm64"
     type: boolean
     default: true
   - name: VSCODE_BUILD_MACOS
@@ -112,7 +112,9 @@ variables:
   - name: VSCODE_BUILD_STAGE_WINDOWS
     value: ${{ or(eq(parameters.VSCODE_BUILD_WIN32, true), eq(parameters.VSCODE_BUILD_WIN32_32BIT, true), eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}
   - name: VSCODE_BUILD_STAGE_LINUX
-    value: ${{ or(eq(parameters.VSCODE_BUILD_LINUX, true), eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64, true)) }}
+    value: ${{ or(eq(parameters.VSCODE_BUILD_LINUX, true), eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true)) }}
+  - name: VSCODE_BUILD_STAGE_ALPINE
+    value: ${{ or(eq(parameters.VSCODE_BUILD_ALPINE, true), eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true)) }}
   - name: VSCODE_BUILD_STAGE_MACOS
     value: ${{ or(eq(parameters.VSCODE_BUILD_MACOS, true), eq(parameters.VSCODE_BUILD_MACOS_ARM64, true)) }}
   - name: VSCODE_BUILD_STAGE_WEB
@@ -181,7 +183,7 @@ stages:
     - stage: CompileCLI
       dependsOn: []
       jobs:
-        - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true)) }}:
+        - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true), eq(parameters.VSCODE_BUILD_ALPINE, true)) }}:
           - job: LinuxX64
             pool: vscode-1es-linux
             steps:
@@ -189,7 +191,7 @@ stages:
                 parameters:
                   VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
                   VSCODE_BUILD_LINUX: ${{ parameters.VSCODE_BUILD_LINUX }}
-                  VSCODE_BUILD_LINUX_ALPINE: ${{ parameters.VSCODE_BUILD_LINUX_ALPINE }}
+                  VSCODE_BUILD_ALPINE: ${{ parameters.VSCODE_BUILD_ALPINE }}
 
         - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), or(eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true))) }}:
           - job: LinuxGnuARM
@@ -201,7 +203,7 @@ stages:
                   VSCODE_BUILD_LINUX_ARMHF: ${{ parameters.VSCODE_BUILD_LINUX_ARMHF }}
                   VSCODE_BUILD_LINUX_ARM64: ${{ parameters.VSCODE_BUILD_LINUX_ARM64 }}
 
-        - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64, true)) }}:
+        - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true)) }}:
           - job: LinuxAlpineARM64
             pool: vscode-1es-linux-20.04-arm64
             steps:
@@ -216,7 +218,7 @@ stages:
               - template: ./linux/cli-build-linux.yml
                 parameters:
                   VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                  VSCODE_BUILD_LINUX_ALPINE_ARM64: ${{ parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64 }}
+                  VSCODE_BUILD_ALPINE_ARM64: ${{ parameters.VSCODE_BUILD_ALPINE_ARM64 }}
 
         - ${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}:
           - job: MacOSX64
@@ -537,14 +539,22 @@ stages:
                 steps:
                   - template: linux/snap-build-linux.yml
 
-          - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true)) }}:
+  - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_ALPINE'], true)) }}:
+      - stage: Alpine
+        dependsOn:
+          - Compile
+          - ${{ if eq(parameters.VSCODE_BUILD_TUNNEL_CLI, true) }}:
+            - CompileCLI
+        pool: vscode-1es-linux
+        jobs:
+          - ${{ if eq(parameters.VSCODE_BUILD_ALPINE, true) }}:
               - job: LinuxAlpine
                 variables:
                   VSCODE_ARCH: x64
                 steps:
                   - template: linux/product-build-alpine.yml
 
-          - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64, true)) }}:
+          - ${{ if eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true) }}:
               - job: LinuxAlpineArm64
                 timeoutInMinutes: 120
                 variables:
diff --git a/build/azure-pipelines/product-publish.ps1 b/build/azure-pipelines/product-publish.ps1
index 4e47d7d6cb2798..a9170d54f5c0e9 100644
--- a/build/azure-pipelines/product-publish.ps1
+++ b/build/azure-pipelines/product-publish.ps1
@@ -45,6 +45,7 @@ New-Item -Path $ARTIFACT_PROCESSED_FILE_PATH -Force | Out-Null
 $stages = @(
 	if ($env:VSCODE_BUILD_STAGE_WINDOWS -eq 'True') { 'Windows' }
 	if ($env:VSCODE_BUILD_STAGE_LINUX -eq 'True') { 'Linux' }
+	if ($env:VSCODE_BUILD_STAGE_ALPINE -eq 'True') { 'Alpine' }
 	if ($env:VSCODE_BUILD_STAGE_MACOS -eq 'True') { 'macOS' }
 	if ($env:VSCODE_BUILD_STAGE_WEB -eq 'True') { 'Web' }
 )
diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml
index d7db3170b4f224..6bcc9a0a73d736 100644
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@@ -90,12 +90,21 @@ steps:
       node build/azure-pipelines/common/computeBuiltInDepsCacheKey.js > .build/builtindepshash
     displayName: Prepare yarn cache flags
 
-  - task: Cache@2
-    inputs:
-      key: "nodeModules | $(Agent.OS) | .build/yarnlockhash"
-      path: .build/node_modules_cache
-      cacheHitVar: NODE_MODULES_RESTORED
-    displayName: Restore node_modules cache
+  - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
+      - task: Cache@2
+        inputs:
+          key: "genericNodeModules | $(Agent.OS) | .build/yarnlockhash"
+          path: .build/node_modules_cache
+          cacheHitVar: NODE_MODULES_RESTORED
+        displayName: Restore node_modules cache
+
+  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+      - task: Cache@2
+        inputs:
+          key: "nodeModules | $(Agent.OS) | .build/yarnlockhash"
+          path: .build/node_modules_cache
+          cacheHitVar: NODE_MODULES_RESTORED
+        displayName: Restore node_modules cache
 
   - task: Cache@2
     inputs:
diff --git a/build/filters.js b/build/filters.js
index ff8e4ef81b3cb1..16d4f7dd46fb09 100644
--- a/build/filters.js
+++ b/build/filters.js
@@ -45,6 +45,7 @@ module.exports.unicodeFilter = [
 	'!build/win32/**',
 	'!extensions/markdown-language-features/notebook-out/*.js',
 	'!extensions/markdown-math/notebook-out/**',
+	'!extensions/ipynb/notebook-out/**',
 	'!extensions/notebook-renderers/renderer-out/**',
 	'!extensions/php-language-features/src/features/phpGlobalFunctions.ts',
 	'!extensions/typescript-language-features/test-workspace/**',
@@ -85,6 +86,7 @@ module.exports.indentationFilter = [
 	'!extensions/typescript-language-features/test-workspace/**',
 	'!extensions/typescript-language-features/resources/walkthroughs/**',
 	'!extensions/markdown-math/notebook-out/**',
+	'!extensions/ipynb/notebook-out/**',
 	'!extensions/vscode-api-tests/testWorkspace/**',
 	'!extensions/vscode-api-tests/testWorkspace2/**',
 	'!build/monaco/**',
@@ -124,6 +126,7 @@ module.exports.indentationFilter = [
 	'!extensions/markdown-language-features/media/*.js',
 	'!extensions/markdown-language-features/notebook-out/*.js',
 	'!extensions/markdown-math/notebook-out/*.js',
+	'!extensions/ipynb/notebook-out/**',
 	'!extensions/notebook-renderers/renderer-out/*.js',
 	'!extensions/simple-browser/media/*.js',
 ];
@@ -159,6 +162,7 @@ module.exports.copyrightFilter = [
 	'!extensions/configuration-editing/build/inline-allOf.ts',
 	'!extensions/markdown-language-features/media/highlight.css',
 	'!extensions/markdown-math/notebook-out/**',
+	'!extensions/ipynb/notebook-out/**',
 	'!extensions/html-language-features/server/src/modes/typescript/*',
 	'!extensions/*/server/bin/*',
 	'!src/vs/editor/test/node/classification/typescript-test.ts',
diff --git a/build/gulpfile.vscode.web.js b/build/gulpfile.vscode.web.js
index bb67d883253459..1765a6509a777f 100644
--- a/build/gulpfile.vscode.web.js
+++ b/build/gulpfile.vscode.web.js
@@ -116,7 +116,7 @@ const createVSCodeWebBuiltinExtensionsPatcher = (extensionsRoot) => {
 		// (2) Patch builtin extensions
 		if (path.endsWith('vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.js')) {
 			const builtinExtensions = JSON.stringify(extensions.scanBuiltinExtensions(extensionsRoot));
-			return content.replace('/*BUILD->INSERT_BUILTIN_EXTENSIONS*/', builtinExtensions.substr(1, builtinExtensions.length - 2) /* without [ and ]*/);
+			return content.replace('/*BUILD->INSERT_BUILTIN_EXTENSIONS*/', () => builtinExtensions.substr(1, builtinExtensions.length - 2) /* without [ and ]*/);
 		}
 
 		return content;
diff --git a/build/lib/compilation.js b/build/lib/compilation.js
index f26b7ac1640965..d101f6e09ad798 100644
--- a/build/lib/compilation.js
+++ b/build/lib/compilation.js
@@ -104,12 +104,13 @@ function compileTask(src, out, build) {
         // mangle: TypeScript to TypeScript
         let mangleStream = es.through();
         if (build) {
-            let ts2tsMangler = new mangleTypeScript_1.Mangler(compile.projectPath);
+            let ts2tsMangler = new mangleTypeScript_1.Mangler(compile.projectPath, (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data));
             const newContentsByFileName = ts2tsMangler.computeNewFileContents();
             mangleStream = es.through(function write(data) {
                 const newContents = newContentsByFileName.get(data.path);
                 if (newContents !== undefined) {
-                    data.contents = Buffer.from(newContents);
+                    data.contents = Buffer.from(newContents.out);
+                    data.sourceMap = newContents.sourceMap && JSON.parse(newContents.sourceMap);
                 }
                 this.push(data);
             }, function end() {
@@ -278,4 +279,4 @@ exports.watchApiProposalNamesTask = task.define('watch-api-proposal-names', () =
         .pipe(util.debounce(task))
         .pipe(gulp.dest('src'));
 });
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"compilation.js","sourceRoot":"","sources":["compilation.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,mCAAmC;AACnC,yBAAyB;AACzB,6BAA6B;AAC7B,6BAA6B;AAC7B,0CAA0C;AAC1C,6BAA6B;AAC7B,yCAA4C;AAC5C,+BAA+B;AAC/B,sCAAsC;AACtC,0CAA0C;AAC1C,yBAAyB;AAEzB,8BAA8B;AAC9B,+BAA+B;AAC/B,yDAA6C;AAC7C,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAGjC,uEAAuE;AAEvE,MAAM,QAAQ,GAAG,IAAA,yBAAc,GAAE,CAAC;AAElC,SAAS,4BAA4B,CAAC,GAAW;IAChD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,GAAG,EAAE,CAAC,CAAC;IACrD,MAAM,OAAO,GAAuB,EAAE,CAAC;IACvC,OAAO,CAAC,OAAO,GAAG,KAAK,CAAC;IACxB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IACzB,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,EAAE,EAAE,sCAAsC;QAC/E,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC;KAC1B;IACD,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC;IAC1B,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC;IAC1B,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAC7C,OAAO,CAAC,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3E,OAAO,OAAO,CAAC;AAChB,CAAC;AAED,SAAS,aAAa,CAAC,GAAW,EAAE,KAAc,EAAE,SAAkB,EAAE,aAAyC;IAChH,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAA2B,CAAC;IACvD,MAAM,UAAU,GAAG,OAAO,CAAC,iBAAiB,CAAqC,CAAC;IAGlF,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,eAAe,CAAC,CAAC;IACzE,MAAM,eAAe,GAAG,EAAE,GAAG,4BAA4B,CAAC,GAAG,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;IAChG,IAAI,CAAC,KAAK,EAAE;QACX,eAAe,CAAC,eAAe,GAAG,IAAI,CAAC;KACvC;IAED,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,eAAe,EAAE;QAC5D,OAAO,EAAE,KAAK;QACd,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC;QACrC,gBAAgB,EAAE,OAAO,aAAa,KAAK,SAAS,IAAI,aAAa,CAAC,GAAG;KACzE,EAAE,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IAEzB,SAAS,QAAQ,CAAC,KAA+B;QAChD,MAAM,GAAG,GAAG,OAAO,CAAC,UAAU,CAA8B,CAAC;QAE7D,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACnF,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC9D,MAAM,oBAAoB,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAEhF,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,KAAK;aAClB,IAAI,CAAC,UAAU,CAAC;aAChB,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,yEAAyE;aACrF,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;aACxB,IAAI,CAAC,QAAQ,CAAC;aACd,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;aAC3B,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;aACxB,IAAI,CAAC,oBAAoB,CAAC;aAC1B,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC;aACtC,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC;aAClC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE;YAC1D,UAAU,EAAE,KAAK;YACjB,cAAc,EAAE,CAAC,CAAC,KAAK;YACvB,UAAU,EAAE,eAAe,CAAC,UAAU;SACtC,CAAC,CAAC;aACF,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;aACtB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QAElC,OAAO,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC;IACD,QAAQ,CAAC,YAAY,GAAG,GAAG,EAAE;QAC5B,OAAO,WAAW,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;IACvC,CAAC,CAAC;IACF,QAAQ,CAAC,WAAW,GAAG,WAAW,CAAC;IACnC,OAAO,QAAQ,CAAC;AACjB,CAAC;AAED,SAAgB,aAAa,CAAC,GAAW,EAAE,GAAW,EAAE,GAAY;IAEnE,OAAO;QAEN,MAAM,SAAS,GAAG,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QAC3D,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,GAAG,EAAE,EAAE,CAAC,CAAC;QAE1D,OAAO,OAAO;aACZ,IAAI,CAAC,SAAS,EAAE,CAAC;aACjB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACxB,CAAC,CAAC;AACH,CAAC;AAXD,sCAWC;AAED,SAAgB,WAAW,CAAC,GAAW,EAAE,GAAW,EAAE,KAAc;IAEnE,OAAO;QAEN,IAAI,EAAE,CAAC,QAAQ,EAAE,GAAG,UAAa,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;SACnD;QAED,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QACvD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,GAAG,EAAE,EAAE,CAAC,CAAC;QAC1D,MAAM,SAAS,GAAG,IAAI,eAAe,CAAC,KAAK,CAAC,CAAC;QAC7C,IAAI,GAAG,KAAK,KAAK,EAAE;YAClB,SAAS,CAAC,OAAO,EAAE,CAAC;SACpB;QAED,mCAAmC;QACnC,IAAI,YAAY,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;QAChC,IAAI,KAAK,EAAE;YACV,IAAI,YAAY,GAAG,IAAI,0BAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YACpD,MAAM,qBAAqB,GAAG,YAAY,CAAC,sBAAsB,EAAE,CAAC;YACpE,YAAY,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,KAAK,CAAC,IAAU;gBAClD,MAAM,WAAW,GAAG,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACzD,IAAI,WAAW,KAAK,SAAS,EAAE;oBAC9B,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;iBACzC;gBACD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjB,CAAC,EAAE,SAAS,GAAG;gBACd,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAChB,iBAAiB;gBACjB,qBAAqB,CAAC,KAAK,EAAE,CAAC;gBACxB,YAAa,GAAG,SAAS,CAAC;YACjC,CAAC,CAAC,CAAC;SACH;QAED,OAAO,OAAO;aACZ,IAAI,CAAC,YAAY,CAAC;aAClB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;aACtB,IAAI,CAAC,OAAO,EAAE,CAAC;aACf,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACxB,CAAC,CAAC;AACH,CAAC;AAxCD,kCAwCC;AAED,SAAgB,SAAS,CAAC,GAAW,EAAE,KAAc;IAEpD,OAAO;QACN,MAAM,OAAO,GAAG,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAE1D,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAChD,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;QAElE,MAAM,SAAS,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC;QAC5C,SAAS,CAAC,OAAO,EAAE,CAAC;QAEpB,OAAO,QAAQ;aACb,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;aACtB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;aAC1C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACxB,CAAC,CAAC;AACH,CAAC;AAhBD,8BAgBC;AAED,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;AAE1D,MAAM,eAAe;IACH,QAAQ,CAAU;IACnB,MAAM,CAAyB;IAE9B,aAAa,CAAkC;IAC/C,WAAW,CAAuB;IAClC,oBAAoB,CAAgC;IAErE,YAAY,OAAgB;QAC3B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;QAC3B,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QACxB,MAAM,cAAc,GAAG,CAAC,QAAgB,EAAE,QAAgB,EAAE,EAAE;YAC7D,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBACnB,OAAO;aACP;YACD,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE;gBACjC,OAAO;aACP;YACD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;YAEpC,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,EAAE;gBAC3B,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;gBACpD,IAAI,CAAC,YAAY,EAAE,CAAC;YACrB,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC;QACF,IAAI,CAAC,WAAW,GAAG,IAAI,KAAM,SAAQ,SAAS,CAAC,UAAU;YACjD,YAAY,CAAC,QAAgB,EAAE,QAAgB;gBACrD,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;gBACnC,OAAO,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAC/C,CAAC;SACD,CAAC;QACF,IAAI,CAAC,oBAAoB,GAAG,IAAI,SAAS,CAAC,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAEhF,IAAI,IAAI,CAAC,QAAQ,EAAE;YAClB,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,GAAG,EAAE;gBACxC,IAAI,CAAC,YAAY,EAAE,CAAC;YACrB,CAAC,CAAC,CAAC;SACH;IACF,CAAC;IAEO,iBAAiB,GAAwB,IAAI,CAAC;IAC9C,YAAY;QACnB,IAAI,IAAI,CAAC,iBAAiB,KAAK,IAAI,EAAE;YACpC,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YACrC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;SAC9B;QACD,IAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC,GAAG,EAAE;YACxC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;YAC9B,IAAI,CAAC,OAAO,EAAE,CAAC;QAChB,CAAC,EAAE,EAAE,CAAC,CAAC;IACR,CAAC;IAEO,IAAI;QACX,MAAM,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACpD,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YACzB,4DAA4D;YAC5D,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;SAClE;QACD,OAAO,CAAC,CAAC;IACV,CAAC;IAEO,IAAI,CAAC,OAAY,EAAE,GAAG,IAAW;QACxC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IAC9D,CAAC;IAEM,OAAO;QACb,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAC3B,IAAI,CAAC,MAAM,EAAE;YACZ,yBAAyB;YACzB,OAAO;SACP;QACD,IAAI,MAAM,CAAC,SAAS,EAAE;YACrB,OAAO;SACP;QAED,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAClD,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,gDAAgD,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAC7G,IAAI,CAAC,IAAI,CAAC,4CAA4C,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,KAAK,CAAC,CAAC;QACnF,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YACnB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,qFAAqF,CAAC,CAAC;SACjH;IACF,CAAC;CACD;AAED,SAAS,wBAAwB;IAChC,IAAI,GAAW,CAAC;IAEhB,IAAI;QACH,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,uEAAuE,EAAE,OAAO,CAAC,CAAC;QAC9G,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjC,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC;KAChC;IAAC,MAAM;QACP,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC;KACb;IAED,MAAM,OAAO,GAAG,uCAAuC,CAAC;IACxD,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;IAExC,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,KAAK;SAClB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;SACpD,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAO,EAAE,EAAE;QAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEjC,IAAI,KAAK,EAAE;YACV,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;SAC5B;IACF,CAAC,EAAE;QACF,MAAM,KAAK,GAAG,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACjD,MAAM,QAAQ,GAAG;YAChB,iGAAiG;YACjG,+DAA+D;YAC/D,kGAAkG;YAClG,kGAAkG;YAClG,EAAE;YACF,oDAAoD;YACpD,EAAE;YACF,gDAAgD;YAChD,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI,6FAA6F,IAAI,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC,EAAE;YAC1J,KAAK;YACL,6DAA6D;YAC7D,EAAE;SACF,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEZ,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,CAAC;YAC1B,IAAI,EAAE,mEAAmE;YACzE,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;SAC/B,CAAC,CAAC,CAAC;QACJ,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC,CAAC;IAEL,OAAO,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AACjC,CAAC;AAED,MAAM,wBAAwB,GAAG,IAAA,yBAAc,EAAC,oBAAoB,CAAC,CAAC;AAEzD,QAAA,2BAA2B,GAAG,IAAI,CAAC,MAAM,CAAC,4BAA4B,EAAE,GAAG,EAAE;IACzF,OAAO,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC;SAClC,IAAI,CAAC,wBAAwB,EAAE,CAAC;SAChC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACtB,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;AAC5C,CAAC,CAAC,CAAC;AAEU,QAAA,yBAAyB,GAAG,IAAI,CAAC,MAAM,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACrF,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC;SAC9C,IAAI,CAAC,wBAAwB,EAAE,CAAC;SAChC,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;IAE3C,OAAO,KAAK,CAAC,mBAAmB,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC;SACnD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;SACzB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;AAC1B,CAAC,CAAC,CAAC"}
\ No newline at end of file
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"compilation.js","sourceRoot":"","sources":["compilation.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,mCAAmC;AACnC,yBAAyB;AACzB,6BAA6B;AAC7B,6BAA6B;AAC7B,0CAA0C;AAC1C,6BAA6B;AAC7B,yCAA4C;AAC5C,+BAA+B;AAC/B,sCAAsC;AACtC,0CAA0C;AAC1C,yBAAyB;AAEzB,8BAA8B;AAC9B,+BAA+B;AAC/B,yDAA6C;AAE7C,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAGjC,uEAAuE;AAEvE,MAAM,QAAQ,GAAG,IAAA,yBAAc,GAAE,CAAC;AAElC,SAAS,4BAA4B,CAAC,GAAW;IAChD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,GAAG,EAAE,CAAC,CAAC;IACrD,MAAM,OAAO,GAAuB,EAAE,CAAC;IACvC,OAAO,CAAC,OAAO,GAAG,KAAK,CAAC;IACxB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IACzB,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,EAAE,EAAE,sCAAsC;QAC/E,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC;KAC1B;IACD,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC;IAC1B,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC;IAC1B,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAC7C,OAAO,CAAC,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3E,OAAO,OAAO,CAAC;AAChB,CAAC;AAED,SAAS,aAAa,CAAC,GAAW,EAAE,KAAc,EAAE,SAAkB,EAAE,aAAyC;IAChH,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAA2B,CAAC;IACvD,MAAM,UAAU,GAAG,OAAO,CAAC,iBAAiB,CAAqC,CAAC;IAGlF,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,eAAe,CAAC,CAAC;IACzE,MAAM,eAAe,GAAG,EAAE,GAAG,4BAA4B,CAAC,GAAG,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;IAChG,IAAI,CAAC,KAAK,EAAE;QACX,eAAe,CAAC,eAAe,GAAG,IAAI,CAAC;KACvC;IAED,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,eAAe,EAAE;QAC5D,OAAO,EAAE,KAAK;QACd,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC;QACrC,gBAAgB,EAAE,OAAO,aAAa,KAAK,SAAS,IAAI,aAAa,CAAC,GAAG;KACzE,EAAE,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IAEzB,SAAS,QAAQ,CAAC,KAA+B;QAChD,MAAM,GAAG,GAAG,OAAO,CAAC,UAAU,CAA8B,CAAC;QAE7D,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACnF,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC9D,MAAM,oBAAoB,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAEhF,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,KAAK;aAClB,IAAI,CAAC,UAAU,CAAC;aAChB,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,yEAAyE;aACrF,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;aACxB,IAAI,CAAC,QAAQ,CAAC;aACd,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;aAC3B,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;aACxB,IAAI,CAAC,oBAAoB,CAAC;aAC1B,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC;aACtC,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC;aAClC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE;YAC1D,UAAU,EAAE,KAAK;YACjB,cAAc,EAAE,CAAC,CAAC,KAAK;YACvB,UAAU,EAAE,eAAe,CAAC,UAAU;SACtC,CAAC,CAAC;aACF,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;aACtB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QAElC,OAAO,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC;IACD,QAAQ,CAAC,YAAY,GAAG,GAAG,EAAE;QAC5B,OAAO,WAAW,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;IACvC,CAAC,CAAC;IACF,QAAQ,CAAC,WAAW,GAAG,WAAW,CAAC;IACnC,OAAO,QAAQ,CAAC;AACjB,CAAC;AAED,SAAgB,aAAa,CAAC,GAAW,EAAE,GAAW,EAAE,GAAY;IAEnE,OAAO;QAEN,MAAM,SAAS,GAAG,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QAC3D,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,GAAG,EAAE,EAAE,CAAC,CAAC;QAE1D,OAAO,OAAO;aACZ,IAAI,CAAC,SAAS,EAAE,CAAC;aACjB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACxB,CAAC,CAAC;AACH,CAAC;AAXD,sCAWC;AAED,SAAgB,WAAW,CAAC,GAAW,EAAE,GAAW,EAAE,KAAc;IAEnE,OAAO;QAEN,IAAI,EAAE,CAAC,QAAQ,EAAE,GAAG,UAAa,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;SACnD;QAED,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QACvD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,GAAG,EAAE,EAAE,CAAC,CAAC;QAC1D,MAAM,SAAS,GAAG,IAAI,eAAe,CAAC,KAAK,CAAC,CAAC;QAC7C,IAAI,GAAG,KAAK,KAAK,EAAE;YAClB,SAAS,CAAC,OAAO,EAAE,CAAC;SACpB;QAED,mCAAmC;QACnC,IAAI,YAAY,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;QAChC,IAAI,KAAK,EAAE;YACV,IAAI,YAAY,GAAG,IAAI,0BAAO,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;YAClH,MAAM,qBAAqB,GAAG,YAAY,CAAC,sBAAsB,EAAE,CAAC;YACpE,YAAY,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,KAAK,CAAC,IAAyC;gBACjF,MAAM,WAAW,GAAG,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACzD,IAAI,WAAW,KAAK,SAAS,EAAE;oBAC9B,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;oBAC7C,IAAI,CAAC,SAAS,GAAG,WAAW,CAAC,SAAS,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;iBAC5E;gBACD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjB,CAAC,EAAE,SAAS,GAAG;gBACd,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAChB,iBAAiB;gBACjB,qBAAqB,CAAC,KAAK,EAAE,CAAC;gBACxB,YAAa,GAAG,SAAS,CAAC;YACjC,CAAC,CAAC,CAAC;SACH;QAED,OAAO,OAAO;aACZ,IAAI,CAAC,YAAY,CAAC;aAClB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;aACtB,IAAI,CAAC,OAAO,EAAE,CAAC;aACf,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACxB,CAAC,CAAC;AACH,CAAC;AAzCD,kCAyCC;AAED,SAAgB,SAAS,CAAC,GAAW,EAAE,KAAc;IAEpD,OAAO;QACN,MAAM,OAAO,GAAG,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAE1D,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAChD,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;QAElE,MAAM,SAAS,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC;QAC5C,SAAS,CAAC,OAAO,EAAE,CAAC;QAEpB,OAAO,QAAQ;aACb,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;aACtB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;aAC1C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACxB,CAAC,CAAC;AACH,CAAC;AAhBD,8BAgBC;AAED,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;AAE1D,MAAM,eAAe;IACH,QAAQ,CAAU;IACnB,MAAM,CAAyB;IAE9B,aAAa,CAAkC;IAC/C,WAAW,CAAuB;IAClC,oBAAoB,CAAgC;IAErE,YAAY,OAAgB;QAC3B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;QAC3B,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QACxB,MAAM,cAAc,GAAG,CAAC,QAAgB,EAAE,QAAgB,EAAE,EAAE;YAC7D,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBACnB,OAAO;aACP;YACD,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE;gBACjC,OAAO;aACP;YACD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;YAEpC,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,EAAE;gBAC3B,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;gBACpD,IAAI,CAAC,YAAY,EAAE,CAAC;YACrB,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC;QACF,IAAI,CAAC,WAAW,GAAG,IAAI,KAAM,SAAQ,SAAS,CAAC,UAAU;YACjD,YAAY,CAAC,QAAgB,EAAE,QAAgB;gBACrD,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;gBACnC,OAAO,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAC/C,CAAC;SACD,CAAC;QACF,IAAI,CAAC,oBAAoB,GAAG,IAAI,SAAS,CAAC,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAEhF,IAAI,IAAI,CAAC,QAAQ,EAAE;YAClB,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,GAAG,EAAE;gBACxC,IAAI,CAAC,YAAY,EAAE,CAAC;YACrB,CAAC,CAAC,CAAC;SACH;IACF,CAAC;IAEO,iBAAiB,GAAwB,IAAI,CAAC;IAC9C,YAAY;QACnB,IAAI,IAAI,CAAC,iBAAiB,KAAK,IAAI,EAAE;YACpC,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YACrC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;SAC9B;QACD,IAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC,GAAG,EAAE;YACxC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;YAC9B,IAAI,CAAC,OAAO,EAAE,CAAC;QAChB,CAAC,EAAE,EAAE,CAAC,CAAC;IACR,CAAC;IAEO,IAAI;QACX,MAAM,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACpD,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YACzB,4DAA4D;YAC5D,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;SAClE;QACD,OAAO,CAAC,CAAC;IACV,CAAC;IAEO,IAAI,CAAC,OAAY,EAAE,GAAG,IAAW;QACxC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IAC9D,CAAC;IAEM,OAAO;QACb,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAC3B,IAAI,CAAC,MAAM,EAAE;YACZ,yBAAyB;YACzB,OAAO;SACP;QACD,IAAI,MAAM,CAAC,SAAS,EAAE;YACrB,OAAO;SACP;QAED,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAClD,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,gDAAgD,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAC7G,IAAI,CAAC,IAAI,CAAC,4CAA4C,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,KAAK,CAAC,CAAC;QACnF,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YACnB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,qFAAqF,CAAC,CAAC;SACjH;IACF,CAAC;CACD;AAED,SAAS,wBAAwB;IAChC,IAAI,GAAW,CAAC;IAEhB,IAAI;QACH,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,uEAAuE,EAAE,OAAO,CAAC,CAAC;QAC9G,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjC,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC;KAChC;IAAC,MAAM;QACP,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC;KACb;IAED,MAAM,OAAO,GAAG,uCAAuC,CAAC;IACxD,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;IAExC,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,KAAK;SAClB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;SACpD,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAO,EAAE,EAAE;QAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEjC,IAAI,KAAK,EAAE;YACV,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;SAC5B;IACF,CAAC,EAAE;QACF,MAAM,KAAK,GAAG,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACjD,MAAM,QAAQ,GAAG;YAChB,iGAAiG;YACjG,+DAA+D;YAC/D,kGAAkG;YAClG,kGAAkG;YAClG,EAAE;YACF,oDAAoD;YACpD,EAAE;YACF,gDAAgD;YAChD,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI,6FAA6F,IAAI,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC,EAAE;YAC1J,KAAK;YACL,6DAA6D;YAC7D,EAAE;SACF,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEZ,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,CAAC;YAC1B,IAAI,EAAE,mEAAmE;YACzE,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;SAC/B,CAAC,CAAC,CAAC;QACJ,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC,CAAC;IAEL,OAAO,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AACjC,CAAC;AAED,MAAM,wBAAwB,GAAG,IAAA,yBAAc,EAAC,oBAAoB,CAAC,CAAC;AAEzD,QAAA,2BAA2B,GAAG,IAAI,CAAC,MAAM,CAAC,4BAA4B,EAAE,GAAG,EAAE;IACzF,OAAO,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC;SAClC,IAAI,CAAC,wBAAwB,EAAE,CAAC;SAChC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACtB,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;AAC5C,CAAC,CAAC,CAAC;AAEU,QAAA,yBAAyB,GAAG,IAAI,CAAC,MAAM,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACrF,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC;SAC9C,IAAI,CAAC,wBAAwB,EAAE,CAAC;SAChC,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;IAE3C,OAAO,KAAK,CAAC,mBAAmB,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC;SACnD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;SACzB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;AAC1B,CAAC,CAAC,CAAC"}
\ No newline at end of file
diff --git a/build/lib/compilation.ts b/build/lib/compilation.ts
index 2cc04d2c9774c0..54fa32d25a063b 100644
--- a/build/lib/compilation.ts
+++ b/build/lib/compilation.ts
@@ -18,6 +18,7 @@ import ts = require('typescript');
 import * as File from 'vinyl';
 import * as task from './task';
 import { Mangler } from './mangleTypeScript';
+import { RawSourceMap } from 'source-map';
 const watch = require('./watch');
 
 
@@ -123,12 +124,13 @@ export function compileTask(src: string, out: string, build: boolean): () => Nod
 		// mangle: TypeScript to TypeScript
 		let mangleStream = es.through();
 		if (build) {
-			let ts2tsMangler = new Mangler(compile.projectPath);
+			let ts2tsMangler = new Mangler(compile.projectPath, (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data));
 			const newContentsByFileName = ts2tsMangler.computeNewFileContents();
-			mangleStream = es.through(function write(data: File) {
+			mangleStream = es.through(function write(data: File & { sourceMap?: RawSourceMap }) {
 				const newContents = newContentsByFileName.get(data.path);
 				if (newContents !== undefined) {
-					data.contents = Buffer.from(newContents);
+					data.contents = Buffer.from(newContents.out);
+					data.sourceMap = newContents.sourceMap && JSON.parse(newContents.sourceMap);
 				}
 				this.push(data);
 			}, function end() {
diff --git a/build/lib/extensions.js b/build/lib/extensions.js
index c9e1f128dce9a5..cea9bed189e4af 100644
--- a/build/lib/extensions.js
+++ b/build/lib/extensions.js
@@ -309,7 +309,8 @@ function packageLocalExtensionsStream(forWeb) {
         // also include shared production node modules
         const productionDependencies = (0, dependencies_1.getProductionDependencies)('extensions/');
         const dependenciesSrc = _.flatten(productionDependencies.map(d => path.relative(root, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`]));
-        result = es.merge(localExtensionsStream, gulp.src(dependenciesSrc, { base: '.' }));
+        result = es.merge(localExtensionsStream, gulp.src(dependenciesSrc, { base: '.' })
+            .pipe(util2.cleanNodeModules(path.join(root, 'build', '.moduleignore'))));
     }
     return (result
         .pipe(util2.setExecutableBit(['**/*.sh'])));
@@ -517,4 +518,4 @@ async function buildExtensionMedia(isWatch, outputRoot) {
     })));
 }
 exports.buildExtensionMedia = buildExtensionMedia;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"extensions.js","sourceRoot":"","sources":["extensions.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,mCAAmC;AACnC,yBAAyB;AACzB,oCAAoC;AACpC,6BAA6B;AAC7B,6BAA6B;AAC7B,6BAA6B;AAC7B,qCAAqC;AACrC,6BAAsB;AAEtB,8BAA8B;AAC9B,mCAA4C;AAC5C,gCAAgC;AAChC,MAAM,IAAI,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AACvC,sCAAuC;AACvC,sCAAuC;AACvC,sCAAsC;AACtC,0CAA0C;AAC1C,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AACtC,4CAA4C;AAE5C,iDAA2D;AAC3D,gCAAiC;AACjC,2DAAyD;AACzD,6CAA0C;AAE1C,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;AACnD,MAAM,MAAM,GAAG,IAAA,uBAAU,EAAC,IAAI,CAAC,CAAC;AAChC,MAAM,oBAAoB,GAAG,mDAAmD,MAAM,EAAE,CAAC;AAEzF,SAAS,wBAAwB,CAAC,KAAa;IAC9C,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,WAAW,EAAE,oBAAoB,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAClF,OAAO,KAAK;SACV,IAAI,CAAC,UAAU,CAAC;SAChB,IAAI,CAAC,MAAM,EAAE,CAAC;SACd,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAO,EAAE,EAAE;QAC5B,MAAM,MAAM,GAA6B,EAAE,CAAC;QAC5C,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;QACnG,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YACxB,mEAAmE;YACnE,CAAC,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;SAChD;QACD,OAAO,CAAC,CAAC;IACV,CAAC,CAAC,CAAC;SACF,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AAC5B,CAAC;AAED,SAAS,0BAA0B,CAAC,KAAa,EAAE,MAA0B;IAC5E,MAAM,iBAAiB,GAAG,MAAM,CAAC,2BAA2B,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IACjF,OAAO,KAAK;SACV,IAAI,CAAC,iBAAiB,CAAC;SACvB,IAAI,CAAC,MAAM,EAAE,CAAC;SACd,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAO,EAAE,EAAE;QAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QACrD,CAAC,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvD,OAAO,CAAC,CAAC;IACV,CAAC,CAAC,CAAC;SACF,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC;AAED,SAAS,SAAS,CAAC,aAAqB,EAAE,MAAe;IACxD,MAAM,qBAAqB,GAAG,MAAM,CAAC,CAAC,CAAC,qCAAqC,CAAC,CAAC,CAAC,6BAA6B,CAAC;IAE7G,MAAM,WAAW,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,qBAAqB,CAAC,CAAC,CAAC;IACnF,IAAI,KAAK,GAAG,WAAW;QACtB,CAAC,CAAC,gBAAgB,CAAC,aAAa,EAAE,qBAAqB,CAAC;QACxD,CAAC,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;IAElC,IAAI,WAAW,EAAE;QAChB,KAAK,GAAG,0BAA0B,CAAC,KAAK,EAAE,CAAC,IAAS,EAAE,EAAE;YACvD,OAAO,IAAI,CAAC,OAAO,CAAC;YACpB,OAAO,IAAI,CAAC,YAAY,CAAC;YACzB,OAAO,IAAI,CAAC,eAAe,CAAC;YAC5B,IAAI,IAAI,CAAC,IAAI,EAAE;gBACd,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;aACjD;YACD,OAAO,IAAI,CAAC;QACb,CAAC,CAAC,CAAC;KACH;IAED,OAAO,KAAK,CAAC;AACd,CAAC;AAGD,SAAS,gBAAgB,CAAC,aAAqB,EAAE,qBAA6B;IAC7E,MAAM,MAAM,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAE5B,MAAM,oBAAoB,GAAa,EAAE,CAAC;IAC1C,MAAM,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;IAC5E,IAAI,iBAAiB,CAAC,YAAY,EAAE;QACnC,MAAM,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,qBAAqB,CAAC,CAAC,CAAC;QACnF,KAAK,MAAM,GAAG,IAAI,iBAAiB,CAAC,SAAS,EAAE;YAC9C,IAAI,GAAG,IAAI,iBAAiB,CAAC,YAAY,EAAE;gBAC1C,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC/B;SACD;KACD;IAED,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAA0B,CAAC;IACtD,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IACnC,MAAM,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAE9C,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,oBAAoB,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;QACvH,MAAM,KAAK,GAAG,SAAS;aACrB,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;aACnD,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC;YACzB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAC3B,IAAI,EAAE,aAAa;YACnB,QAAQ,EAAE,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAQ;SAC9C,CAAC,CAAC,CAAC;QAEL,+DAA+D;QAC/D,8CAA8C;QAC9C,MAAM,sBAAsB,GAAc,IAAI,CAAC,IAAI,CAClD,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,EAAE,qBAAqB,CAAC,EACrD,EAAE,MAAM,EAAE,CAAC,iBAAiB,CAAC,EAAE,CAC9B,CAAC;QAEH,MAAM,cAAc,GAAG,sBAAsB,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE;YAEzE,MAAM,WAAW,GAAG,CAAC,GAAQ,EAAE,KAAU,EAAE,EAAE;gBAC5C,QAAQ,CAAC,sBAAsB,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;gBACjJ,IAAI,GAAG,EAAE;oBACR,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;iBAC1B;gBACD,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;gBAC9B,IAAI,WAAW,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;oBAClC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;iBACpD;gBACD,IAAI,WAAW,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;oBACpC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;iBACtD;YACF,CAAC,CAAC;YAEF,MAAM,cAAc,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;YAClD,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;gBACvF,MAAM,aAAa,GAAG;oBACrB,GAAG,MAAM;oBACT,GAAG,EAAE,IAAI,EAAE,YAAY,EAAE;iBACzB,CAAC;gBACF,MAAM,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAEnF,OAAO,WAAW,CAAC,aAAa,EAAE,OAAO,EAAE,WAAW,CAAC;qBACrD,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,IAAI;oBAC9B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;oBAC5B,IAAI,CAAC,IAAI,GAAG,aAAa,CAAC;oBAC1B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBACzB,CAAC,CAAC,CAAC;qBACF,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,IAAU;oBACpC,uBAAuB;oBACvB,6BAA6B;oBAC7B,mDAAmD;oBACnD,MAAM,QAAQ,GAAY,IAAI,CAAC,QAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;oBAC1D,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,kCAAkC,EAAE,UAAU,EAAE,EAAE,EAAE;wBAChG,OAAO,0BAA0B,oBAAoB,eAAe,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,kBAAkB,IAAI,EAAE,EAAE,CAAC;oBAChI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;oBAEZ,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBACzB,CAAC,CAAC,CAAC,CAAC;YACN,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,KAAK,CAAC,GAAG,cAAc,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAC/C,qCAAqC;YACrC,YAAY;YACZ,wDAAwD;YACxD,4BAA4B;YAC5B,MAAM;aACL,IAAI,CAAC,MAAM,CAAC,CAAC;IAEhB,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAC7B,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACpC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC,IAAI,CAAC,IAAA,yBAAiB,EAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;AACrE,CAAC;AAED,SAAS,eAAe,CAAC,aAAqB;IAC7C,MAAM,MAAM,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAE5B,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAA0B,CAAC;IAEtD,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;SAC9E,IAAI,CAAC,SAAS,CAAC,EAAE;QACjB,MAAM,KAAK,GAAG,SAAS;aACrB,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;aACnD,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC;YACzB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAC3B,IAAI,EAAE,aAAa;YACnB,QAAQ,EAAE,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAQ;SAC9C,CAAC,CAAC,CAAC;QAEL,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC,CAAC;SACD,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;IAE1C,OAAO,MAAM,CAAC,IAAI,CAAC,IAAA,yBAAiB,EAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;AACrE,CAAC;AAED,MAAM,SAAS,GAAG,cAAc,CAAC;AACjC,MAAM,WAAW,GAAG;IACnB,oBAAoB,EAAE,cAAc;IACpC,YAAY,EAAE,SAAS;IACvB,kBAAkB,EAAE,sCAAsC;CAC1D,CAAC;AAEF,SAAgB,eAAe,CAAC,UAAkB,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,QAAQ,EAAqB;IAChH,MAAM,MAAM,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAChD,MAAM,IAAI,GAAG,OAAO,CAAC,kBAAkB,CAAsC,CAAC;IAE9E,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnD,MAAM,GAAG,GAAG,GAAG,UAAU,eAAe,SAAS,iBAAiB,IAAI,IAAI,OAAO,YAAY,CAAC;IAE9F,QAAQ,CAAC,wBAAwB,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,aAAa,IAAI,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IAE5F,MAAM,OAAO,GAAG;QACf,IAAI,EAAE,GAAG;QACT,cAAc,EAAE;YACf,IAAI,EAAE,IAAI;YACV,OAAO,EAAE,WAAW;SACpB;KACD,CAAC;IAEF,MAAM,iBAAiB,GAAG,MAAM,CAAC,cAAc,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAEpE,OAAO,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC;SACxB,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;SAChB,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;SAC5B,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAQ,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,CAAC;SACtE,IAAI,CAAC,iBAAiB,CAAC;SACvB,IAAI,CAAC,MAAM,EAAE,CAAC;SACd,IAAI,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC;SACpC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC;AA3BD,0CA2BC;AAED,MAAM,YAAY,GAA2B;IAC5C,MAAM,EAAE,gCAAgC;IACxC,YAAY,EAAE,SAAS;CACvB,CAAC;AACF,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE;IAC7B,YAAY,CAAC,aAAa,GAAG,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;CACjG;AACD,MAAM,iBAAiB,GAAG;IACzB,GAAG,YAAY;IACf,MAAM,EAAE,0BAA0B;CAClC,CAAC;AAEF,SAAgB,UAAU,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAqB;IAC9E,MAAM,MAAM,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAChD,MAAM,IAAI,GAAG,OAAO,CAAC,kBAAkB,CAAsC,CAAC;IAE9E,QAAQ,CAAC,gCAAgC,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,IAAI,IAAI,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IAE3F,MAAM,iBAAiB,GAAG,MAAM,CAAC,cAAc,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAEpE,OAAO,MAAM,CAAC,CAAC,SAAS,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,mBAAmB,OAAO,EAAE,CAAC,EAAE;QAC5E,IAAI,EAAE,wBAAwB;QAC9B,cAAc,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE;KACzC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,IAAI,EAAE,QAAQ;QAClD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;QACrG,IAAI,CAAC,KAAK,EAAE;YACX,OAAO,QAAQ,CAAC,IAAI,KAAK,CAAC,qCAAqC,IAAI,MAAM,OAAO,EAAE,CAAC,CAAC,CAAC;SACrF;QAED,MAAM,GAAG,GAAG,aAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;QACxF,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACrC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACtB,CAAC,CAAC,CAAC;SACD,IAAI,CAAC,MAAM,EAAE,CAAC;SACd,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;SAChB,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;SAC5B,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAQ,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,CAAC;SACtE,IAAI,CAAC,iBAAiB,CAAC;SACvB,IAAI,CAAC,MAAM,EAAE,CAAC;SACd,IAAI,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC;SACpC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC;AA7BD,gCA6BC;AAED,MAAM,kBAAkB,GAAG;IAC1B,kBAAkB;IAClB,uBAAuB;IACvB,sBAAsB;IACtB,sBAAsB;IACtB,uBAAuB;CACvB,CAAC;AAEF,MAAM,+BAA+B,GAAG,IAAI,GAAG,CAAC;IAC/C,sBAAsB;IACtB,uBAAuB;IACvB,8BAA8B;IAC9B,oBAAoB;IACpB,mCAAmC;CACnC,CAAC,CAAC;AASH,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;AACpG,MAAM,iBAAiB,GAAwB,WAAW,CAAC,iBAAiB,IAAI,EAAE,CAAC;AACnF,MAAM,oBAAoB,GAAwB,WAAW,CAAC,oBAAoB,IAAI,EAAE,CAAC;AAWzF;;GAEG;AACH,SAAS,cAAc,CAAC,QAA4B;IACnD,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QAC9B,OAAO,IAAI,CAAC;KACZ;IACD,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAC3B,OAAO,KAAK,CAAC;KACb;IACD,2BAA2B;IAC3B,IAAI,OAAO,QAAQ,CAAC,aAAa,KAAK,WAAW,EAAE;QAClD,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QAChH,IAAI,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YACtC,OAAO,IAAI,CAAC;SACZ;KACD;IACD,IAAI,OAAO,QAAQ,CAAC,WAAW,KAAK,WAAW,EAAE;QAChD,KAAK,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,UAAU,EAAE,yBAAyB,CAAC,EAAE;YACtE,IAAI,QAAQ,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE;gBAC5C,OAAO,KAAK,CAAC;aACb;SACD;KACD;IACD,OAAO,IAAI,CAAC;AACb,CAAC;AAED,SAAgB,4BAA4B,CAAC,MAAe;IAC3D,MAAM,2BAA2B,GAAG,CACxB,IAAI,CAAC,IAAI,CAAC,2BAA2B,CAAE;SAChD,GAAG,CAAC,YAAY,CAAC,EAAE;QACnB,MAAM,oBAAoB,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC3D,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;QAClE,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QACnD,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,YAAY,EAAE,oBAAoB,EAAE,CAAC;IACzF,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;SAC7D,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;SACnE,MAAM,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CACvF,CAAC;IACF,MAAM,qBAAqB,GAAG,wBAAwB,CACrD,EAAE,CAAC,KAAK,CACP,GAAG,2BAA2B,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;QAC9C,OAAO,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC;aACtC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,cAAc,SAAS,CAAC,IAAI,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC9E,CAAC,CAAC,CACF,CACD,CAAC;IAEF,IAAI,MAAc,CAAC;IACnB,IAAI,MAAM,EAAE;QACX,MAAM,GAAG,qBAAqB,CAAC;KAC/B;SAAM;QACN,8CAA8C;QAC9C,MAAM,sBAAsB,GAAG,IAAA,wCAAyB,EAAC,aAAa,CAAC,CAAC;QACxE,MAAM,eAAe,GAAG,CAAC,CAAC,OAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAClJ,MAAM,GAAG,EAAE,CAAC,KAAK,CAAC,qBAAqB,EAAE,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;KACnF;IAED,OAAO,CACN,MAAM;SACJ,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAC3C,CAAC;AACH,CAAC;AApCD,oEAoCC;AAED,SAAgB,kCAAkC,CAAC,MAAe;IACjE,MAAM,iCAAiC,GAAG;QACzC,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,+BAA+B,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACvG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;KACvC,CAAC;IACF,MAAM,2BAA2B,GAAG,wBAAwB,CAC3D,EAAE,CAAC,KAAK,CACP,GAAG,iCAAiC;SAClC,GAAG,CAAC,SAAS,CAAC,EAAE;QAChB,MAAM,GAAG,GAAG,IAAA,sCAAkB,EAAC,SAAS,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,cAAc,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACnG,OAAO,0BAA0B,CAAC,GAAG,EAAE,CAAC,IAAS,EAAE,EAAE;YACpD,OAAO,IAAI,CAAC,OAAO,CAAC;YACpB,OAAO,IAAI,CAAC,YAAY,CAAC;YACzB,OAAO,IAAI,CAAC,eAAe,CAAC;YAC5B,OAAO,IAAI,CAAC;QACb,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CACH,CACD,CAAC;IAEF,OAAO,CACN,2BAA2B;SACzB,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAC3C,CAAC;AACH,CAAC;AAxBD,gFAwBC;AAWD,SAAgB,qBAAqB,CAAC,cAAsB,EAAE,UAAoB,EAAE;IACnF,MAAM,iBAAiB,GAA+B,EAAE,CAAC;IAEzD,IAAI;QACH,MAAM,iBAAiB,GAAG,EAAE,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;QACzD,KAAK,MAAM,eAAe,IAAI,iBAAiB,EAAE;YAChD,IAAI,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE;gBAC1C,SAAS;aACT;YACD,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,eAAe,EAAE,cAAc,CAAC,CAAC;YACnF,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;gBACpC,SAAS;aACT;YACD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;YAClF,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE;gBACjC,SAAS;aACT;YACD,MAAM,QAAQ,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC,CAAC;YAC5E,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;YACjF,MAAM,UAAU,GAAG,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,eAAe,EAAE,cAAc,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACnJ,IAAI,sBAA0C,CAAC;YAC/C,IAAI,WAAW,CAAC,OAAO,EAAE;gBACxB,MAAM,2BAA2B,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;gBAClG,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,2BAA2B,EAAE,mBAAmB,CAAC,CAAC,EAAE;oBAC/F,sBAAsB,GAAG,IAAI,CAAC,IAAI,CAAC,2BAA2B,EAAE,mBAAmB,CAAC,CAAC;iBACrF;aACD;YACD,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,wBAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACjF,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,2BAA2B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAEvF,iBAAiB,CAAC,IAAI,CAAC;gBACtB,aAAa,EAAE,eAAe;gBAC9B,WAAW;gBACX,UAAU;gBACV,sBAAsB;gBACtB,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;gBACnE,aAAa,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS;aAC5E,CAAC,CAAC;SACH;QACD,OAAO,iBAAiB,CAAC;KACzB;IAAC,OAAO,EAAE,EAAE;QACZ,OAAO,iBAAiB,CAAC;KACzB;AACF,CAAC;AA3CD,sDA2CC;AAED,SAAgB,oBAAoB,CAAC,WAAmB,EAAE,cAAsB;IAI/E,MAAM,WAAW,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACtC,MAAM,UAAU,GAAc,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IACrF,MAAM,SAAS,GAAG,CAAC,GAAQ,EAAE,EAAE;QAC9B,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE;YACtB,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;YACrB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACvB,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;aACvB;iBAAM,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;gBAC1C,SAAS,CAAC,GAAG,CAAC,CAAC;aACf;iBAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,WAAW,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,WAAW,EAAE;gBAC1H,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;gBAC7D,IAAI,UAAU,EAAE;oBACf,GAAG,CAAC,GAAG,CAAC,GAAG,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,UAAU,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;iBAC7H;aACD;SACD;IACF,CAAC,CAAC;IACF,SAAS,CAAC,WAAW,CAAC,CAAC;IACvB,OAAO,WAAW,CAAC;AACpB,CAAC;AAvBD,oDAuBC;AAED,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;AAErD,iFAAiF;AACjF,MAAM,mBAAmB,GAAG;IAC3B,gDAAgD;IAChD,+CAA+C;IAC/C,0BAA0B;IAC1B,+BAA+B;IAC/B,kBAAkB;IAClB,mCAAmC;CACnC,CAAC;AAEK,KAAK,UAAU,iBAAiB,CAAC,QAAgB,EAAE,OAAgB,EAAE,sBAAqE;IAChJ,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAA6B,CAAC;IAE/D,MAAM,cAAc,GAA4B,EAAE,CAAC;IAEnD,KAAK,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,IAAI,sBAAsB,EAAE;QAChE,MAAM,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;QAC9C,SAAS,SAAS,CAAC,iBAA6H;YAC/I,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,EAAE;gBACpG,MAAM,MAAM,GAAG,OAAO,UAAU,KAAK,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;gBAClF,IAAI,UAAU,EAAE;oBACf,MAAM,CAAC,MAAO,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAO,CAAC,IAAK,CAAC,CAAC,CAAC;iBAC3G;gBACD,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAC5B;QACF,CAAC;QACD,SAAS,CAAC,iBAAiB,CAAC,CAAC;KAC7B;IACD,SAAS,QAAQ,CAAC,SAAc;QAC/B,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE;YACtC,KAAK,MAAM,KAAK,IAAI,SAAS,CAAC,QAAQ,EAAE;gBACvC,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;gBACpC,IAAI,UAAU,EAAE;oBACf,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;oBACnF,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;oBAC/D,QAAQ,CAAC,YAAY,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,KAAM,CAAC,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,MAAM,CAAC,MAAM,UAAU,CAAC,CAAC;iBACrH;gBACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;oBAChC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;wBACnC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBACvB,CAAC,CAAC,CAAC;iBACH;gBACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;oBAClC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE;wBACvC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBACxB,CAAC,CAAC,CAAC;iBACH;aACD;SACD;IACF,CAAC;IACD,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC5C,IAAI,OAAO,EAAE;YACZ,OAAO,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBAChD,IAAI,GAAG,EAAE;oBACR,MAAM,EAAE,CAAC;iBACT;qBAAM;oBACN,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;iBAC1B;YACF,CAAC,CAAC,CAAC;SACH;aAAM;YACN,OAAO,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBAC1C,IAAI,GAAG,EAAE;oBACR,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBACpB,MAAM,EAAE,CAAC;iBACT;qBAAM;oBACN,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;oBAC1B,OAAO,EAAE,CAAC;iBACV;YACF,CAAC,CAAC,CAAC;SACH;IACF,CAAC,CAAC,CAAC;AACJ,CAAC;AA7DD,8CA6DC;AAED,KAAK,UAAU,iBAAiB,CAAC,QAAgB,EAAE,OAAgB,EAAE,OAAkD;IACtH,SAAS,QAAQ,CAAC,QAAgB,EAAE,MAAc;QACjD,MAAM,OAAO,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;QACjE,QAAQ,CAAC,YAAY,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,MAAM,SAAS,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QAC1G,KAAK,MAAM,KAAK,IAAI,OAAO,IAAI,EAAE,EAAE;YAClC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SACtB;IACF,CAAC;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE;QACpD,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC5C,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;YACtB,IAAI,OAAO,EAAE;gBACZ,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aACrB;YACD,IAAI,UAAU,EAAE;gBACf,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;aACtC;YACD,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC9E,IAAI,KAAK,EAAE;oBACV,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;iBACrB;gBACD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBACzB,IAAI,MAAM,EAAE;oBACX,OAAO,MAAM,EAAE,CAAC;iBAChB;gBACD,OAAO,OAAO,EAAE,CAAC;YAClB,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,MAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBAChC,QAAQ,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACrE,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AAC3B,CAAC;AAEM,KAAK,UAAU,mBAAmB,CAAC,OAAgB,EAAE,UAAmB;IAC9E,OAAO,iBAAiB,CAAC,4BAA4B,EAAE,OAAO,EAAE,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC7F,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;QACpC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;KACjF,CAAC,CAAC,CAAC,CAAC;AACN,CAAC;AALD,kDAKC"}
\ No newline at end of file
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"extensions.js","sourceRoot":"","sources":["extensions.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,mCAAmC;AACnC,yBAAyB;AACzB,oCAAoC;AACpC,6BAA6B;AAC7B,6BAA6B;AAC7B,6BAA6B;AAC7B,qCAAqC;AACrC,6BAAsB;AAEtB,8BAA8B;AAC9B,mCAA4C;AAC5C,gCAAgC;AAChC,MAAM,IAAI,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AACvC,sCAAuC;AACvC,sCAAuC;AACvC,sCAAsC;AACtC,0CAA0C;AAC1C,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AACtC,4CAA4C;AAE5C,iDAA2D;AAC3D,gCAAiC;AACjC,2DAAyD;AACzD,6CAA0C;AAE1C,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;AACnD,MAAM,MAAM,GAAG,IAAA,uBAAU,EAAC,IAAI,CAAC,CAAC;AAChC,MAAM,oBAAoB,GAAG,mDAAmD,MAAM,EAAE,CAAC;AAEzF,SAAS,wBAAwB,CAAC,KAAa;IAC9C,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,WAAW,EAAE,oBAAoB,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAClF,OAAO,KAAK;SACV,IAAI,CAAC,UAAU,CAAC;SAChB,IAAI,CAAC,MAAM,EAAE,CAAC;SACd,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAO,EAAE,EAAE;QAC5B,MAAM,MAAM,GAA6B,EAAE,CAAC;QAC5C,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;QACnG,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YACxB,mEAAmE;YACnE,CAAC,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;SAChD;QACD,OAAO,CAAC,CAAC;IACV,CAAC,CAAC,CAAC;SACF,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AAC5B,CAAC;AAED,SAAS,0BAA0B,CAAC,KAAa,EAAE,MAA0B;IAC5E,MAAM,iBAAiB,GAAG,MAAM,CAAC,2BAA2B,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IACjF,OAAO,KAAK;SACV,IAAI,CAAC,iBAAiB,CAAC;SACvB,IAAI,CAAC,MAAM,EAAE,CAAC;SACd,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAO,EAAE,EAAE;QAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QACrD,CAAC,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvD,OAAO,CAAC,CAAC;IACV,CAAC,CAAC,CAAC;SACF,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC;AAED,SAAS,SAAS,CAAC,aAAqB,EAAE,MAAe;IACxD,MAAM,qBAAqB,GAAG,MAAM,CAAC,CAAC,CAAC,qCAAqC,CAAC,CAAC,CAAC,6BAA6B,CAAC;IAE7G,MAAM,WAAW,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,qBAAqB,CAAC,CAAC,CAAC;IACnF,IAAI,KAAK,GAAG,WAAW;QACtB,CAAC,CAAC,gBAAgB,CAAC,aAAa,EAAE,qBAAqB,CAAC;QACxD,CAAC,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;IAElC,IAAI,WAAW,EAAE;QAChB,KAAK,GAAG,0BAA0B,CAAC,KAAK,EAAE,CAAC,IAAS,EAAE,EAAE;YACvD,OAAO,IAAI,CAAC,OAAO,CAAC;YACpB,OAAO,IAAI,CAAC,YAAY,CAAC;YACzB,OAAO,IAAI,CAAC,eAAe,CAAC;YAC5B,IAAI,IAAI,CAAC,IAAI,EAAE;gBACd,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;aACjD;YACD,OAAO,IAAI,CAAC;QACb,CAAC,CAAC,CAAC;KACH;IAED,OAAO,KAAK,CAAC;AACd,CAAC;AAGD,SAAS,gBAAgB,CAAC,aAAqB,EAAE,qBAA6B;IAC7E,MAAM,MAAM,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAE5B,MAAM,oBAAoB,GAAa,EAAE,CAAC;IAC1C,MAAM,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;IAC5E,IAAI,iBAAiB,CAAC,YAAY,EAAE;QACnC,MAAM,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,qBAAqB,CAAC,CAAC,CAAC;QACnF,KAAK,MAAM,GAAG,IAAI,iBAAiB,CAAC,SAAS,EAAE;YAC9C,IAAI,GAAG,IAAI,iBAAiB,CAAC,YAAY,EAAE;gBAC1C,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC/B;SACD;KACD;IAED,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAA0B,CAAC;IACtD,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IACnC,MAAM,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAE9C,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,oBAAoB,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;QACvH,MAAM,KAAK,GAAG,SAAS;aACrB,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;aACnD,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC;YACzB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAC3B,IAAI,EAAE,aAAa;YACnB,QAAQ,EAAE,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAQ;SAC9C,CAAC,CAAC,CAAC;QAEL,+DAA+D;QAC/D,8CAA8C;QAC9C,MAAM,sBAAsB,GAAc,IAAI,CAAC,IAAI,CAClD,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,EAAE,qBAAqB,CAAC,EACrD,EAAE,MAAM,EAAE,CAAC,iBAAiB,CAAC,EAAE,CAC9B,CAAC;QAEH,MAAM,cAAc,GAAG,sBAAsB,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE;YAEzE,MAAM,WAAW,GAAG,CAAC,GAAQ,EAAE,KAAU,EAAE,EAAE;gBAC5C,QAAQ,CAAC,sBAAsB,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;gBACjJ,IAAI,GAAG,EAAE;oBACR,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;iBAC1B;gBACD,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;gBAC9B,IAAI,WAAW,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;oBAClC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;iBACpD;gBACD,IAAI,WAAW,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;oBACpC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;iBACtD;YACF,CAAC,CAAC;YAEF,MAAM,cAAc,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;YAClD,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;gBACvF,MAAM,aAAa,GAAG;oBACrB,GAAG,MAAM;oBACT,GAAG,EAAE,IAAI,EAAE,YAAY,EAAE;iBACzB,CAAC;gBACF,MAAM,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAEnF,OAAO,WAAW,CAAC,aAAa,EAAE,OAAO,EAAE,WAAW,CAAC;qBACrD,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,IAAI;oBAC9B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;oBAC5B,IAAI,CAAC,IAAI,GAAG,aAAa,CAAC;oBAC1B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBACzB,CAAC,CAAC,CAAC;qBACF,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,IAAU;oBACpC,uBAAuB;oBACvB,6BAA6B;oBAC7B,mDAAmD;oBACnD,MAAM,QAAQ,GAAY,IAAI,CAAC,QAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;oBAC1D,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,kCAAkC,EAAE,UAAU,EAAE,EAAE,EAAE;wBAChG,OAAO,0BAA0B,oBAAoB,eAAe,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,kBAAkB,IAAI,EAAE,EAAE,CAAC;oBAChI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;oBAEZ,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBACzB,CAAC,CAAC,CAAC,CAAC;YACN,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,KAAK,CAAC,GAAG,cAAc,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAC/C,qCAAqC;YACrC,YAAY;YACZ,wDAAwD;YACxD,4BAA4B;YAC5B,MAAM;aACL,IAAI,CAAC,MAAM,CAAC,CAAC;IAEhB,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAC7B,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACpC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC,IAAI,CAAC,IAAA,yBAAiB,EAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;AACrE,CAAC;AAED,SAAS,eAAe,CAAC,aAAqB;IAC7C,MAAM,MAAM,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAE5B,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAA0B,CAAC;IAEtD,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;SAC9E,IAAI,CAAC,SAAS,CAAC,EAAE;QACjB,MAAM,KAAK,GAAG,SAAS;aACrB,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;aACnD,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC;YACzB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAC3B,IAAI,EAAE,aAAa;YACnB,QAAQ,EAAE,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAQ;SAC9C,CAAC,CAAC,CAAC;QAEL,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC,CAAC;SACD,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;IAE1C,OAAO,MAAM,CAAC,IAAI,CAAC,IAAA,yBAAiB,EAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;AACrE,CAAC;AAED,MAAM,SAAS,GAAG,cAAc,CAAC;AACjC,MAAM,WAAW,GAAG;IACnB,oBAAoB,EAAE,cAAc;IACpC,YAAY,EAAE,SAAS;IACvB,kBAAkB,EAAE,sCAAsC;CAC1D,CAAC;AAEF,SAAgB,eAAe,CAAC,UAAkB,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,QAAQ,EAAqB;IAChH,MAAM,MAAM,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAChD,MAAM,IAAI,GAAG,OAAO,CAAC,kBAAkB,CAAsC,CAAC;IAE9E,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnD,MAAM,GAAG,GAAG,GAAG,UAAU,eAAe,SAAS,iBAAiB,IAAI,IAAI,OAAO,YAAY,CAAC;IAE9F,QAAQ,CAAC,wBAAwB,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,aAAa,IAAI,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IAE5F,MAAM,OAAO,GAAG;QACf,IAAI,EAAE,GAAG;QACT,cAAc,EAAE;YACf,IAAI,EAAE,IAAI;YACV,OAAO,EAAE,WAAW;SACpB;KACD,CAAC;IAEF,MAAM,iBAAiB,GAAG,MAAM,CAAC,cAAc,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAEpE,OAAO,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC;SACxB,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;SAChB,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;SAC5B,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAQ,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,CAAC;SACtE,IAAI,CAAC,iBAAiB,CAAC;SACvB,IAAI,CAAC,MAAM,EAAE,CAAC;SACd,IAAI,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC;SACpC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC;AA3BD,0CA2BC;AAED,MAAM,YAAY,GAA2B;IAC5C,MAAM,EAAE,gCAAgC;IACxC,YAAY,EAAE,SAAS;CACvB,CAAC;AACF,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE;IAC7B,YAAY,CAAC,aAAa,GAAG,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;CACjG;AACD,MAAM,iBAAiB,GAAG;IACzB,GAAG,YAAY;IACf,MAAM,EAAE,0BAA0B;CAClC,CAAC;AAEF,SAAgB,UAAU,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAqB;IAC9E,MAAM,MAAM,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAChD,MAAM,IAAI,GAAG,OAAO,CAAC,kBAAkB,CAAsC,CAAC;IAE9E,QAAQ,CAAC,gCAAgC,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,IAAI,IAAI,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IAE3F,MAAM,iBAAiB,GAAG,MAAM,CAAC,cAAc,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAEpE,OAAO,MAAM,CAAC,CAAC,SAAS,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,mBAAmB,OAAO,EAAE,CAAC,EAAE;QAC5E,IAAI,EAAE,wBAAwB;QAC9B,cAAc,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE;KACzC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,IAAI,EAAE,QAAQ;QAClD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;QACrG,IAAI,CAAC,KAAK,EAAE;YACX,OAAO,QAAQ,CAAC,IAAI,KAAK,CAAC,qCAAqC,IAAI,MAAM,OAAO,EAAE,CAAC,CAAC,CAAC;SACrF;QAED,MAAM,GAAG,GAAG,aAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;QACxF,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACrC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACtB,CAAC,CAAC,CAAC;SACD,IAAI,CAAC,MAAM,EAAE,CAAC;SACd,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;SAChB,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;SAC5B,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAQ,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,CAAC;SACtE,IAAI,CAAC,iBAAiB,CAAC;SACvB,IAAI,CAAC,MAAM,EAAE,CAAC;SACd,IAAI,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC;SACpC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC;AA7BD,gCA6BC;AAED,MAAM,kBAAkB,GAAG;IAC1B,kBAAkB;IAClB,uBAAuB;IACvB,sBAAsB;IACtB,sBAAsB;IACtB,uBAAuB;CACvB,CAAC;AAEF,MAAM,+BAA+B,GAAG,IAAI,GAAG,CAAC;IAC/C,sBAAsB;IACtB,uBAAuB;IACvB,8BAA8B;IAC9B,oBAAoB;IACpB,mCAAmC;CACnC,CAAC,CAAC;AASH,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;AACpG,MAAM,iBAAiB,GAAwB,WAAW,CAAC,iBAAiB,IAAI,EAAE,CAAC;AACnF,MAAM,oBAAoB,GAAwB,WAAW,CAAC,oBAAoB,IAAI,EAAE,CAAC;AAWzF;;GAEG;AACH,SAAS,cAAc,CAAC,QAA4B;IACnD,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QAC9B,OAAO,IAAI,CAAC;KACZ;IACD,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAC3B,OAAO,KAAK,CAAC;KACb;IACD,2BAA2B;IAC3B,IAAI,OAAO,QAAQ,CAAC,aAAa,KAAK,WAAW,EAAE;QAClD,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QAChH,IAAI,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YACtC,OAAO,IAAI,CAAC;SACZ;KACD;IACD,IAAI,OAAO,QAAQ,CAAC,WAAW,KAAK,WAAW,EAAE;QAChD,KAAK,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,UAAU,EAAE,yBAAyB,CAAC,EAAE;YACtE,IAAI,QAAQ,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE;gBAC5C,OAAO,KAAK,CAAC;aACb;SACD;KACD;IACD,OAAO,IAAI,CAAC;AACb,CAAC;AAED,SAAgB,4BAA4B,CAAC,MAAe;IAC3D,MAAM,2BAA2B,GAAG,CACxB,IAAI,CAAC,IAAI,CAAC,2BAA2B,CAAE;SAChD,GAAG,CAAC,YAAY,CAAC,EAAE;QACnB,MAAM,oBAAoB,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC3D,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;QAClE,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QACnD,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,YAAY,EAAE,oBAAoB,EAAE,CAAC;IACzF,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;SAC7D,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;SACnE,MAAM,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CACvF,CAAC;IACF,MAAM,qBAAqB,GAAG,wBAAwB,CACrD,EAAE,CAAC,KAAK,CACP,GAAG,2BAA2B,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;QAC9C,OAAO,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC;aACtC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,cAAc,SAAS,CAAC,IAAI,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC9E,CAAC,CAAC,CACF,CACD,CAAC;IAEF,IAAI,MAAc,CAAC;IACnB,IAAI,MAAM,EAAE;QACX,MAAM,GAAG,qBAAqB,CAAC;KAC/B;SAAM;QACN,8CAA8C;QAC9C,MAAM,sBAAsB,GAAG,IAAA,wCAAyB,EAAC,aAAa,CAAC,CAAC;QACxE,MAAM,eAAe,GAAG,CAAC,CAAC,OAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAElJ,MAAM,GAAG,EAAE,CAAC,KAAK,CAChB,qBAAqB,EACrB,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;aACtC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;KAC5E;IAED,OAAO,CACN,MAAM;SACJ,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAC3C,CAAC;AACH,CAAC;AAxCD,oEAwCC;AAED,SAAgB,kCAAkC,CAAC,MAAe;IACjE,MAAM,iCAAiC,GAAG;QACzC,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,+BAA+B,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACvG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;KACvC,CAAC;IACF,MAAM,2BAA2B,GAAG,wBAAwB,CAC3D,EAAE,CAAC,KAAK,CACP,GAAG,iCAAiC;SAClC,GAAG,CAAC,SAAS,CAAC,EAAE;QAChB,MAAM,GAAG,GAAG,IAAA,sCAAkB,EAAC,SAAS,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,cAAc,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACnG,OAAO,0BAA0B,CAAC,GAAG,EAAE,CAAC,IAAS,EAAE,EAAE;YACpD,OAAO,IAAI,CAAC,OAAO,CAAC;YACpB,OAAO,IAAI,CAAC,YAAY,CAAC;YACzB,OAAO,IAAI,CAAC,eAAe,CAAC;YAC5B,OAAO,IAAI,CAAC;QACb,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CACH,CACD,CAAC;IAEF,OAAO,CACN,2BAA2B;SACzB,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAC3C,CAAC;AACH,CAAC;AAxBD,gFAwBC;AAWD,SAAgB,qBAAqB,CAAC,cAAsB,EAAE,UAAoB,EAAE;IACnF,MAAM,iBAAiB,GAA+B,EAAE,CAAC;IAEzD,IAAI;QACH,MAAM,iBAAiB,GAAG,EAAE,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;QACzD,KAAK,MAAM,eAAe,IAAI,iBAAiB,EAAE;YAChD,IAAI,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE;gBAC1C,SAAS;aACT;YACD,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,eAAe,EAAE,cAAc,CAAC,CAAC;YACnF,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;gBACpC,SAAS;aACT;YACD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;YAClF,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE;gBACjC,SAAS;aACT;YACD,MAAM,QAAQ,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC,CAAC;YAC5E,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;YACjF,MAAM,UAAU,GAAG,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,eAAe,EAAE,cAAc,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACnJ,IAAI,sBAA0C,CAAC;YAC/C,IAAI,WAAW,CAAC,OAAO,EAAE;gBACxB,MAAM,2BAA2B,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;gBAClG,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,2BAA2B,EAAE,mBAAmB,CAAC,CAAC,EAAE;oBAC/F,sBAAsB,GAAG,IAAI,CAAC,IAAI,CAAC,2BAA2B,EAAE,mBAAmB,CAAC,CAAC;iBACrF;aACD;YACD,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,wBAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACjF,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,2BAA2B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAEvF,iBAAiB,CAAC,IAAI,CAAC;gBACtB,aAAa,EAAE,eAAe;gBAC9B,WAAW;gBACX,UAAU;gBACV,sBAAsB;gBACtB,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;gBACnE,aAAa,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS;aAC5E,CAAC,CAAC;SACH;QACD,OAAO,iBAAiB,CAAC;KACzB;IAAC,OAAO,EAAE,EAAE;QACZ,OAAO,iBAAiB,CAAC;KACzB;AACF,CAAC;AA3CD,sDA2CC;AAED,SAAgB,oBAAoB,CAAC,WAAmB,EAAE,cAAsB;IAI/E,MAAM,WAAW,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACtC,MAAM,UAAU,GAAc,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IACrF,MAAM,SAAS,GAAG,CAAC,GAAQ,EAAE,EAAE;QAC9B,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE;YACtB,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;YACrB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACvB,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;aACvB;iBAAM,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;gBAC1C,SAAS,CAAC,GAAG,CAAC,CAAC;aACf;iBAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,WAAW,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,WAAW,EAAE;gBAC1H,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;gBAC7D,IAAI,UAAU,EAAE;oBACf,GAAG,CAAC,GAAG,CAAC,GAAG,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,UAAU,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;iBAC7H;aACD;SACD;IACF,CAAC,CAAC;IACF,SAAS,CAAC,WAAW,CAAC,CAAC;IACvB,OAAO,WAAW,CAAC;AACpB,CAAC;AAvBD,oDAuBC;AAED,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;AAErD,iFAAiF;AACjF,MAAM,mBAAmB,GAAG;IAC3B,gDAAgD;IAChD,+CAA+C;IAC/C,0BAA0B;IAC1B,+BAA+B;IAC/B,kBAAkB;IAClB,mCAAmC;CACnC,CAAC;AAEK,KAAK,UAAU,iBAAiB,CAAC,QAAgB,EAAE,OAAgB,EAAE,sBAAqE;IAChJ,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAA6B,CAAC;IAE/D,MAAM,cAAc,GAA4B,EAAE,CAAC;IAEnD,KAAK,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,IAAI,sBAAsB,EAAE;QAChE,MAAM,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;QAC9C,SAAS,SAAS,CAAC,iBAA6H;YAC/I,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,EAAE;gBACpG,MAAM,MAAM,GAAG,OAAO,UAAU,KAAK,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;gBAClF,IAAI,UAAU,EAAE;oBACf,MAAM,CAAC,MAAO,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAO,CAAC,IAAK,CAAC,CAAC,CAAC;iBAC3G;gBACD,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAC5B;QACF,CAAC;QACD,SAAS,CAAC,iBAAiB,CAAC,CAAC;KAC7B;IACD,SAAS,QAAQ,CAAC,SAAc;QAC/B,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE;YACtC,KAAK,MAAM,KAAK,IAAI,SAAS,CAAC,QAAQ,EAAE;gBACvC,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;gBACpC,IAAI,UAAU,EAAE;oBACf,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;oBACnF,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;oBAC/D,QAAQ,CAAC,YAAY,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,KAAM,CAAC,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,MAAM,CAAC,MAAM,UAAU,CAAC,CAAC;iBACrH;gBACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;oBAChC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;wBACnC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBACvB,CAAC,CAAC,CAAC;iBACH;gBACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;oBAClC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE;wBACvC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBACxB,CAAC,CAAC,CAAC;iBACH;aACD;SACD;IACF,CAAC;IACD,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC5C,IAAI,OAAO,EAAE;YACZ,OAAO,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBAChD,IAAI,GAAG,EAAE;oBACR,MAAM,EAAE,CAAC;iBACT;qBAAM;oBACN,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;iBAC1B;YACF,CAAC,CAAC,CAAC;SACH;aAAM;YACN,OAAO,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBAC1C,IAAI,GAAG,EAAE;oBACR,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBACpB,MAAM,EAAE,CAAC;iBACT;qBAAM;oBACN,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;oBAC1B,OAAO,EAAE,CAAC;iBACV;YACF,CAAC,CAAC,CAAC;SACH;IACF,CAAC,CAAC,CAAC;AACJ,CAAC;AA7DD,8CA6DC;AAED,KAAK,UAAU,iBAAiB,CAAC,QAAgB,EAAE,OAAgB,EAAE,OAAkD;IACtH,SAAS,QAAQ,CAAC,QAAgB,EAAE,MAAc;QACjD,MAAM,OAAO,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;QACjE,QAAQ,CAAC,YAAY,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,MAAM,SAAS,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QAC1G,KAAK,MAAM,KAAK,IAAI,OAAO,IAAI,EAAE,EAAE;YAClC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SACtB;IACF,CAAC;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE;QACpD,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC5C,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;YACtB,IAAI,OAAO,EAAE;gBACZ,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aACrB;YACD,IAAI,UAAU,EAAE;gBACf,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;aACtC;YACD,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC9E,IAAI,KAAK,EAAE;oBACV,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;iBACrB;gBACD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBACzB,IAAI,MAAM,EAAE;oBACX,OAAO,MAAM,EAAE,CAAC;iBAChB;gBACD,OAAO,OAAO,EAAE,CAAC;YAClB,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,MAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBAChC,QAAQ,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACrE,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AAC3B,CAAC;AAEM,KAAK,UAAU,mBAAmB,CAAC,OAAgB,EAAE,UAAmB;IAC9E,OAAO,iBAAiB,CAAC,4BAA4B,EAAE,OAAO,EAAE,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC7F,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;QACpC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;KACjF,CAAC,CAAC,CAAC,CAAC;AACN,CAAC;AALD,kDAKC"}
\ No newline at end of file
diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts
index 586d52ed5bc177..24cf6ac728ebd0 100644
--- a/build/lib/extensions.ts
+++ b/build/lib/extensions.ts
@@ -376,7 +376,11 @@ export function packageLocalExtensionsStream(forWeb: boolean): Stream {
 		// also include shared production node modules
 		const productionDependencies = getProductionDependencies('extensions/');
 		const dependenciesSrc = _.flatten(productionDependencies.map(d => path.relative(root, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`]));
-		result = es.merge(localExtensionsStream, gulp.src(dependenciesSrc, { base: '.' }));
+
+		result = es.merge(
+			localExtensionsStream,
+			gulp.src(dependenciesSrc, { base: '.' })
+				.pipe(util2.cleanNodeModules(path.join(root, 'build', '.moduleignore'))));
 	}
 
 	return (
diff --git a/build/lib/i18n.js b/build/lib/i18n.js
index 50a2127f4b810d..09f0b46b3a521a 100644
--- a/build/lib/i18n.js
+++ b/build/lib/i18n.js
@@ -8,6 +8,7 @@ exports.prepareIslFiles = exports.prepareI18nPackFiles = exports.createXlfFilesF
 const path = require("path");
 const fs = require("fs");
 const event_stream_1 = require("event-stream");
+const jsonMerge = require("gulp-merge-json");
 const File = require("vinyl");
 const Is = require("is");
 const xml2js = require("xml2js");
@@ -508,50 +509,62 @@ function createXlfFilesForCoreBundle() {
 }
 exports.createXlfFilesForCoreBundle = createXlfFilesForCoreBundle;
 function createL10nBundleForExtension(extensionFolderName) {
-    const result = (0, event_stream_1.through)();
-    gulp.src([
+    return gulp
+        .src([
         // For source code of extensions
-        `extensions/${extensionFolderName}/src/**/*.{ts,tsx}`,
-        // For any dependencies pulled in (think vscode-css-languageservice or @vscode/emmet-helper)
-        `extensions/${extensionFolderName}/node_modules/**/*.{js,jsx}`,
-        // For any dependencies pulled in that bundle @vscode/l10n. They needed to export the bundle
-        `extensions/${extensionFolderName}/node_modules/**/bundle.l10n.json`,
-    ]).pipe((0, event_stream_1.writeArray)((err, files) => {
-        if (err) {
-            result.emit('error', err);
+        `extensions/${extensionFolderName}/{src,client,server}/**/*.{ts,tsx}`,
+        // // For any dependencies pulled in (think vscode-css-languageservice or @vscode/emmet-helper)
+        `extensions/${extensionFolderName}/**/node_modules/{@vscode,vscode-*}/**/*.{js,jsx}`,
+        // // For any dependencies pulled in that bundle @vscode/l10n. They needed to export the bundle
+        `extensions/${extensionFolderName}/**/node_modules/{@vscode,vscode-*}/**/bundle.l10n.json`,
+    ])
+        .pipe((0, event_stream_1.map)(function (data, callback) {
+        const file = data;
+        if (!file.isBuffer()) {
+            // Not a buffer so we drop it
+            callback();
             return;
         }
-        const buffers = files.filter(file => file.isBuffer());
-        const json = (0, l10n_dev_1.getL10nJson)(buffers
-            .filter(file => path.extname(file.path) !== '.json')
-            .map(file => ({
-            contents: file.contents.toString('utf8'),
-            extension: path.extname(file.path)
-        })));
-        buffers
-            .filter(file => path.extname(file.path) === '.json')
-            .forEach(file => {
-            const bundleJson = JSON.parse(file.contents.toString('utf8'));
-            for (const key in bundleJson) {
-                if (
-                // some validation of the bundle.l10n.json format
-                typeof bundleJson[key] !== 'string' &&
-                    (typeof bundleJson[key].message !== 'string' || !Array.isArray(bundleJson[key].comment))) {
-                    console.error(`Invalid bundle.l10n.json file. The value for key ${key} is not in the expected format. Skipping key...`);
-                    continue;
-                }
-                json[key] = bundleJson[key];
+        const extension = path.extname(file.relative);
+        if (extension !== '.json') {
+            const contents = file.contents.toString('utf8');
+            (0, l10n_dev_1.getL10nJson)([{ contents, extension }])
+                .then((json) => {
+                callback(undefined, new File({
+                    path: `extensions/${extensionFolderName}/bundle.l10n.json`,
+                    contents: Buffer.from(JSON.stringify(json), 'utf8')
+                }));
+            })
+                .catch((err) => {
+                callback(new Error(`File ${file.relative} threw an error when parsing: ${err}`));
+            });
+            // signal pause?
+            return false;
+        }
+        // for bundle.l10n.jsons
+        let bundleJson;
+        try {
+            bundleJson = JSON.parse(file.contents.toString('utf8'));
+        }
+        catch (err) {
+            callback(new Error(`File ${file.relative} threw an error when parsing: ${err}`));
+            return;
+        }
+        // some validation of the bundle.l10n.json format
+        for (const key in bundleJson) {
+            if (typeof bundleJson[key] !== 'string' &&
+                (typeof bundleJson[key].message !== 'string' || !Array.isArray(bundleJson[key].comment))) {
+                callback(new Error(`Invalid bundle.l10n.json file. The value for key ${key} is not in the expected format.`));
+                return;
             }
-        });
-        if (Object.keys(json).length > 0) {
-            result.emit('data', new File({
-                path: `extensions/${extensionFolderName}/bundle.l10n.json`,
-                contents: Buffer.from(JSON.stringify(json), 'utf8')
-            }));
         }
-        result.emit('end');
+        callback(undefined, file);
+    }))
+        .pipe(jsonMerge({
+        fileName: `extensions/${extensionFolderName}/bundle.l10n.json`,
+        jsonSpace: '',
+        concatArrays: true
     }));
-    return result;
 }
 function createXlfFilesForExtensions() {
     let counter = 0;
@@ -855,4 +868,4 @@ function encodeEntities(value) {
 function decodeEntities(value) {
     return value.replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&amp;/g, '&');
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"i18n.js","sourceRoot":"","sources":["i18n.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,6BAA6B;AAC7B,yBAAyB;AAEzB,+CAAyE;AACzE,8BAA8B;AAC9B,yBAAyB;AACzB,iCAAiC;AACjC,6BAA6B;AAC7B,sCAAsC;AACtC,0CAA0C;AAC1C,gDAAgD;AAChD,+CAAiH;AAEjH,SAAS,GAAG,CAAC,OAAY,EAAE,GAAG,IAAW;IACxC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;AACxD,CAAC;AAYY,QAAA,gBAAgB,GAAe;IAC3C,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE;IAC5D,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE;IAC5D,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;IAC/B,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;IAC/B,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;IAC/B,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;IAC/B,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;IAC/B,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;IAC/B,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;CAC/B,CAAC;AAEF,4DAA4D;AAC/C,QAAA,cAAc,GAAe;IACzC,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE;IAClC,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;IAC/B,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;CAC/B,CAAC;AAkBF,IAAO,YAAY,CAKlB;AALD,WAAO,YAAY;IAClB,SAAgB,EAAE,CAAC,KAAU;QAC5B,MAAM,SAAS,GAAG,KAAqB,CAAC;QACxC,OAAO,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IACtL,CAAC;IAHe,eAAE,KAGjB,CAAA;AACF,CAAC,EALM,YAAY,KAAZ,YAAY,QAKlB;AAQD,IAAO,aAAa,CAWnB;AAXD,WAAO,aAAa;IACnB,SAAgB,EAAE,CAAC,KAAU;QAC5B,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;YACpB,OAAO,KAAK,CAAC;SACb;QAED,MAAM,SAAS,GAAG,KAAsB,CAAC;QACzC,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;QAEzC,OAAO,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACtH,CAAC;IATe,gBAAE,KASjB,CAAA;AACF,CAAC,EAXM,aAAa,KAAb,aAAa,QAWnB;AAkBD,MAAa,IAAI;IACR,MAAM,GAAa,EAAE,CAAC;IAE9B,YAAY,SAAiB,CAAC;QAC7B,IAAI,MAAM,GAAG,CAAC,EAAE;YACf,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;SAClD;IACF,CAAC;IAEM,MAAM,CAAC,KAAa;QAC1B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxB,OAAO,IAAI,CAAC;IACb,CAAC;IAEM,QAAQ;QACd,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC7B,CAAC;CACD;AAjBD,oBAiBC;AAED,MAAM,SAAS;IACN,MAAM,CAAW;IAEzB,YAAY,QAAgB;QAC3B,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAC5C,CAAC;IAED,IAAW,KAAK;QACf,OAAO,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;CACD;AAED,MAAa,GAAG;IAKI;IAJX,MAAM,CAAW;IACjB,KAAK,CAAyB;IAC/B,gBAAgB,CAAS;IAEhC,YAAmB,OAAe;QAAf,YAAO,GAAP,OAAO,CAAQ;QACjC,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,gBAAgB,GAAG,CAAC,CAAC;IAC3B,CAAC;IAEM,QAAQ;QACd,IAAI,CAAC,YAAY,EAAE,CAAC;QAEpB,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACzB,IAAI,CAAC,aAAa,CAAC,mBAAmB,IAAI,oDAAoD,EAAE,CAAC,CAAC,CAAC;YACnG,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAO,EAAE,CAAO,EAAE,EAAE;gBACxD,OAAO,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/C,CAAC,CAAC,CAAC;YACH,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBACzB,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;aAC/B;YACD,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;SACrC;QACD,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAEM,OAAO,CAAC,QAAgB,EAAE,IAA+B,EAAE,QAAkB;QACnF,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACtB,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,QAAQ,CAAC,CAAC;YACtC,OAAO;SACP;QACD,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,EAAE;YACpC,MAAM,IAAI,KAAK,CAAC,mBAAmB,IAAI,CAAC,MAAM,kBAAkB,QAAQ,CAAC,MAAM,IAAI,CAAC,CAAC;SACrF;QACD,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,MAAM,CAAC;QACrC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QAC1B,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;QACvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACrC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACpB,IAAI,OAA2B,CAAC;YAChC,IAAI,OAA2B,CAAC;YAChC,IAAI,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;gBACnB,OAAO,GAAG,GAAG,CAAC;gBACd,OAAO,GAAG,SAAS,CAAC;aACpB;iBAAM,IAAI,YAAY,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE;gBAChC,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC;gBAClB,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC1C,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;iBAC3E;aACD;YACD,IAAI,CAAC,OAAO,IAAI,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;gBAC1C,SAAS;aACT;YACD,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC1B,MAAM,OAAO,GAAW,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YACpD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;SAC/E;IACF,CAAC;IAEO,aAAa,CAAC,IAAY,EAAE,IAAU;QAC7C,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,EAAE;YACpE,MAAM,IAAI,KAAK,CAAC,kCAAkC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;SACzF;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,GAAG,CAAC,gBAAgB,IAAI,CAAC,EAAE,YAAY,IAAI,wBAAwB,CAAC,CAAC;SACrE;QAED,IAAI,CAAC,aAAa,CAAC,mBAAmB,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QACtD,IAAI,CAAC,aAAa,CAAC,yBAAyB,IAAI,CAAC,OAAO,WAAW,EAAE,CAAC,CAAC,CAAC;QAExE,IAAI,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,aAAa,CAAC,SAAS,IAAI,CAAC,OAAO,SAAS,EAAE,CAAC,CAAC,CAAC;SACtD;QAED,IAAI,CAAC,aAAa,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;IACxC,CAAC;IAEO,YAAY;QACnB,IAAI,CAAC,aAAa,CAAC,wCAAwC,EAAE,CAAC,CAAC,CAAC;QAChE,IAAI,CAAC,aAAa,CAAC,qEAAqE,EAAE,CAAC,CAAC,CAAC;IAC9F,CAAC;IAEO,YAAY;QACnB,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IACnC,CAAC;IAEO,aAAa,CAAC,OAAe,EAAE,MAAe;QACrD,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC;QAC9B,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IACnC,CAAC;IAED,MAAM,CAAC,KAAK,GAAG,UAAU,SAAiB;QACzC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACtC,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAEnC,MAAM,KAAK,GAA2E,EAAE,CAAC;YAEzF,MAAM,CAAC,WAAW,CAAC,SAAS,EAAE,UAAU,GAAQ,EAAE,MAAW;gBAC5D,IAAI,GAAG,EAAE;oBACR,MAAM,CAAC,IAAI,KAAK,CAAC,oDAAoD,GAAG,EAAE,CAAC,CAAC,CAAC;iBAC7E;gBAED,MAAM,SAAS,GAAU,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;gBACjD,IAAI,CAAC,SAAS,EAAE;oBACf,MAAM,CAAC,IAAI,KAAK,CAAC,gGAAgG,CAAC,CAAC,CAAC;iBACpH;gBAED,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;oBAC1B,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC;oBAC7B,IAAI,CAAC,IAAI,EAAE;wBACV,MAAM,CAAC,IAAI,KAAK,CAAC,iIAAiI,CAAC,CAAC,CAAC;qBACrJ;oBACD,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;oBAC3C,IAAI,CAAC,QAAQ,EAAE;wBACd,MAAM,CAAC,IAAI,KAAK,CAAC,iHAAiH,CAAC,CAAC,CAAC;qBACrI;oBACD,MAAM,QAAQ,GAA2B,EAAE,CAAC;oBAE5C,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;oBAC9C,IAAI,UAAU,EAAE;wBACf,UAAU,CAAC,OAAO,CAAC,CAAC,IAAS,EAAE,EAAE;4BAChC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;4BACtB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;gCACjB,OAAO,CAAC,2BAA2B;6BACnC;4BAED,IAAI,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;4BACzB,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;gCAC5B,yEAAyE;gCACzE,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;6BACzB;4BACD,IAAI,CAAC,GAAG,EAAE;gCACT,MAAM,CAAC,IAAI,KAAK,CAAC,iCAAiC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,oBAAoB,IAAI,+BAA+B,CAAC,CAAC,CAAC;gCAC9I,OAAO;6BACP;4BACD,QAAQ,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;wBACrC,CAAC,CAAC,CAAC;wBACH,KAAK,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;qBACjE;gBACF,CAAC,CAAC,CAAC;gBAEH,OAAO,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC;;AApJH,kBAqJC;AAED,SAAS,aAAa,CAAC,SAAqB;IAC3C,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,CAAW,EAAE,CAAW,EAAU,EAAE;QAC1D,OAAO,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,OAAe;IACrC,+BAA+B;IAC/B,EAAE;IACF,6CAA6C;IAC7C,8CAA8C;IAC9C,2CAA2C;IAC3C,4CAA4C;IAC5C,uCAAuC;IACvC,MAAM,MAAM,GAAG,yIAAyI,CAAC;IACzJ,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,GAAW,EAAE,GAAW,EAAE,EAAU,EAAE,EAAU,EAAE,EAAU,EAAE,EAAE;QAC9G,yCAAyC;QACzC,IAAI,EAAE,EAAE;YACP,wCAAwC;YACxC,OAAO,EAAE,CAAC;SACV;aAAM,IAAI,EAAE,EAAE;YACd,yEAAyE;YACzE,oCAAoC;YACpC,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;YACzB,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE;gBAC5B,OAAO,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;aAC/C;iBAAM;gBACN,OAAO,EAAE,CAAC;aACV;SACD;aAAM,IAAI,EAAE,EAAE;YACd,4BAA4B;YAC5B,OAAO,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;SAC1B;aAAM;YACN,oBAAoB;YACpB,OAAO,KAAK,CAAC;SACb;IACF,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AACf,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAa;IACtC,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACtC,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC3B,QAAQ,EAAE,EAAE;YACX,KAAK,IAAI;gBACR,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACpB,MAAM;YACP,KAAK,GAAG;gBACP,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACnB,MAAM;YACP,KAAK,IAAI;gBACR,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACpB,MAAM;YACP,KAAK,IAAI;gBACR,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACnB,MAAM;YACP,KAAK,IAAI;gBACR,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACnB,MAAM;YACP,KAAK,IAAI;gBACR,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACnB,MAAM;YACP,KAAK,IAAI;gBACR,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACnB,MAAM;YACP,KAAK,IAAI;gBACR,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACnB,MAAM;YACP;gBACC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SACjB;KACD;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACxB,CAAC;AAED,SAAS,uBAAuB,CAAC,UAAkB,EAAE,SAAqB,EAAE,IAAmB,EAAE,OAAsB;IACtH,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC;IAC9B,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC;IACrC,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC;IAEnC,MAAM,UAAU,GAA2B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAE/D,MAAM,eAAe,GAA2C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACpF,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACzC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QAC1B,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;QACjC,MAAM,QAAQ,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;QACxC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,EAAE;YACjD,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,sBAAsB,MAAM,sDAAsD,CAAC,CAAC;YAC1G,OAAO;SACP;QACD,MAAM,UAAU,GAA2B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC/D,eAAe,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC;QACrC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;YACnB,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;gBAC5B,UAAU,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;aAC9B;iBAAM;gBACN,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;aAClC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;IACvF,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE;QACtC,GAAG,CAAC,wDAAwD,iBAAiB,EAAE,CAAC,CAAC;QACjF,GAAG,CAAC,0GAA0G,CAAC,CAAC;KAChH;IACD,MAAM,eAAe,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;IACjD,eAAe,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QACpC,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,EAAE;YACxC,GAAG,CAAC,+BAA+B,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;SAClD;QAED,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;QAC5B,MAAM,gBAAgB,GAA6B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACvE,MAAM,kBAAkB,GAAG,QAAQ,CAAC,aAAa,IAAI,QAAQ,CAAC,EAAE,CAAC;QACjE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,wBAAwB,kBAAkB,EAAE,EAAE,cAAc,EAAE,gBAAgB,CAAC,CAAC;QAC9H,IAAI,WAAmC,CAAC;QACxC,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;YAC5B,MAAM,OAAO,GAAG,aAAa,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;YACjE,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SAClC;QACD,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAC1B,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;YAClC,IAAI,aAA2D,CAAC;YAChE,IAAI,WAAW,EAAE;gBAChB,aAAa,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;aAC7C;YACD,IAAI,CAAC,aAAa,EAAE;gBACnB,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,EAAE;oBACxC,GAAG,CAAC,0CAA0C,MAAM,2BAA2B,CAAC,CAAC;iBACjF;gBACD,aAAa,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;gBACxC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC;aACtF;YACD,MAAM,iBAAiB,GAAa,EAAE,CAAC;YACvC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBACzB,IAAI,GAAG,GAAkB,IAAI,CAAC;gBAC9B,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;oBAChC,GAAG,GAAG,OAAO,CAAC;iBACd;qBAAM;oBACN,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;iBAClB;gBACD,IAAI,OAAO,GAAW,aAAc,CAAC,GAAG,CAAC,CAAC;gBAC1C,IAAI,CAAC,OAAO,EAAE;oBACb,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,EAAE;wBACxC,GAAG,CAAC,sCAAsC,GAAG,cAAc,MAAM,0BAA0B,CAAC,CAAC;qBAC7F;oBACD,OAAO,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC;oBACvC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;iBACtD;gBACD,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACjC,CAAC,CAAC,CAAC;YACH,gBAAgB,CAAC,MAAM,CAAC,GAAG,iBAAiB,CAAC;QAC9C,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAC7C,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;YACtC,MAAM,QAAQ,GAAa;gBAC1B,UAAU;gBACV,WAAW,MAAM,QAAQ,QAAQ,CAAC,EAAE,MAAM;aAC1C,CAAC;YACF,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;gBACjC,QAAQ,CAAC,IAAI,CAAC,MAAM,MAAM,MAAM,CAAC,CAAC;gBAClC,MAAM,QAAQ,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;gBAC1C,IAAI,CAAC,QAAQ,EAAE;oBACd,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,mCAAmC,MAAM,GAAG,CAAC,CAAC;oBACpE,OAAO;iBACP;gBACD,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;oBACnC,QAAQ,CAAC,IAAI,CAAC,QAAQ,gBAAgB,CAAC,OAAO,CAAC,GAAG,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;gBAC3F,CAAC,CAAC,CAAC;gBACH,QAAQ,CAAC,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAC5D,CAAC,CAAC,CAAC;YACH,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACrB,OAAO,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAC,EAAE,GAAG,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;QAChI,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACrC,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;QAC9B,GAAG,CAAC,GAAG,GAAG,QAAQ,KAAK,wBAAwB,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IACH,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QAClC,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACtC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;YACpB,GAAG,CAAC,wCAAwC,QAAQ,CAAC,EAAE,mCAAmC,CAAC,CAAC;SAC5F;IACF,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,SAAgB,eAAe,CAAC,IAAmD;IAClF,OAAO,IAAA,sBAAO,EAAC,UAA+B,IAAU;QACvD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,QAAQ,KAAK,mBAAmB,EAAE;YACrC,IAAI,IAAI,GAAG,IAAI,CAAC;YAChB,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE;gBACpB,IAAI,GAAG,IAAI,CAAC,KAAK,CAAU,IAAI,CAAC,QAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;aAC5D;iBAAM;gBACN,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,kCAAkC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACtE,OAAO;aACP;YACD,IAAI,aAAa,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE;gBAC3B,uBAAuB,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;aACrE;SACD;QACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACJ,CAAC;AAjBD,0CAiBC;AAED,MAAM,aAAa,GAAW,eAAe,EAC5C,gBAAgB,GAAW,kBAAkB,EAC7C,iBAAiB,GAAW,mBAAmB,EAC/C,YAAY,GAAW,cAAc,EACrC,aAAa,GAAW,eAAe,CAAC;AAEzC,SAAgB,WAAW,CAAC,UAAkB;IAC7C,IAAI,QAAgB,CAAC;IAErB,IAAI,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;QACrC,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;KACvD;SAAM,IAAI,sBAAsB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;QACnD,OAAO,EAAE,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;KAC7D;SAAM,IAAI,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;QAC1C,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;KACrD;SAAM,IAAI,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;QACxC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;KACnD;SAAM,IAAI,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;QACxC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC;KACtD;SAAM,IAAI,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;QAC1C,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;KACrD;SAAM,IAAI,yBAAyB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;QACtD,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9C,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC;KACrD;SAAM,IAAI,0BAA0B,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;QACvD,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9C,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC;KACrD;SAAM,IAAI,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;QAC7C,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC;KAC3D;IAED,MAAM,IAAI,KAAK,CAAC,yCAAyC,UAAU,EAAE,CAAC,CAAC;AACxE,CAAC;AA1BD,kCA0BC;AAGD,SAAgB,2BAA2B;IAC1C,OAAO,IAAA,sBAAO,EAAC,UAA+B,IAAU;QACvD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,QAAQ,KAAK,mBAAmB,EAAE;YACrC,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE;gBACpB,MAAM,IAAI,GAAwB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBACtD,MAAM,IAAI,GAAkB,IAAI,CAAC,KAAK,CAAE,IAAI,CAAC,QAAmB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;gBACnF,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,IAAI,EAAE;oBACnC,MAAM,eAAe,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;oBAChD,MAAM,QAAQ,GAAG,eAAe,CAAC,IAAI,CAAC;oBACtC,MAAM,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC;oBAExC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;oBAC3C,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,EAAE;wBACpC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,oDAAoD,IAAI,CAAC,QAAQ,eAAe,UAAU,EAAE,CAAC,CAAC;wBACjH,OAAO;qBACP;yBAAM;wBACN,IAAI,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;wBACzB,IAAI,CAAC,GAAG,EAAE;4BACT,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;4BACvB,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC;yBACrB;wBACD,GAAG,CAAC,OAAO,CAAC,OAAO,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;qBACjD;iBACD;gBACD,KAAK,MAAM,QAAQ,IAAI,IAAI,EAAE;oBAC5B,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;oBAC3B,MAAM,QAAQ,GAAG,GAAG,GAAG,CAAC,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC;oBACtE,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC;wBACxB,IAAI,EAAE,QAAQ;wBACd,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC;qBAC7C,CAAC,CAAC;oBACH,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;iBACpB;aACD;iBAAM;gBACN,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,KAAK,CAAC,QAAQ,IAAI,CAAC,QAAQ,gCAAgC,CAAC,CAAC,CAAC;gBACrF,OAAO;aACP;SACD;aAAM;YACN,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,KAAK,CAAC,QAAQ,IAAI,CAAC,QAAQ,gCAAgC,CAAC,CAAC,CAAC;YACrF,OAAO;SACP;IACF,CAAC,CAAC,CAAC;AACJ,CAAC;AA5CD,kEA4CC;AAED,SAAS,4BAA4B,CAAC,mBAA2B;IAChE,MAAM,MAAM,GAAG,IAAA,sBAAO,GAAE,CAAC;IACzB,IAAI,CAAC,GAAG,CAAC;QACR,gCAAgC;QAChC,cAAc,mBAAmB,oBAAoB;QACrD,4FAA4F;QAC5F,cAAc,mBAAmB,6BAA6B;QAC9D,4FAA4F;QAC5F,cAAc,mBAAmB,mCAAmC;KACpE,CAAC,CAAC,IAAI,CAAC,IAAA,yBAAU,EAAC,CAAC,GAAG,EAAE,KAAa,EAAE,EAAE;QACzC,IAAI,GAAG,EAAE;YACR,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YAC1B,OAAO;SACP;QAED,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEtD,MAAM,IAAI,GAAG,IAAA,sBAAW,EAAC,OAAO;aAC9B,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC;aACnD,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACb,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC;YACxC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;SAClC,CAAC,CAAC,CAAC,CAAC;QAEN,OAAO;aACL,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC;aACnD,OAAO,CAAC,IAAI,CAAC,EAAE;YACf,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;YAC9D,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE;gBAC7B;gBACC,iDAAiD;gBACjD,OAAO,UAAU,CAAC,GAAG,CAAC,KAAK,QAAQ;oBACnC,CAAC,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,OAAO,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,EACvF;oBACD,OAAO,CAAC,KAAK,CAAC,oDAAoD,GAAG,iDAAiD,CAAC,CAAC;oBACxH,SAAS;iBACT;gBACD,IAAI,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;aAC5B;QACF,CAAC,CAAC,CAAC;QAEJ,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YACjC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,CAAC;gBAC5B,IAAI,EAAE,cAAc,mBAAmB,mBAAmB;gBAC1D,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;aACnD,CAAC,CAAC,CAAC;SACJ;QACD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpB,CAAC,CAAC,CAAC,CAAC;IAEJ,OAAO,MAAM,CAAC;AACf,CAAC;AAED,SAAgB,2BAA2B;IAC1C,IAAI,OAAO,GAAW,CAAC,CAAC;IACxB,IAAI,iBAAiB,GAAY,KAAK,CAAC;IACvC,IAAI,sBAAsB,GAAY,KAAK,CAAC;IAC5C,OAAO,IAAA,sBAAO,EAAC,UAA+B,eAAqB;QAClE,MAAM,YAAY,GAAG,IAAI,CAAC;QAC1B,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE;YACxB,OAAO;SACP;QACD,MAAM,mBAAmB,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAChE,IAAI,mBAAmB,KAAK,cAAc,EAAE;YAC3C,OAAO;SACP;QACD,0CAA0C;QAC1C,MAAM,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,cAAc,CAAC,EAAE,OAAO,CAAC,CAAC;QAC3F,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC1C,MAAM,WAAW,GAAG,YAAY,CAAC,SAAS,GAAG,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC;QAErE,OAAO,EAAE,CAAC;QACV,IAAI,QAAqC,CAAC;QAC1C,SAAS,UAAU;YAClB,IAAI,CAAC,QAAQ,EAAE;gBACd,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;aACrB;YACD,OAAO,QAAQ,CAAC;QACjB,CAAC;QACD,IAAA,oBAAK,EACJ,IAAI,CAAC,GAAG,CAAC,CAAC,qBAAqB,mBAAmB,mBAAmB,EAAE,qBAAqB,mBAAmB,uBAAuB,CAAC,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,EAC9J,4BAA4B,CAAC,mBAAmB,CAAC,CACjD,CAAC,IAAI,CAAC,IAAA,sBAAO,EAAC,UAAU,IAAU;YAClC,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE;gBACpB,MAAM,MAAM,GAAW,IAAI,CAAC,QAAkB,CAAC;gBAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC1C,IAAI,QAAQ,KAAK,kBAAkB,EAAE;oBACpC,MAAM,IAAI,GAAmB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;oBACjE,UAAU,EAAE,CAAC,GAAG,CAAC,cAAc,WAAW,UAAU,EAAE,IAAI,CAAC,CAAC;iBAC5D;qBAAM,IAAI,QAAQ,KAAK,mBAAmB,EAAE;oBAC5C,MAAM,IAAI,GAA2B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;oBACzE,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,qBAAqB,mBAAmB,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;oBACnG,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE;wBACxB,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;wBAC/B,MAAM,IAAI,GAAmB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;wBACjD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;4BACrD,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;4BACxC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gCAC5D,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAiB;gCACrC,CAAC,CAAC,EAAE,GAAG,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,CAAW,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;4BAE9D,IAAI,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;yBACrD;wBACD,UAAU,EAAE,CAAC,GAAG,CAAC,cAAc,WAAW,IAAI,OAAO,IAAI,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC;qBACvE;iBACD;qBAAM,IAAI,QAAQ,KAAK,kBAAkB,EAAE;oBAC3C,MAAM,IAAI,GAAmB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;oBACjE,UAAU,EAAE,CAAC,GAAG,CAAC,cAAc,WAAW,SAAS,EAAE,IAAI,CAAC,CAAC;iBAC3D;qBAAM;oBACN,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,IAAI,oCAAoC,CAAC,CAAC,CAAC;oBAChF,OAAO;iBACP;aACD;QACF,CAAC,EAAE;YACF,IAAI,QAAQ,EAAE,IAAI,GAAG,CAAC,EAAE;gBACvB,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC;oBACxB,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,WAAW,GAAG,MAAM,CAAC;oBACxD,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,IAAA,qBAAU,EAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;iBACnD,CAAC,CAAC;gBACH,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;aAC5B;YACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACjB,OAAO,EAAE,CAAC;YACV,IAAI,OAAO,KAAK,CAAC,IAAI,iBAAiB,IAAI,CAAC,sBAAsB,EAAE;gBAClE,sBAAsB,GAAG,IAAI,CAAC;gBAC9B,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aACzB;QACF,CAAC,CAAC,CAAC,CAAC;IACL,CAAC,EAAE;QACF,iBAAiB,GAAG,IAAI,CAAC;QACzB,IAAI,OAAO,KAAK,CAAC,EAAE;YAClB,sBAAsB,GAAG,IAAI,CAAC;YAC9B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SACjB;IACF,CAAC,CAAC,CAAC;AACJ,CAAC;AAnFD,kEAmFC;AAED,SAAgB,oBAAoB;IACnC,OAAO,IAAA,sBAAO,EAAC,UAA+B,IAAU;QACvD,IAAI,WAAmB,EACtB,YAAoB,CAAC;QACtB,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,iBAAiB,EAAE;YACnD,WAAW,GAAG,YAAY,CAAC;YAC3B,YAAY,GAAG,cAAc,CAAC;SAC9B;aAAM;YACN,MAAM,IAAI,KAAK,CAAC,sBAAsB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;SACnD;QAED,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,EAC/B,IAAI,GAAa,EAAE,EACnB,QAAQ,GAAa,EAAE,CAAC;QAEzB,MAAM,KAAK,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QACtD,IAAI,gBAAgB,GAAG,KAAK,CAAC;QAC7B,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC1B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;gBACtB,OAAO;aACP;YACD,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACjC,QAAQ,SAAS,EAAE;gBAClB,KAAK,GAAG;oBACP,gBAAgB;oBAChB,OAAO;gBACR,KAAK,GAAG;oBACP,gBAAgB,GAAG,YAAY,KAAK,IAAI,IAAI,kBAAkB,KAAK,IAAI,CAAC;oBACxE,OAAO;aACR;YACD,IAAI,CAAC,gBAAgB,EAAE;gBACtB,OAAO;aACP;YACD,MAAM,QAAQ,GAAa,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC3C,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC1B,MAAM,IAAI,KAAK,CAAC,kCAAkC,IAAI,EAAE,CAAC,CAAC;aAC1D;iBAAM;gBACN,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;gBACxB,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;gBAC1B,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;oBACvC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACf,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBACrB;aACD;QACF,CAAC,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAClH,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;QAE1C,iEAAiE;QACjE,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;QACzD,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;QAChG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACrB,CAAC,CAAC,CAAC;AACJ,CAAC;AAtDD,oDAsDC;AAED,SAAS,cAAc,CAAC,IAAY,EAAE,QAAa;IAClD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACnC,MAAM,CAAC,EAAE,CAAC,GAAG;QACZ,8FAA8F;QAC9F,2DAA2D;QAC3D,8FAA8F;QAC9F,8FAA8F;QAC9F,iDAAiD;KACjD,CAAC;IACF,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;QACxC,MAAM,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;KAC5B;IAED,IAAI,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACjD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;QACjC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;KACzC;IACD,OAAO,IAAI,IAAI,CAAC;QACf,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC;QACpC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC;KACtC,CAAC,CAAC;AACJ,CAAC;AASD,MAAM,eAAe,GAAG,OAAO,CAAC;AAOhC,SAAS,2BAA2B,CAAC,cAA8B;IAClE,MAAM,MAAM,GAA2B,EAAE,CAAC;IAC1C,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI,EAAE,EAAE;QACrD,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;QAClC,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;KAChE;IACD,OAAO,MAAM,CAAC;AACf,CAAC;AAED,SAAgB,oBAAoB,CAAC,yBAA4C;IAChF,MAAM,aAAa,GAAiC,EAAE,CAAC;IACvD,MAAM,QAAQ,GAAa,EAAE,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IACtE,MAAM,eAAe,GAA6B,EAAE,CAAC;IACrD,MAAM,MAAM,GAAU,EAAE,CAAC;IACzB,OAAO,IAAA,sBAAO,EAAC,UAA+B,GAAS;QACtD,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACxE,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACrD,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACzC,GAAG,CAAC,SAAS,OAAO,KAAK,QAAQ,EAAE,CAAC,CAAC;QACrC,MAAM,YAAY,GAAG,IAAA,8BAAmB,EAAC,QAAQ,CAAC,CAAC;QACnD,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACjC,YAAY,CAAC,IAAI,CAChB,aAAa,CAAC,EAAE;YACf,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;gBACvB,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBAErC,IAAI,OAAO,KAAK,iBAAiB,EAAE;oBAClC,oCAAoC;oBACpC,IAAI,OAAO,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;oBACxC,IAAI,CAAC,OAAO,EAAE;wBACb,OAAO,GAAG,eAAe,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;qBACjF;oBACD,2CAA2C;oBAC3C,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,GAAG,CAAC,CAAC,CAAC;oBACtD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC,GAAG,2BAA2B,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;iBAC/F;qBAAM;oBACN,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,GAAG,2BAA2B,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;iBAC/F;YACF,CAAC,CAAC,CAAC;QACJ,CAAC,CACD,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;YAChB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;IACJ,CAAC,EAAE;QACF,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;aACxB,IAAI,CAAC,GAAG,EAAE;YACV,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;gBACtB,MAAM,MAAM,CAAC;aACb;YACD,MAAM,kBAAkB,GAAG,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAC9D,yBAAyB,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,gBAAgB,EAAE,CAAC,CAAC;YAEjF,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAC/B,KAAK,MAAM,WAAW,IAAI,eAAe,EAAE;gBAC1C,MAAM,iBAAiB,GAAG,cAAc,CAAC,cAAc,WAAW,EAAE,EAAE,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC;gBACpG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;gBAE9B,yBAAyB,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,cAAc,WAAW,YAAY,EAAE,CAAC,CAAC;aACzG;YACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAClB,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,MAAM,EAAE,EAAE;YACjB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACJ,CAAC;AAzDD,oDAyDC;AAED,SAAgB,eAAe,CAAC,QAAkB,EAAE,eAA0B;IAC7E,MAAM,aAAa,GAAiC,EAAE,CAAC;IAEvD,OAAO,IAAA,sBAAO,EAAC,UAA+B,GAAS;QACtD,MAAM,MAAM,GAAG,IAAI,CAAC;QACpB,MAAM,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QACxD,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACjC,YAAY,CAAC,IAAI,CAChB,aAAa,CAAC,EAAE;YACf,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAC5B,MAAM,cAAc,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAC;gBAC1F,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAC9B,CAAC,CAAC,CAAC;QACJ,CAAC,CACD,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;YAChB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;IACJ,CAAC,EAAE;QACF,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;aACxB,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;aACjC,KAAK,CAAC,MAAM,CAAC,EAAE;YACf,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACJ,CAAC;AAxBD,0CAwBC;AAED,SAAS,aAAa,CAAC,IAAY,EAAE,QAAwB,EAAE,QAAkB,EAAE,SAAoB;IACtG,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,IAAI,eAA0B,CAAC;IAC/B,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,SAAS,EAAE;QACtC,eAAe,GAAG,IAAI,SAAS,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,GAAG,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;KACxE;SAAM;QACN,eAAe,GAAG,IAAI,SAAS,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,GAAG,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;KAC3E;IACD,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACpC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YACpB,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACjC,IAAI,SAAS,KAAK,GAAG,IAAI,SAAS,KAAK,GAAG,EAAE;gBAC3C,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACnB;iBAAM;gBACN,MAAM,QAAQ,GAAa,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC3C,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;gBACxB,IAAI,UAAU,GAAG,IAAI,CAAC;gBACtB,IAAI,GAAG,EAAE;oBACR,MAAM,iBAAiB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;oBACxC,IAAI,iBAAiB,EAAE;wBACtB,UAAU,GAAG,GAAG,GAAG,IAAI,iBAAiB,EAAE,CAAC;qBAC3C;iBACD;gBAED,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aACzB;SACD;IACF,CAAC,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACrC,MAAM,QAAQ,GAAG,GAAG,QAAQ,IAAI,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClD,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;IAEvG,OAAO,IAAI,IAAI,CAAC;QACf,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;KAC9B,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,KAAa;IACpC,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACtC,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACpB,QAAQ,EAAE,EAAE;YACX,KAAK,GAAG;gBACP,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACpB,MAAM;YACP,KAAK,GAAG;gBACP,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACpB,MAAM;YACP,KAAK,GAAG;gBACP,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACrB,MAAM;YACP;gBACC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SACjB;KACD;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACxB,CAAC;AAED,SAAS,cAAc,CAAC,KAAa;IACpC,OAAO,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;AACjF,CAAC"}
\ No newline at end of file
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"i18n.js","sourceRoot":"","sources":["i18n.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,6BAA6B;AAC7B,yBAAyB;AAEzB,+CAAkE;AAClE,6CAA6C;AAC7C,8BAA8B;AAC9B,yBAAyB;AACzB,iCAAiC;AACjC,6BAA6B;AAC7B,sCAAsC;AACtC,0CAA0C;AAC1C,gDAAgD;AAChD,+CAAiH;AAEjH,SAAS,GAAG,CAAC,OAAY,EAAE,GAAG,IAAW;IACxC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;AACxD,CAAC;AAYY,QAAA,gBAAgB,GAAe;IAC3C,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE;IAC5D,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE;IAC5D,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;IAC/B,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;IAC/B,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;IAC/B,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;IAC/B,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;IAC/B,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;IAC/B,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;CAC/B,CAAC;AAEF,4DAA4D;AAC/C,QAAA,cAAc,GAAe;IACzC,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE;IAClC,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;IAC/B,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;CAC/B,CAAC;AAkBF,IAAO,YAAY,CAKlB;AALD,WAAO,YAAY;IAClB,SAAgB,EAAE,CAAC,KAAU;QAC5B,MAAM,SAAS,GAAG,KAAqB,CAAC;QACxC,OAAO,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IACtL,CAAC;IAHe,eAAE,KAGjB,CAAA;AACF,CAAC,EALM,YAAY,KAAZ,YAAY,QAKlB;AAQD,IAAO,aAAa,CAWnB;AAXD,WAAO,aAAa;IACnB,SAAgB,EAAE,CAAC,KAAU;QAC5B,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;YACpB,OAAO,KAAK,CAAC;SACb;QAED,MAAM,SAAS,GAAG,KAAsB,CAAC;QACzC,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;QAEzC,OAAO,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACtH,CAAC;IATe,gBAAE,KASjB,CAAA;AACF,CAAC,EAXM,aAAa,KAAb,aAAa,QAWnB;AAkBD,MAAa,IAAI;IACR,MAAM,GAAa,EAAE,CAAC;IAE9B,YAAY,SAAiB,CAAC;QAC7B,IAAI,MAAM,GAAG,CAAC,EAAE;YACf,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;SAClD;IACF,CAAC;IAEM,MAAM,CAAC,KAAa;QAC1B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxB,OAAO,IAAI,CAAC;IACb,CAAC;IAEM,QAAQ;QACd,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC7B,CAAC;CACD;AAjBD,oBAiBC;AAED,MAAM,SAAS;IACN,MAAM,CAAW;IAEzB,YAAY,QAAgB;QAC3B,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAC5C,CAAC;IAED,IAAW,KAAK;QACf,OAAO,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;CACD;AAED,MAAa,GAAG;IAKI;IAJX,MAAM,CAAW;IACjB,KAAK,CAAyB;IAC/B,gBAAgB,CAAS;IAEhC,YAAmB,OAAe;QAAf,YAAO,GAAP,OAAO,CAAQ;QACjC,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,gBAAgB,GAAG,CAAC,CAAC;IAC3B,CAAC;IAEM,QAAQ;QACd,IAAI,CAAC,YAAY,EAAE,CAAC;QAEpB,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACzB,IAAI,CAAC,aAAa,CAAC,mBAAmB,IAAI,oDAAoD,EAAE,CAAC,CAAC,CAAC;YACnG,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAO,EAAE,CAAO,EAAE,EAAE;gBACxD,OAAO,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/C,CAAC,CAAC,CAAC;YACH,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBACzB,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;aAC/B;YACD,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;SACrC;QACD,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAEM,OAAO,CAAC,QAAgB,EAAE,IAA+B,EAAE,QAAkB;QACnF,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACtB,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,QAAQ,CAAC,CAAC;YACtC,OAAO;SACP;QACD,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,EAAE;YACpC,MAAM,IAAI,KAAK,CAAC,mBAAmB,IAAI,CAAC,MAAM,kBAAkB,QAAQ,CAAC,MAAM,IAAI,CAAC,CAAC;SACrF;QACD,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,MAAM,CAAC;QACrC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QAC1B,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;QACvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACrC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACpB,IAAI,OAA2B,CAAC;YAChC,IAAI,OAA2B,CAAC;YAChC,IAAI,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;gBACnB,OAAO,GAAG,GAAG,CAAC;gBACd,OAAO,GAAG,SAAS,CAAC;aACpB;iBAAM,IAAI,YAAY,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE;gBAChC,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC;gBAClB,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC1C,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;iBAC3E;aACD;YACD,IAAI,CAAC,OAAO,IAAI,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;gBAC1C,SAAS;aACT;YACD,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC1B,MAAM,OAAO,GAAW,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YACpD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;SAC/E;IACF,CAAC;IAEO,aAAa,CAAC,IAAY,EAAE,IAAU;QAC7C,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,EAAE;YACpE,MAAM,IAAI,KAAK,CAAC,kCAAkC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;SACzF;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,GAAG,CAAC,gBAAgB,IAAI,CAAC,EAAE,YAAY,IAAI,wBAAwB,CAAC,CAAC;SACrE;QAED,IAAI,CAAC,aAAa,CAAC,mBAAmB,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QACtD,IAAI,CAAC,aAAa,CAAC,yBAAyB,IAAI,CAAC,OAAO,WAAW,EAAE,CAAC,CAAC,CAAC;QAExE,IAAI,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,aAAa,CAAC,SAAS,IAAI,CAAC,OAAO,SAAS,EAAE,CAAC,CAAC,CAAC;SACtD;QAED,IAAI,CAAC,aAAa,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;IACxC,CAAC;IAEO,YAAY;QACnB,IAAI,CAAC,aAAa,CAAC,wCAAwC,EAAE,CAAC,CAAC,CAAC;QAChE,IAAI,CAAC,aAAa,CAAC,qEAAqE,EAAE,CAAC,CAAC,CAAC;IAC9F,CAAC;IAEO,YAAY;QACnB,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IACnC,CAAC;IAEO,aAAa,CAAC,OAAe,EAAE,MAAe;QACrD,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC;QAC9B,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IACnC,CAAC;IAED,MAAM,CAAC,KAAK,GAAG,UAAU,SAAiB;QACzC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACtC,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAEnC,MAAM,KAAK,GAA2E,EAAE,CAAC;YAEzF,MAAM,CAAC,WAAW,CAAC,SAAS,EAAE,UAAU,GAAQ,EAAE,MAAW;gBAC5D,IAAI,GAAG,EAAE;oBACR,MAAM,CAAC,IAAI,KAAK,CAAC,oDAAoD,GAAG,EAAE,CAAC,CAAC,CAAC;iBAC7E;gBAED,MAAM,SAAS,GAAU,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;gBACjD,IAAI,CAAC,SAAS,EAAE;oBACf,MAAM,CAAC,IAAI,KAAK,CAAC,gGAAgG,CAAC,CAAC,CAAC;iBACpH;gBAED,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;oBAC1B,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC;oBAC7B,IAAI,CAAC,IAAI,EAAE;wBACV,MAAM,CAAC,IAAI,KAAK,CAAC,iIAAiI,CAAC,CAAC,CAAC;qBACrJ;oBACD,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;oBAC3C,IAAI,CAAC,QAAQ,EAAE;wBACd,MAAM,CAAC,IAAI,KAAK,CAAC,iHAAiH,CAAC,CAAC,CAAC;qBACrI;oBACD,MAAM,QAAQ,GAA2B,EAAE,CAAC;oBAE5C,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;oBAC9C,IAAI,UAAU,EAAE;wBACf,UAAU,CAAC,OAAO,CAAC,CAAC,IAAS,EAAE,EAAE;4BAChC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;4BACtB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;gCACjB,OAAO,CAAC,2BAA2B;6BACnC;4BAED,IAAI,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;4BACzB,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;gCAC5B,yEAAyE;gCACzE,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;6BACzB;4BACD,IAAI,CAAC,GAAG,EAAE;gCACT,MAAM,CAAC,IAAI,KAAK,CAAC,iCAAiC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,oBAAoB,IAAI,+BAA+B,CAAC,CAAC,CAAC;gCAC9I,OAAO;6BACP;4BACD,QAAQ,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;wBACrC,CAAC,CAAC,CAAC;wBACH,KAAK,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;qBACjE;gBACF,CAAC,CAAC,CAAC;gBAEH,OAAO,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC;;AApJH,kBAqJC;AAED,SAAS,aAAa,CAAC,SAAqB;IAC3C,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,CAAW,EAAE,CAAW,EAAU,EAAE;QAC1D,OAAO,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,OAAe;IACrC,+BAA+B;IAC/B,EAAE;IACF,6CAA6C;IAC7C,8CAA8C;IAC9C,2CAA2C;IAC3C,4CAA4C;IAC5C,uCAAuC;IACvC,MAAM,MAAM,GAAG,yIAAyI,CAAC;IACzJ,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,GAAW,EAAE,GAAW,EAAE,EAAU,EAAE,EAAU,EAAE,EAAU,EAAE,EAAE;QAC9G,yCAAyC;QACzC,IAAI,EAAE,EAAE;YACP,wCAAwC;YACxC,OAAO,EAAE,CAAC;SACV;aAAM,IAAI,EAAE,EAAE;YACd,yEAAyE;YACzE,oCAAoC;YACpC,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;YACzB,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE;gBAC5B,OAAO,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;aAC/C;iBAAM;gBACN,OAAO,EAAE,CAAC;aACV;SACD;aAAM,IAAI,EAAE,EAAE;YACd,4BAA4B;YAC5B,OAAO,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;SAC1B;aAAM;YACN,oBAAoB;YACpB,OAAO,KAAK,CAAC;SACb;IACF,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AACf,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAa;IACtC,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACtC,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC3B,QAAQ,EAAE,EAAE;YACX,KAAK,IAAI;gBACR,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACpB,MAAM;YACP,KAAK,GAAG;gBACP,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACnB,MAAM;YACP,KAAK,IAAI;gBACR,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACpB,MAAM;YACP,KAAK,IAAI;gBACR,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACnB,MAAM;YACP,KAAK,IAAI;gBACR,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACnB,MAAM;YACP,KAAK,IAAI;gBACR,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACnB,MAAM;YACP,KAAK,IAAI;gBACR,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACnB,MAAM;YACP,KAAK,IAAI;gBACR,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACnB,MAAM;YACP;gBACC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SACjB;KACD;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACxB,CAAC;AAED,SAAS,uBAAuB,CAAC,UAAkB,EAAE,SAAqB,EAAE,IAAmB,EAAE,OAAsB;IACtH,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC;IAC9B,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC;IACrC,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC;IAEnC,MAAM,UAAU,GAA2B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAE/D,MAAM,eAAe,GAA2C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACpF,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACzC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QAC1B,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;QACjC,MAAM,QAAQ,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;QACxC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,EAAE;YACjD,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,sBAAsB,MAAM,sDAAsD,CAAC,CAAC;YAC1G,OAAO;SACP;QACD,MAAM,UAAU,GAA2B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC/D,eAAe,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC;QACrC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;YACnB,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;gBAC5B,UAAU,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;aAC9B;iBAAM;gBACN,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;aAClC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;IACvF,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE;QACtC,GAAG,CAAC,wDAAwD,iBAAiB,EAAE,CAAC,CAAC;QACjF,GAAG,CAAC,0GAA0G,CAAC,CAAC;KAChH;IACD,MAAM,eAAe,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;IACjD,eAAe,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QACpC,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,EAAE;YACxC,GAAG,CAAC,+BAA+B,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;SAClD;QAED,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;QAC5B,MAAM,gBAAgB,GAA6B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACvE,MAAM,kBAAkB,GAAG,QAAQ,CAAC,aAAa,IAAI,QAAQ,CAAC,EAAE,CAAC;QACjE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,wBAAwB,kBAAkB,EAAE,EAAE,cAAc,EAAE,gBAAgB,CAAC,CAAC;QAC9H,IAAI,WAAmC,CAAC;QACxC,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;YAC5B,MAAM,OAAO,GAAG,aAAa,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;YACjE,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SAClC;QACD,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAC1B,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;YAClC,IAAI,aAA2D,CAAC;YAChE,IAAI,WAAW,EAAE;gBAChB,aAAa,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;aAC7C;YACD,IAAI,CAAC,aAAa,EAAE;gBACnB,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,EAAE;oBACxC,GAAG,CAAC,0CAA0C,MAAM,2BAA2B,CAAC,CAAC;iBACjF;gBACD,aAAa,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;gBACxC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC;aACtF;YACD,MAAM,iBAAiB,GAAa,EAAE,CAAC;YACvC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBACzB,IAAI,GAAG,GAAkB,IAAI,CAAC;gBAC9B,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;oBAChC,GAAG,GAAG,OAAO,CAAC;iBACd;qBAAM;oBACN,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;iBAClB;gBACD,IAAI,OAAO,GAAW,aAAc,CAAC,GAAG,CAAC,CAAC;gBAC1C,IAAI,CAAC,OAAO,EAAE;oBACb,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,EAAE;wBACxC,GAAG,CAAC,sCAAsC,GAAG,cAAc,MAAM,0BAA0B,CAAC,CAAC;qBAC7F;oBACD,OAAO,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC;oBACvC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;iBACtD;gBACD,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACjC,CAAC,CAAC,CAAC;YACH,gBAAgB,CAAC,MAAM,CAAC,GAAG,iBAAiB,CAAC;QAC9C,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAC7C,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;YACtC,MAAM,QAAQ,GAAa;gBAC1B,UAAU;gBACV,WAAW,MAAM,QAAQ,QAAQ,CAAC,EAAE,MAAM;aAC1C,CAAC;YACF,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;gBACjC,QAAQ,CAAC,IAAI,CAAC,MAAM,MAAM,MAAM,CAAC,CAAC;gBAClC,MAAM,QAAQ,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;gBAC1C,IAAI,CAAC,QAAQ,EAAE;oBACd,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,mCAAmC,MAAM,GAAG,CAAC,CAAC;oBACpE,OAAO;iBACP;gBACD,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;oBACnC,QAAQ,CAAC,IAAI,CAAC,QAAQ,gBAAgB,CAAC,OAAO,CAAC,GAAG,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;gBAC3F,CAAC,CAAC,CAAC;gBACH,QAAQ,CAAC,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAC5D,CAAC,CAAC,CAAC;YACH,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACrB,OAAO,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAC,EAAE,GAAG,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;QAChI,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACrC,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;QAC9B,GAAG,CAAC,GAAG,GAAG,QAAQ,KAAK,wBAAwB,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IACH,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QAClC,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACtC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;YACpB,GAAG,CAAC,wCAAwC,QAAQ,CAAC,EAAE,mCAAmC,CAAC,CAAC;SAC5F;IACF,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,SAAgB,eAAe,CAAC,IAAmD;IAClF,OAAO,IAAA,sBAAO,EAAC,UAA+B,IAAU;QACvD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,QAAQ,KAAK,mBAAmB,EAAE;YACrC,IAAI,IAAI,GAAG,IAAI,CAAC;YAChB,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE;gBACpB,IAAI,GAAG,IAAI,CAAC,KAAK,CAAU,IAAI,CAAC,QAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;aAC5D;iBAAM;gBACN,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,kCAAkC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACtE,OAAO;aACP;YACD,IAAI,aAAa,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE;gBAC3B,uBAAuB,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;aACrE;SACD;QACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACJ,CAAC;AAjBD,0CAiBC;AAED,MAAM,aAAa,GAAW,eAAe,EAC5C,gBAAgB,GAAW,kBAAkB,EAC7C,iBAAiB,GAAW,mBAAmB,EAC/C,YAAY,GAAW,cAAc,EACrC,aAAa,GAAW,eAAe,CAAC;AAEzC,SAAgB,WAAW,CAAC,UAAkB;IAC7C,IAAI,QAAgB,CAAC;IAErB,IAAI,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;QACrC,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;KACvD;SAAM,IAAI,sBAAsB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;QACnD,OAAO,EAAE,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;KAC7D;SAAM,IAAI,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;QAC1C,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;KACrD;SAAM,IAAI,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;QACxC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;KACnD;SAAM,IAAI,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;QACxC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC;KACtD;SAAM,IAAI,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;QAC1C,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;KACrD;SAAM,IAAI,yBAAyB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;QACtD,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9C,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC;KACrD;SAAM,IAAI,0BAA0B,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;QACvD,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9C,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC;KACrD;SAAM,IAAI,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;QAC7C,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC;KAC3D;IAED,MAAM,IAAI,KAAK,CAAC,yCAAyC,UAAU,EAAE,CAAC,CAAC;AACxE,CAAC;AA1BD,kCA0BC;AAGD,SAAgB,2BAA2B;IAC1C,OAAO,IAAA,sBAAO,EAAC,UAA+B,IAAU;QACvD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,QAAQ,KAAK,mBAAmB,EAAE;YACrC,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE;gBACpB,MAAM,IAAI,GAAwB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBACtD,MAAM,IAAI,GAAkB,IAAI,CAAC,KAAK,CAAE,IAAI,CAAC,QAAmB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;gBACnF,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,IAAI,EAAE;oBACnC,MAAM,eAAe,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;oBAChD,MAAM,QAAQ,GAAG,eAAe,CAAC,IAAI,CAAC;oBACtC,MAAM,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC;oBAExC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;oBAC3C,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,EAAE;wBACpC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,oDAAoD,IAAI,CAAC,QAAQ,eAAe,UAAU,EAAE,CAAC,CAAC;wBACjH,OAAO;qBACP;yBAAM;wBACN,IAAI,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;wBACzB,IAAI,CAAC,GAAG,EAAE;4BACT,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;4BACvB,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC;yBACrB;wBACD,GAAG,CAAC,OAAO,CAAC,OAAO,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;qBACjD;iBACD;gBACD,KAAK,MAAM,QAAQ,IAAI,IAAI,EAAE;oBAC5B,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;oBAC3B,MAAM,QAAQ,GAAG,GAAG,GAAG,CAAC,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC;oBACtE,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC;wBACxB,IAAI,EAAE,QAAQ;wBACd,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC;qBAC7C,CAAC,CAAC;oBACH,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;iBACpB;aACD;iBAAM;gBACN,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,KAAK,CAAC,QAAQ,IAAI,CAAC,QAAQ,gCAAgC,CAAC,CAAC,CAAC;gBACrF,OAAO;aACP;SACD;aAAM;YACN,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,KAAK,CAAC,QAAQ,IAAI,CAAC,QAAQ,gCAAgC,CAAC,CAAC,CAAC;YACrF,OAAO;SACP;IACF,CAAC,CAAC,CAAC;AACJ,CAAC;AA5CD,kEA4CC;AAED,SAAS,4BAA4B,CAAC,mBAA2B;IAChE,OAAO,IAAI;SACT,GAAG,CAAC;QACJ,gCAAgC;QAChC,cAAc,mBAAmB,oCAAoC;QACrE,+FAA+F;QAC/F,cAAc,mBAAmB,mDAAmD;QACpF,+FAA+F;QAC/F,cAAc,mBAAmB,yDAAyD;KAC1F,CAAC;SACD,IAAI,CAAC,IAAA,kBAAG,EAAC,UAAU,IAAI,EAAE,QAAQ;QACjC,MAAM,IAAI,GAAG,IAAY,CAAC;QAC1B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE;YACrB,6BAA6B;YAC7B,QAAQ,EAAE,CAAC;YACX,OAAO;SACP;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9C,IAAI,SAAS,KAAK,OAAO,EAAE;YAC1B,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAChD,IAAA,sBAAW,EAAC,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC;iBACpC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;gBACd,QAAQ,CAAC,SAAS,EAAE,IAAI,IAAI,CAAC;oBAC5B,IAAI,EAAE,cAAc,mBAAmB,mBAAmB;oBAC1D,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;iBACnD,CAAC,CAAC,CAAC;YACL,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACd,QAAQ,CAAC,IAAI,KAAK,CAAC,QAAQ,IAAI,CAAC,QAAQ,iCAAiC,GAAG,EAAE,CAAC,CAAC,CAAC;YAClF,CAAC,CAAC,CAAC;YACJ,gBAAgB;YAChB,OAAO,KAAK,CAAC;SACb;QAED,wBAAwB;QACxB,IAAI,UAAU,CAAC;QACf,IAAI;YACH,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;SACxD;QAAC,OAAO,GAAG,EAAE;YACb,QAAQ,CAAC,IAAI,KAAK,CAAC,QAAQ,IAAI,CAAC,QAAQ,iCAAiC,GAAG,EAAE,CAAC,CAAC,CAAC;YACjF,OAAO;SACP;QAED,iDAAiD;QACjD,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE;YAC7B,IACC,OAAO,UAAU,CAAC,GAAG,CAAC,KAAK,QAAQ;gBACnC,CAAC,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,OAAO,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,EACvF;gBACD,QAAQ,CAAC,IAAI,KAAK,CAAC,oDAAoD,GAAG,iCAAiC,CAAC,CAAC,CAAC;gBAC9G,OAAO;aACP;SACD;QAED,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;SACF,IAAI,CAAC,SAAS,CAAC;QACf,QAAQ,EAAE,cAAc,mBAAmB,mBAAmB;QAC9D,SAAS,EAAE,EAAE;QACb,YAAY,EAAE,IAAI;KAClB,CAAC,CAAC,CAAC;AACN,CAAC;AAED,SAAgB,2BAA2B;IAC1C,IAAI,OAAO,GAAW,CAAC,CAAC;IACxB,IAAI,iBAAiB,GAAY,KAAK,CAAC;IACvC,IAAI,sBAAsB,GAAY,KAAK,CAAC;IAC5C,OAAO,IAAA,sBAAO,EAAC,UAA+B,eAAqB;QAClE,MAAM,YAAY,GAAG,IAAI,CAAC;QAC1B,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE;YACxB,OAAO;SACP;QACD,MAAM,mBAAmB,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAChE,IAAI,mBAAmB,KAAK,cAAc,EAAE;YAC3C,OAAO;SACP;QACD,0CAA0C;QAC1C,MAAM,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,cAAc,CAAC,EAAE,OAAO,CAAC,CAAC;QAC3F,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC1C,MAAM,WAAW,GAAG,YAAY,CAAC,SAAS,GAAG,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC;QAErE,OAAO,EAAE,CAAC;QACV,IAAI,QAAqC,CAAC;QAC1C,SAAS,UAAU;YAClB,IAAI,CAAC,QAAQ,EAAE;gBACd,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;aACrB;YACD,OAAO,QAAQ,CAAC;QACjB,CAAC;QACD,IAAA,oBAAK,EACJ,IAAI,CAAC,GAAG,CAAC,CAAC,qBAAqB,mBAAmB,mBAAmB,EAAE,qBAAqB,mBAAmB,uBAAuB,CAAC,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,EAC9J,4BAA4B,CAAC,mBAAmB,CAAC,CACjD,CAAC,IAAI,CAAC,IAAA,sBAAO,EAAC,UAAU,IAAU;YAClC,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE;gBACpB,MAAM,MAAM,GAAW,IAAI,CAAC,QAAkB,CAAC;gBAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC1C,IAAI,QAAQ,KAAK,kBAAkB,EAAE;oBACpC,MAAM,IAAI,GAAmB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;oBACjE,UAAU,EAAE,CAAC,GAAG,CAAC,cAAc,WAAW,UAAU,EAAE,IAAI,CAAC,CAAC;iBAC5D;qBAAM,IAAI,QAAQ,KAAK,mBAAmB,EAAE;oBAC5C,MAAM,IAAI,GAA2B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;oBACzE,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,qBAAqB,mBAAmB,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;oBACnG,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE;wBACxB,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;wBAC/B,MAAM,IAAI,GAAmB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;wBACjD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;4BACrD,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;4BACxC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gCAC5D,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAiB;gCACrC,CAAC,CAAC,EAAE,GAAG,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,CAAW,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;4BAE9D,IAAI,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;yBACrD;wBACD,UAAU,EAAE,CAAC,GAAG,CAAC,cAAc,WAAW,IAAI,OAAO,IAAI,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC;qBACvE;iBACD;qBAAM,IAAI,QAAQ,KAAK,kBAAkB,EAAE;oBAC3C,MAAM,IAAI,GAAmB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;oBACjE,UAAU,EAAE,CAAC,GAAG,CAAC,cAAc,WAAW,SAAS,EAAE,IAAI,CAAC,CAAC;iBAC3D;qBAAM;oBACN,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,IAAI,oCAAoC,CAAC,CAAC,CAAC;oBAChF,OAAO;iBACP;aACD;QACF,CAAC,EAAE;YACF,IAAI,QAAQ,EAAE,IAAI,GAAG,CAAC,EAAE;gBACvB,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC;oBACxB,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,WAAW,GAAG,MAAM,CAAC;oBACxD,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,IAAA,qBAAU,EAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;iBACnD,CAAC,CAAC;gBACH,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;aAC5B;YACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACjB,OAAO,EAAE,CAAC;YACV,IAAI,OAAO,KAAK,CAAC,IAAI,iBAAiB,IAAI,CAAC,sBAAsB,EAAE;gBAClE,sBAAsB,GAAG,IAAI,CAAC;gBAC9B,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aACzB;QACF,CAAC,CAAC,CAAC,CAAC;IACL,CAAC,EAAE;QACF,iBAAiB,GAAG,IAAI,CAAC;QACzB,IAAI,OAAO,KAAK,CAAC,EAAE;YAClB,sBAAsB,GAAG,IAAI,CAAC;YAC9B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SACjB;IACF,CAAC,CAAC,CAAC;AACJ,CAAC;AAnFD,kEAmFC;AAED,SAAgB,oBAAoB;IACnC,OAAO,IAAA,sBAAO,EAAC,UAA+B,IAAU;QACvD,IAAI,WAAmB,EACtB,YAAoB,CAAC;QACtB,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,iBAAiB,EAAE;YACnD,WAAW,GAAG,YAAY,CAAC;YAC3B,YAAY,GAAG,cAAc,CAAC;SAC9B;aAAM;YACN,MAAM,IAAI,KAAK,CAAC,sBAAsB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;SACnD;QAED,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,EAC/B,IAAI,GAAa,EAAE,EACnB,QAAQ,GAAa,EAAE,CAAC;QAEzB,MAAM,KAAK,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QACtD,IAAI,gBAAgB,GAAG,KAAK,CAAC;QAC7B,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC1B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;gBACtB,OAAO;aACP;YACD,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACjC,QAAQ,SAAS,EAAE;gBAClB,KAAK,GAAG;oBACP,gBAAgB;oBAChB,OAAO;gBACR,KAAK,GAAG;oBACP,gBAAgB,GAAG,YAAY,KAAK,IAAI,IAAI,kBAAkB,KAAK,IAAI,CAAC;oBACxE,OAAO;aACR;YACD,IAAI,CAAC,gBAAgB,EAAE;gBACtB,OAAO;aACP;YACD,MAAM,QAAQ,GAAa,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC3C,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC1B,MAAM,IAAI,KAAK,CAAC,kCAAkC,IAAI,EAAE,CAAC,CAAC;aAC1D;iBAAM;gBACN,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;gBACxB,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;gBAC1B,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;oBACvC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACf,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBACrB;aACD;QACF,CAAC,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAClH,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;QAE1C,iEAAiE;QACjE,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;QACzD,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;QAChG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACrB,CAAC,CAAC,CAAC;AACJ,CAAC;AAtDD,oDAsDC;AAED,SAAS,cAAc,CAAC,IAAY,EAAE,QAAa;IAClD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACnC,MAAM,CAAC,EAAE,CAAC,GAAG;QACZ,8FAA8F;QAC9F,2DAA2D;QAC3D,8FAA8F;QAC9F,8FAA8F;QAC9F,iDAAiD;KACjD,CAAC;IACF,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;QACxC,MAAM,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;KAC5B;IAED,IAAI,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACjD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;QACjC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;KACzC;IACD,OAAO,IAAI,IAAI,CAAC;QACf,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC;QACpC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC;KACtC,CAAC,CAAC;AACJ,CAAC;AASD,MAAM,eAAe,GAAG,OAAO,CAAC;AAOhC,SAAS,2BAA2B,CAAC,cAA8B;IAClE,MAAM,MAAM,GAA2B,EAAE,CAAC;IAC1C,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI,EAAE,EAAE;QACrD,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;QAClC,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;KAChE;IACD,OAAO,MAAM,CAAC;AACf,CAAC;AAED,SAAgB,oBAAoB,CAAC,yBAA4C;IAChF,MAAM,aAAa,GAAiC,EAAE,CAAC;IACvD,MAAM,QAAQ,GAAa,EAAE,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IACtE,MAAM,eAAe,GAA6B,EAAE,CAAC;IACrD,MAAM,MAAM,GAAU,EAAE,CAAC;IACzB,OAAO,IAAA,sBAAO,EAAC,UAA+B,GAAS;QACtD,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACxE,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACrD,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACzC,GAAG,CAAC,SAAS,OAAO,KAAK,QAAQ,EAAE,CAAC,CAAC;QACrC,MAAM,YAAY,GAAG,IAAA,8BAAmB,EAAC,QAAQ,CAAC,CAAC;QACnD,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACjC,YAAY,CAAC,IAAI,CAChB,aAAa,CAAC,EAAE;YACf,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;gBACvB,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBAErC,IAAI,OAAO,KAAK,iBAAiB,EAAE;oBAClC,oCAAoC;oBACpC,IAAI,OAAO,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;oBACxC,IAAI,CAAC,OAAO,EAAE;wBACb,OAAO,GAAG,eAAe,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;qBACjF;oBACD,2CAA2C;oBAC3C,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,GAAG,CAAC,CAAC,CAAC;oBACtD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC,GAAG,2BAA2B,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;iBAC/F;qBAAM;oBACN,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,GAAG,2BAA2B,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;iBAC/F;YACF,CAAC,CAAC,CAAC;QACJ,CAAC,CACD,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;YAChB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;IACJ,CAAC,EAAE;QACF,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;aACxB,IAAI,CAAC,GAAG,EAAE;YACV,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;gBACtB,MAAM,MAAM,CAAC;aACb;YACD,MAAM,kBAAkB,GAAG,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAC9D,yBAAyB,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,gBAAgB,EAAE,CAAC,CAAC;YAEjF,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAC/B,KAAK,MAAM,WAAW,IAAI,eAAe,EAAE;gBAC1C,MAAM,iBAAiB,GAAG,cAAc,CAAC,cAAc,WAAW,EAAE,EAAE,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC;gBACpG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;gBAE9B,yBAAyB,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,cAAc,WAAW,YAAY,EAAE,CAAC,CAAC;aACzG;YACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAClB,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,MAAM,EAAE,EAAE;YACjB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACJ,CAAC;AAzDD,oDAyDC;AAED,SAAgB,eAAe,CAAC,QAAkB,EAAE,eAA0B;IAC7E,MAAM,aAAa,GAAiC,EAAE,CAAC;IAEvD,OAAO,IAAA,sBAAO,EAAC,UAA+B,GAAS;QACtD,MAAM,MAAM,GAAG,IAAI,CAAC;QACpB,MAAM,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QACxD,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACjC,YAAY,CAAC,IAAI,CAChB,aAAa,CAAC,EAAE;YACf,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAC5B,MAAM,cAAc,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAC;gBAC1F,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAC9B,CAAC,CAAC,CAAC;QACJ,CAAC,CACD,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;YAChB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;IACJ,CAAC,EAAE;QACF,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;aACxB,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;aACjC,KAAK,CAAC,MAAM,CAAC,EAAE;YACf,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACJ,CAAC;AAxBD,0CAwBC;AAED,SAAS,aAAa,CAAC,IAAY,EAAE,QAAwB,EAAE,QAAkB,EAAE,SAAoB;IACtG,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,IAAI,eAA0B,CAAC;IAC/B,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,SAAS,EAAE;QACtC,eAAe,GAAG,IAAI,SAAS,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,GAAG,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;KACxE;SAAM;QACN,eAAe,GAAG,IAAI,SAAS,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,GAAG,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;KAC3E;IACD,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACpC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YACpB,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACjC,IAAI,SAAS,KAAK,GAAG,IAAI,SAAS,KAAK,GAAG,EAAE;gBAC3C,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACnB;iBAAM;gBACN,MAAM,QAAQ,GAAa,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC3C,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;gBACxB,IAAI,UAAU,GAAG,IAAI,CAAC;gBACtB,IAAI,GAAG,EAAE;oBACR,MAAM,iBAAiB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;oBACxC,IAAI,iBAAiB,EAAE;wBACtB,UAAU,GAAG,GAAG,GAAG,IAAI,iBAAiB,EAAE,CAAC;qBAC3C;iBACD;gBAED,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aACzB;SACD;IACF,CAAC,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACrC,MAAM,QAAQ,GAAG,GAAG,QAAQ,IAAI,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClD,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;IAEvG,OAAO,IAAI,IAAI,CAAC;QACf,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;KAC9B,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,KAAa;IACpC,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACtC,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACpB,QAAQ,EAAE,EAAE;YACX,KAAK,GAAG;gBACP,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACpB,MAAM;YACP,KAAK,GAAG;gBACP,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACpB,MAAM;YACP,KAAK,GAAG;gBACP,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACrB,MAAM;YACP;gBACC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SACjB;KACD;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACxB,CAAC;AAED,SAAS,cAAc,CAAC,KAAa;IACpC,OAAO,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;AACjF,CAAC"}
\ No newline at end of file
diff --git a/build/lib/i18n.ts b/build/lib/i18n.ts
index 85d1e2eebbf7ba..54b6fdd2b98632 100644
--- a/build/lib/i18n.ts
+++ b/build/lib/i18n.ts
@@ -6,7 +6,8 @@
 import * as path from 'path';
 import * as fs from 'fs';
 
-import { merge, through, ThroughStream, writeArray } from 'event-stream';
+import { map, merge, through, ThroughStream } from 'event-stream';
+import * as jsonMerge from 'gulp-merge-json';
 import * as File from 'vinyl';
 import * as Is from 'is';
 import * as xml2js from 'xml2js';
@@ -579,57 +580,67 @@ export function createXlfFilesForCoreBundle(): ThroughStream {
 	});
 }
 
-function createL10nBundleForExtension(extensionFolderName: string): ThroughStream {
-	const result = through();
-	gulp.src([
-		// For source code of extensions
-		`extensions/${extensionFolderName}/src/**/*.{ts,tsx}`,
-		// For any dependencies pulled in (think vscode-css-languageservice or @vscode/emmet-helper)
-		`extensions/${extensionFolderName}/node_modules/**/*.{js,jsx}`,
-		// For any dependencies pulled in that bundle @vscode/l10n. They needed to export the bundle
-		`extensions/${extensionFolderName}/node_modules/**/bundle.l10n.json`,
-	]).pipe(writeArray((err, files: File[]) => {
-		if (err) {
-			result.emit('error', err);
-			return;
-		}
+function createL10nBundleForExtension(extensionFolderName: string): NodeJS.ReadWriteStream {
+	return gulp
+		.src([
+			// For source code of extensions
+			`extensions/${extensionFolderName}/{src,client,server}/**/*.{ts,tsx}`,
+			// // For any dependencies pulled in (think vscode-css-languageservice or @vscode/emmet-helper)
+			`extensions/${extensionFolderName}/**/node_modules/{@vscode,vscode-*}/**/*.{js,jsx}`,
+			// // For any dependencies pulled in that bundle @vscode/l10n. They needed to export the bundle
+			`extensions/${extensionFolderName}/**/node_modules/{@vscode,vscode-*}/**/bundle.l10n.json`,
+		])
+		.pipe(map(function (data, callback) {
+			const file = data as File;
+			if (!file.isBuffer()) {
+				// Not a buffer so we drop it
+				callback();
+				return;
+			}
+			const extension = path.extname(file.relative);
+			if (extension !== '.json') {
+				const contents = file.contents.toString('utf8');
+				getL10nJson([{ contents, extension }])
+					.then((json) => {
+						callback(undefined, new File({
+							path: `extensions/${extensionFolderName}/bundle.l10n.json`,
+							contents: Buffer.from(JSON.stringify(json), 'utf8')
+						}));
+					})
+					.catch((err) => {
+						callback(new Error(`File ${file.relative} threw an error when parsing: ${err}`));
+					});
+				// signal pause?
+				return false;
+			}
 
-		const buffers = files.filter(file => file.isBuffer());
-
-		const json = getL10nJson(buffers
-			.filter(file => path.extname(file.path) !== '.json')
-			.map(file => ({
-				contents: file.contents.toString('utf8'),
-				extension: path.extname(file.path)
-			})));
-
-		buffers
-			.filter(file => path.extname(file.path) === '.json')
-			.forEach(file => {
-				const bundleJson = JSON.parse(file.contents.toString('utf8'));
-				for (const key in bundleJson) {
-					if (
-						// some validation of the bundle.l10n.json format
-						typeof bundleJson[key] !== 'string' &&
-						(typeof bundleJson[key].message !== 'string' || !Array.isArray(bundleJson[key].comment))
-					) {
-						console.error(`Invalid bundle.l10n.json file. The value for key ${key} is not in the expected format. Skipping key...`);
-						continue;
-					}
-					json[key] = bundleJson[key];
-				}
-			});
+			// for bundle.l10n.jsons
+			let bundleJson;
+			try {
+				bundleJson = JSON.parse(file.contents.toString('utf8'));
+			} catch (err) {
+				callback(new Error(`File ${file.relative} threw an error when parsing: ${err}`));
+				return;
+			}
 
-		if (Object.keys(json).length > 0) {
-			result.emit('data', new File({
-				path: `extensions/${extensionFolderName}/bundle.l10n.json`,
-				contents: Buffer.from(JSON.stringify(json), 'utf8')
-			}));
-		}
-		result.emit('end');
-	}));
+			// some validation of the bundle.l10n.json format
+			for (const key in bundleJson) {
+				if (
+					typeof bundleJson[key] !== 'string' &&
+					(typeof bundleJson[key].message !== 'string' || !Array.isArray(bundleJson[key].comment))
+				) {
+					callback(new Error(`Invalid bundle.l10n.json file. The value for key ${key} is not in the expected format.`));
+					return;
+				}
+			}
 
-	return result;
+			callback(undefined, file);
+		}))
+		.pipe(jsonMerge({
+			fileName: `extensions/${extensionFolderName}/bundle.l10n.json`,
+			jsonSpace: '',
+			concatArrays: true
+		}));
 }
 
 export function createXlfFilesForExtensions(): ThroughStream {
diff --git a/build/lib/mangleTypeScript.js b/build/lib/mangleTypeScript.js
index c95831668f33b8..9cd39e57347475 100644
--- a/build/lib/mangleTypeScript.js
+++ b/build/lib/mangleTypeScript.js
@@ -9,6 +9,8 @@ const ts = require("typescript");
 const path = require("path");
 const fs = require("fs");
 const process_1 = require("process");
+const source_map_1 = require("source-map");
+const url_1 = require("url");
 class ShortIdent {
     static _keywords = new Set(['await', 'break', 'case', 'catch', 'class', 'const', 'continue', 'debugger',
         'default', 'delete', 'do', 'else', 'export', 'extends', 'false', 'finally', 'for', 'function', 'if',
@@ -325,7 +327,7 @@ class Mangler {
                 ts.forEachChild(file, visit);
             }
         }
-        this.log(`done COLLECTING ${this.allClassDataByKey.size} classes`);
+        this.log(`Done collecting classes: ${this.allClassDataByKey.size}`);
         //  STEP: connect sub and super-types
         const setupParents = (data) => {
             const extendsClause = data.node.heritageClauses?.find(h => h.token === ts.SyntaxKind.ExtendsKeyword);
@@ -374,7 +376,7 @@ class Mangler {
         for (const data of this.allClassDataByKey.values()) {
             ClassData.fillInReplacement(data);
         }
-        this.log(`done creating REPLACEMENTS`);
+        this.log(`Done creating replacements`);
         const editsByFile = new Map();
         const appendEdit = (fileName, edit) => {
             const edits = editsByFile.get(fileName);
@@ -413,11 +415,16 @@ class Mangler {
                 }
             }
         }
-        this.log(`done preparing EDITS for ${editsByFile.size} files`);
+        this.log(`Done preparing edits: ${editsByFile.size} files`);
         // STEP: apply all rename edits (per file)
         const result = new Map();
         let savedBytes = 0;
         for (const item of this.service.getProgram().getSourceFiles()) {
+            const { mapRoot, sourceRoot } = this.service.getProgram().getCompilerOptions();
+            const projectDir = path.dirname(this.projectPath);
+            const sourceMapRoot = mapRoot ?? (0, url_1.pathToFileURL)(sourceRoot ?? projectDir).toString();
+            // source maps
+            let generator;
             let newFullText;
             const edits = editsByFile.get(item.fileName);
             if (!edits) {
@@ -425,32 +432,63 @@ class Mangler {
                 newFullText = item.getFullText();
             }
             else {
+                // source map generator
+                const relativeFileName = path.relative(projectDir, item.fileName);
+                const mappingsByLine = new Map();
                 // apply renames
                 edits.sort((a, b) => b.offset - a.offset);
                 const characters = item.getFullText().split('');
                 let lastEdit;
                 for (const edit of edits) {
-                    if (lastEdit) {
-                        if (lastEdit.offset === edit.offset) {
-                            //
-                            if (lastEdit.length !== edit.length || lastEdit.newText !== edit.newText) {
-                                this.log('OVERLAPPING edit', item.fileName, edit.offset, edits);
-                                throw new Error('OVERLAPPING edit');
-                            }
-                            else {
-                                continue;
-                            }
+                    if (lastEdit && lastEdit.offset === edit.offset) {
+                        //
+                        if (lastEdit.length !== edit.length || lastEdit.newText !== edit.newText) {
+                            this.log('ERROR: Overlapping edit', item.fileName, edit.offset, edits);
+                            throw new Error('OVERLAPPING edit');
+                        }
+                        else {
+                            continue;
                         }
                     }
                     lastEdit = edit;
-                    const removed = characters.splice(edit.offset, edit.length, edit.newText);
-                    savedBytes += removed.length - edit.newText.length;
+                    const mangledName = characters.splice(edit.offset, edit.length, edit.newText).join('');
+                    savedBytes += mangledName.length - edit.newText.length;
+                    // source maps
+                    const pos = item.getLineAndCharacterOfPosition(edit.offset);
+                    let mappings = mappingsByLine.get(pos.line);
+                    if (!mappings) {
+                        mappings = [];
+                        mappingsByLine.set(pos.line, mappings);
+                    }
+                    mappings.unshift({
+                        source: relativeFileName,
+                        original: { line: pos.line + 1, column: pos.character },
+                        generated: { line: pos.line + 1, column: pos.character },
+                        name: mangledName
+                    }, {
+                        source: relativeFileName,
+                        original: { line: pos.line + 1, column: pos.character + edit.length },
+                        generated: { line: pos.line + 1, column: pos.character + edit.newText.length },
+                    });
+                }
+                // source map generation, make sure to get mappings per line correct
+                generator = new source_map_1.SourceMapGenerator({ file: path.basename(item.fileName), sourceRoot: sourceMapRoot });
+                generator.setSourceContent(relativeFileName, item.getFullText());
+                for (const [, mappings] of mappingsByLine) {
+                    let lineDelta = 0;
+                    for (const mapping of mappings) {
+                        generator.addMapping({
+                            ...mapping,
+                            generated: { line: mapping.generated.line, column: mapping.generated.column - lineDelta }
+                        });
+                        lineDelta += mapping.original.column - mapping.generated.column;
+                    }
                 }
                 newFullText = characters.join('');
             }
-            result.set(item.fileName, newFullText);
+            result.set(item.fileName, { out: newFullText, sourceMap: generator?.toString() });
         }
-        this.log(`DONE saved ${savedBytes / 1000}kb`);
+        this.log(`Done: ${savedBytes / 1000}kb saved`);
         return result;
     }
 }
@@ -463,14 +501,17 @@ function hasModifier(node, kind) {
 async function _run() {
     const projectPath = path.join(__dirname, '../../src/tsconfig.json');
     const projectBase = path.dirname(projectPath);
-    const newProjectBase = path.join(path.dirname(projectBase), path.basename(projectBase) + '-mangle');
+    const newProjectBase = path.join(path.dirname(projectBase), path.basename(projectBase) + '2');
     for await (const [fileName, contents] of new Mangler(projectPath, console.log).computeNewFileContents()) {
         const newFilePath = path.join(newProjectBase, path.relative(projectBase, fileName));
         await fs.promises.mkdir(path.dirname(newFilePath), { recursive: true });
-        await fs.promises.writeFile(newFilePath, contents);
+        await fs.promises.writeFile(newFilePath, contents.out);
+        if (contents.sourceMap) {
+            await fs.promises.writeFile(newFilePath + '.map', contents.sourceMap);
+        }
     }
 }
 if (__filename === process_1.argv[1]) {
     _run();
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"mangleTypeScript.js","sourceRoot":"","sources":["mangleTypeScript.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,iCAAiC;AACjC,6BAA6B;AAC7B,yBAAyB;AACzB,qCAA+B;AAE/B,MAAM,UAAU;IAEP,MAAM,CAAC,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU;QAC9G,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI;QACnG,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO;QAC1G,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAE5D,MAAM,CAAC,SAAS,GAAG,sDAAsD,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAEpF,MAAM,GAAG,CAAC,CAAC;IACF,YAAY,CAA4B;IAEzD,YAAY,WAAsC;QACjD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC;IACjF,CAAC;IAED,IAAI;QACH,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAClD,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE;YACjC,YAAY;YACZ,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;SACnB;QACD,OAAO,SAAS,CAAC;IAClB,CAAC;IAEO,MAAM,CAAC,OAAO,CAAC,CAAS;QAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;QACnC,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,GAAG;YACF,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC;YACtB,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAC/B,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB,QAAQ,CAAC,GAAG,CAAC,EAAE;QAChB,OAAO,MAAM,CAAC;IACf,CAAC;;AAGF,IAAW,SAIV;AAJD,WAAW,SAAS;IACnB,6CAAM,CAAA;IACN,mDAAS,CAAA;IACT,+CAAO,CAAA;AACR,CAAC,EAJU,SAAS,KAAT,SAAS,QAInB;AAED,MAAM,SAAS;IAUJ;IACA;IATV,MAAM,GAAG,IAAI,GAAG,EAA4C,CAAC;IAErD,YAAY,CAAkC;IAEtD,MAAM,CAAwB;IAC9B,QAAQ,CAA0B;IAElC,YACU,QAAgB,EAChB,IAA8C;QAEvD,gFAAgF;QAChF,gFAAgF;QAJvE,aAAQ,GAAR,QAAQ,CAAQ;QAChB,SAAI,GAAJ,IAAI,CAA0C;QAKvD,MAAM,UAAU,GAA4B,EAAE,CAAC;QAC/C,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE;YAClC,IAAI,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE;gBACnC,oBAAoB;gBACpB,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAExB;iBAAM,IAAI,EAAE,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE;gBAC5C,uBAAuB;gBACvB,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAExB;iBAAM,IAAI,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE;gBACpC,8BAA8B;gBAC9B,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAExB;iBAAM,IAAI,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE;gBACpC,8BAA8B;gBAC9B,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAExB;iBAAM,IAAI,EAAE,CAAC,wBAAwB,CAAC,MAAM,CAAC,EAAE;gBAC/C,iDAAiD;gBACjD,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,UAAU,EAAE;oBACtC,IAAI,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC;2BAChD,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC;2BAClD,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;2BAC/C,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EACnD;wBACD,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;qBACvB;iBACD;aACD;SACD;QACD,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE;YAChC,MAAM,KAAK,GAAG,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAC/C,IAAI,CAAC,KAAK,EAAE;gBACX,SAAS;aACT;YACD,MAAM,IAAI,GAAG,SAAS,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YAC7C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,IAAK,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;SAC/D;IACF,CAAC;IAEO,MAAM,CAAC,cAAc,CAAC,IAAyB;QACtD,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACf,OAAO,SAAS,CAAC;SACjB;QACD,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;QACtB,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC3B,IAAI,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,oBAAoB,EAAE;YACrD,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa,EAAE;gBACzD,+CAA+C;gBAC/C,OAAO;aACP;YACD,UAAU;YACV,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;SAC/C;QAED,OAAO,KAAK,CAAC;IACd,CAAC;IAEO,MAAM,CAAC,aAAa,CAAC,IAAa;QACzC,IAAI,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;YACpD,iCAAyB;SACzB;aAAM,IAAI,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;YAC7D,mCAA2B;SAC3B;aAAM;YACN,gCAAwB;SACxB;IACF,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,IAAe;QACnC,OAAO,IAAI,8BAAsB;eAC7B,IAAI,gCAAwB,CAC9B;IACH,CAAC;IAED,MAAM,CAAC,gCAAgC,CAAC,IAAe,EAAE,eAAoD;QAC5G,UAAU;QACV,iFAAiF;QACjF,iFAAiF;QACjF,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;YACvC,IAAI,IAAI,CAAC,IAAI,6BAAqB,EAAE;gBACnC,SAAS;aACT;YACD,IAAI,MAAM,GAA0B,IAAI,CAAC,MAAM,CAAC;YAChD,OAAO,MAAM,EAAE;gBACd,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,gCAAwB,EAAE;oBAC1D,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,6BAA6B,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,GAAG,CAAC,CAAC;oBAC1G,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,6BAA6B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBAClF,eAAe,CAAC,IAAI,IAAI,UAAU,MAAM,CAAC,QAAQ,IAAI,SAAS,CAAC,IAAI,GAAG,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC,CAAC;oBAEnH,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,IAAI,2BAAmB,CAAC;iBACjD;gBACD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;aACvB;SACD;IACF,CAAC;IAED,MAAM,CAAC,iBAAiB,CAAC,IAAe;QAEvC,IAAI,IAAI,CAAC,YAAY,EAAE;YACtB,eAAe;YACf,OAAO;SACP;QAED,wBAAwB;QACxB,IAAI,IAAI,CAAC,MAAM,EAAE;YAChB,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACzC;QAED,IAAI,CAAC,YAAY,GAAG,IAAI,GAAG,EAAE,CAAC;QAE9B,MAAM,SAAS,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE;YAEvC,gBAAgB;YAChB,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;gBAC5B,OAAO,IAAI,CAAC;aACZ;YAED,UAAU;YACV,IAAI,MAAM,GAA0B,IAAI,CAAC,MAAM,CAAC;YAChD,OAAO,MAAM,EAAE;gBACd,IAAI,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;oBAC9B,OAAO,IAAI,CAAC;iBACZ;gBACD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;aACvB;YAED,WAAW;YACX,IAAI,IAAI,CAAC,QAAQ,EAAE;gBAClB,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACjC,OAAO,KAAK,CAAC,MAAM,EAAE;oBACpB,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,EAAG,CAAC;oBAC1B,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;wBAC5B,OAAO,IAAI,CAAC;qBACZ;oBACD,IAAI,IAAI,CAAC,QAAQ,EAAE;wBAClB,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;qBAC7B;iBACD;aACD;YAED,OAAO,KAAK,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;YACvC,IAAI,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBACvC,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC;gBACnC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;aACvC;SACD;IACF,CAAC;IAED,kEAAkE;IAClE,kDAAkD;IAC1C,YAAY,CAAC,IAAY;QAChC,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,IAAI,CAAC,EAAE;YACnF,eAAe;YACf,OAAO,IAAI,CAAC;SACZ;QACD,IAAI,IAAI,CAAC,YAAY,EAAE;YACtB,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE;gBACnD,IAAI,SAAS,KAAK,IAAI,EAAE;oBACvB,6CAA6C;oBAC7C,OAAO,IAAI,CAAC;iBACZ;aACD;SACD;QACD,IAAU,IAAI,CAAC,IAAI,CAAC,aAAa,EAAG,CAAC,WAAW,YAAY,GAAG,EAAE;YAChE,2BAA2B;YAC3B,IAAU,IAAI,CAAC,IAAI,CAAC,aAAa,EAAG,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gBAC3D,OAAO,IAAI,CAAC;aACZ;SACD;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,eAAe,CAAC,IAAY;QAC3B,IAAI,KAAK,GAAG,IAAI,CAAC,YAAa,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC;QAC1C,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QACzB,OAAO,MAAM,EAAE;YACd,IAAI,MAAM,CAAC,YAAa,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,gCAAwB,EAAE;gBAC5F,KAAK,GAAG,MAAM,CAAC,YAAa,CAAC,GAAG,CAAC,IAAI,CAAE,IAAI,KAAK,CAAC;aACjD;YACD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;SACvB;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,sBAAsB;IAEtB,QAAQ,CAAC,KAAgB;QACxB,IAAI,CAAC,QAAQ,KAAK,EAAE,CAAC;QACrB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1B,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,CAAC;CACD;AAED,MAAM,yBAAyB;IAKT;IAHJ,QAAQ,CAAuB;IAC/B,gBAAgB,GAAoC,IAAI,GAAG,EAAE,CAAC;IAE/E,YAAqB,WAAmB;QAAnB,gBAAW,GAAX,WAAW,CAAQ;QACvC,MAAM,eAAe,GAAgC,EAAE,CAAC;QACxD,MAAM,MAAM,GAAG,EAAE,CAAC,cAAc,CAAC,WAAW,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC/D,IAAI,MAAM,CAAC,KAAK,EAAE;YACjB,MAAM,MAAM,CAAC,KAAK,CAAC;SACnB;QACD,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC,0BAA0B,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,eAAe,CAAC,CAAC;QACjH,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YACpC,MAAM,MAAM,CAAC,KAAK,CAAC;SACnB;IACF,CAAC;IACD,sBAAsB;QACrB,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;IAC9B,CAAC;IACD,kBAAkB;QACjB,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;IAChC,CAAC;IACD,gBAAgB,CAAC,SAAiB;QACjC,OAAO,GAAG,CAAC;IACZ,CAAC;IACD,iBAAiB;QAChB,OAAO,GAAG,CAAC;IACZ,CAAC;IACD,iBAAiB,CAAC,QAAgB;QACjC,IAAI,MAAM,GAAmC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACjF,IAAI,MAAM,KAAK,SAAS,EAAE;YACzB,MAAM,OAAO,GAAG,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAC1C,IAAI,OAAO,KAAK,SAAS,EAAE;gBAC1B,OAAO,SAAS,CAAC;aACjB;YACD,MAAM,GAAG,EAAE,CAAC,cAAc,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC/C,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;SAC5C;QACD,OAAO,MAAM,CAAC;IACf,CAAC;IACD,mBAAmB;QAClB,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACvC,CAAC;IACD,qBAAqB,CAAC,OAA2B;QAChD,OAAO,EAAE,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IACD,eAAe,GAAG,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC;IACzC,cAAc,GAAG,EAAE,CAAC,GAAG,CAAC,cAAc,CAAC;IACvC,UAAU,GAAG,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC;IAC/B,QAAQ,GAAG,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC;IAC3B,aAAa,GAAG,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC;IACrC,oDAAoD;IACpD,QAAQ,GAAG,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC;CAC3B;AAED;;;;;;;;GAQG;AACH,MAAa,OAAO;IAME;IAA8B;IAJlC,iBAAiB,GAAG,IAAI,GAAG,EAAqB,CAAC;IAEjD,OAAO,CAAqB;IAE7C,YAAqB,WAAmB,EAAW,MAA0B,GAAG,EAAE,GAAG,CAAC;QAAjE,gBAAW,GAAX,WAAW,CAAQ;QAAW,QAAG,GAAH,GAAG,CAAgC;QACrF,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,qBAAqB,CAAC,IAAI,yBAAyB,CAAC,WAAW,CAAC,CAAC,CAAC;IACrF,CAAC;IAED,sBAAsB;QAErB,8CAA8C;QAE9C,MAAM,KAAK,GAAG,CAAC,IAAa,EAAQ,EAAE;YACrC,IAAI,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE;gBAC9D,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC;gBACjC,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;gBACpE,IAAI,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;oBACpC,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;iBACzB;gBACD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;aACpF;YACD,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC9B,CAAC,CAAC;QAEF,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAG,CAAC,cAAc,EAAE,EAAE;YAC/D,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;gBAC5B,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;aAC7B;SACD;QACD,IAAI,CAAC,GAAG,CAAC,mBAAmB,IAAI,CAAC,iBAAiB,CAAC,IAAI,UAAU,CAAC,CAAC;QAGnE,qCAAqC;QAErC,MAAM,YAAY,GAAG,CAAC,IAAe,EAAE,EAAE;YACxC,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;YACrG,IAAI,CAAC,aAAa,EAAE;gBACnB,oBAAoB;gBACpB,OAAO;aACP;YAED,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;YAC7G,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC/B,2CAA2C;gBAC3C,OAAO;aACP;YAED,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;gBACtB,sCAAsC;gBACtC,OAAO;aACP;YAED,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;YAC1B,MAAM,GAAG,GAAG,GAAG,UAAU,CAAC,QAAQ,IAAI,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YAClE,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC/C,IAAI,CAAC,MAAM,EAAE;gBACZ,mDAAmD;gBACnD,OAAO;aACP;YACD,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC,CAAC;QACF,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE;YACnD,YAAY,CAAC,IAAI,CAAC,CAAC;SACnB;QAED,uEAAuE;QACvE,MAAM,UAAU,GAAG,IAAI,GAAG,EAAoB,CAAC;QAC/C,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE;YACnD,SAAS,CAAC,gCAAgC,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;gBAC9D,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACjC,IAAI,GAAG,EAAE;oBACR,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;iBACd;qBAAM;oBACN,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;iBAC5B;YACF,CAAC,CAAC,CAAC;SACH;QACD,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,UAAU,EAAE;YACrC,IAAI,CAAC,GAAG,CAAC,SAAS,GAAG,8BAA8B,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;SACvE;QAED,iDAAiD;QACjD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE;YACnD,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;SAClC;QACD,IAAI,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;QAIvC,MAAM,WAAW,GAAG,IAAI,GAAG,EAAkB,CAAC;QAE9C,MAAM,UAAU,GAAG,CAAC,QAAgB,EAAE,IAAU,EAAE,EAAE;YACnD,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACxC,IAAI,CAAC,KAAK,EAAE;gBACX,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;aAClC;iBAAM;gBACN,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACjB;QACF,CAAC,CAAC;QAEF,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE;YAEnD,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;gBACzD,SAAS;aACT;YAED,MAAM,EAAE,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;gBAC/C,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;oBACxC,SAAS,MAAM,CAAC;iBAChB;gBAED,oDAAoD;gBACpD,uDAAuD;gBACvD,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;gBACzB,OAAO,MAAM,EAAE;oBACd,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,6BAAqB,EAAE;wBACvD,SAAS,MAAM,CAAC;qBAChB;oBACD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;iBACvB;gBAED,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;gBAC3C,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;gBACtG,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE;oBAC5B,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE;wBACxB,OAAO,EAAE,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC,GAAG,OAAO,GAAG,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC;wBAClE,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK;wBAC1B,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,MAAM;qBAC3B,CAAC,CAAC;iBACH;aACD;SACD;QAED,IAAI,CAAC,GAAG,CAAC,4BAA4B,WAAW,CAAC,IAAI,QAAQ,CAAC,CAAC;QAE/D,0CAA0C;QAC1C,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;QACzC,IAAI,UAAU,GAAG,CAAC,CAAC;QAEnB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAG,CAAC,cAAc,EAAE,EAAE;YAE/D,IAAI,WAAmB,CAAC;YACxB,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC7C,IAAI,CAAC,KAAK,EAAE;gBACX,YAAY;gBACZ,WAAW,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;aAEjC;iBAAM;gBACN,gBAAgB;gBAChB,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC;gBAC1C,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAEhD,IAAI,QAA0B,CAAC;gBAE/B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;oBACzB,IAAI,QAAQ,EAAE;wBACb,IAAI,QAAQ,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,EAAE;4BACpC,EAAE;4BACF,IAAI,QAAQ,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,IAAI,QAAQ,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,EAAE;gCACzE,IAAI,CAAC,GAAG,CAAC,kBAAkB,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;gCAChE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;6BACpC;iCAAM;gCACN,SAAS;6BACT;yBACD;qBACD;oBACD,QAAQ,GAAG,IAAI,CAAC;oBAChB,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;oBAC1E,UAAU,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;iBACnD;gBACD,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aAClC;YACD,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;SACvC;QAED,IAAI,CAAC,GAAG,CAAC,cAAc,UAAU,GAAG,IAAI,IAAI,CAAC,CAAC;QAC9C,OAAO,MAAM,CAAC;IACf,CAAC;CACD;AApLD,0BAoLC;AAED,gBAAgB;AAEhB,SAAS,WAAW,CAAC,IAAa,EAAE,IAAmB;IACtD,MAAM,SAAS,GAAG,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAChF,OAAO,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC;AAC7D,CAAC;AAGD,KAAK,UAAU,IAAI;IAElB,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,yBAAyB,CAAC,CAAC;IACpE,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC9C,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC,CAAC;IAEpG,IAAI,KAAK,EAAE,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,sBAAsB,EAAE,EAAE;QACxG,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;QACpF,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACxE,MAAM,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;KACnD;AACF,CAAC;AAED,IAAI,UAAU,KAAK,cAAI,CAAC,CAAC,CAAC,EAAE;IAC3B,IAAI,EAAE,CAAC;CACP"}
\ No newline at end of file
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"mangleTypeScript.js","sourceRoot":"","sources":["mangleTypeScript.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,iCAAiC;AACjC,6BAA6B;AAC7B,yBAAyB;AACzB,qCAA+B;AAC/B,2CAAyD;AACzD,6BAAoC;AAEpC,MAAM,UAAU;IAEP,MAAM,CAAC,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU;QAC9G,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI;QACnG,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO;QAC1G,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAE5D,MAAM,CAAC,SAAS,GAAG,sDAAsD,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAEpF,MAAM,GAAG,CAAC,CAAC;IACF,YAAY,CAA4B;IAEzD,YAAY,WAAsC;QACjD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC;IACjF,CAAC;IAED,IAAI;QACH,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAClD,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE;YACjC,YAAY;YACZ,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;SACnB;QACD,OAAO,SAAS,CAAC;IAClB,CAAC;IAEO,MAAM,CAAC,OAAO,CAAC,CAAS;QAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;QACnC,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,GAAG;YACF,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC;YACtB,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAC/B,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB,QAAQ,CAAC,GAAG,CAAC,EAAE;QAChB,OAAO,MAAM,CAAC;IACf,CAAC;;AAGF,IAAW,SAIV;AAJD,WAAW,SAAS;IACnB,6CAAM,CAAA;IACN,mDAAS,CAAA;IACT,+CAAO,CAAA;AACR,CAAC,EAJU,SAAS,KAAT,SAAS,QAInB;AAED,MAAM,SAAS;IAUJ;IACA;IATV,MAAM,GAAG,IAAI,GAAG,EAA4C,CAAC;IAErD,YAAY,CAAkC;IAEtD,MAAM,CAAwB;IAC9B,QAAQ,CAA0B;IAElC,YACU,QAAgB,EAChB,IAA8C;QAEvD,gFAAgF;QAChF,gFAAgF;QAJvE,aAAQ,GAAR,QAAQ,CAAQ;QAChB,SAAI,GAAJ,IAAI,CAA0C;QAKvD,MAAM,UAAU,GAA4B,EAAE,CAAC;QAC/C,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE;YAClC,IAAI,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE;gBACnC,oBAAoB;gBACpB,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAExB;iBAAM,IAAI,EAAE,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE;gBAC5C,uBAAuB;gBACvB,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAExB;iBAAM,IAAI,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE;gBACpC,8BAA8B;gBAC9B,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAExB;iBAAM,IAAI,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE;gBACpC,8BAA8B;gBAC9B,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAExB;iBAAM,IAAI,EAAE,CAAC,wBAAwB,CAAC,MAAM,CAAC,EAAE;gBAC/C,iDAAiD;gBACjD,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,UAAU,EAAE;oBACtC,IAAI,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC;2BAChD,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC;2BAClD,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;2BAC/C,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EACnD;wBACD,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;qBACvB;iBACD;aACD;SACD;QACD,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE;YAChC,MAAM,KAAK,GAAG,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAC/C,IAAI,CAAC,KAAK,EAAE;gBACX,SAAS;aACT;YACD,MAAM,IAAI,GAAG,SAAS,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YAC7C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,IAAK,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;SAC/D;IACF,CAAC;IAEO,MAAM,CAAC,cAAc,CAAC,IAAyB;QACtD,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACf,OAAO,SAAS,CAAC;SACjB;QACD,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;QACtB,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC3B,IAAI,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,oBAAoB,EAAE;YACrD,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa,EAAE;gBACzD,+CAA+C;gBAC/C,OAAO;aACP;YACD,UAAU;YACV,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;SAC/C;QAED,OAAO,KAAK,CAAC;IACd,CAAC;IAEO,MAAM,CAAC,aAAa,CAAC,IAAa;QACzC,IAAI,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;YACpD,iCAAyB;SACzB;aAAM,IAAI,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;YAC7D,mCAA2B;SAC3B;aAAM;YACN,gCAAwB;SACxB;IACF,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,IAAe;QACnC,OAAO,IAAI,8BAAsB;eAC7B,IAAI,gCAAwB,CAC9B;IACH,CAAC;IAED,MAAM,CAAC,gCAAgC,CAAC,IAAe,EAAE,eAAoD;QAC5G,UAAU;QACV,iFAAiF;QACjF,iFAAiF;QACjF,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;YACvC,IAAI,IAAI,CAAC,IAAI,6BAAqB,EAAE;gBACnC,SAAS;aACT;YACD,IAAI,MAAM,GAA0B,IAAI,CAAC,MAAM,CAAC;YAChD,OAAO,MAAM,EAAE;gBACd,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,gCAAwB,EAAE;oBAC1D,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,6BAA6B,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,GAAG,CAAC,CAAC;oBAC1G,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,6BAA6B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBAClF,eAAe,CAAC,IAAI,IAAI,UAAU,MAAM,CAAC,QAAQ,IAAI,SAAS,CAAC,IAAI,GAAG,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC,CAAC;oBAEnH,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,IAAI,2BAAmB,CAAC;iBACjD;gBACD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;aACvB;SACD;IACF,CAAC;IAED,MAAM,CAAC,iBAAiB,CAAC,IAAe;QAEvC,IAAI,IAAI,CAAC,YAAY,EAAE;YACtB,eAAe;YACf,OAAO;SACP;QAED,wBAAwB;QACxB,IAAI,IAAI,CAAC,MAAM,EAAE;YAChB,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACzC;QAED,IAAI,CAAC,YAAY,GAAG,IAAI,GAAG,EAAE,CAAC;QAE9B,MAAM,SAAS,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE;YAEvC,gBAAgB;YAChB,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;gBAC5B,OAAO,IAAI,CAAC;aACZ;YAED,UAAU;YACV,IAAI,MAAM,GAA0B,IAAI,CAAC,MAAM,CAAC;YAChD,OAAO,MAAM,EAAE;gBACd,IAAI,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;oBAC9B,OAAO,IAAI,CAAC;iBACZ;gBACD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;aACvB;YAED,WAAW;YACX,IAAI,IAAI,CAAC,QAAQ,EAAE;gBAClB,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACjC,OAAO,KAAK,CAAC,MAAM,EAAE;oBACpB,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,EAAG,CAAC;oBAC1B,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;wBAC5B,OAAO,IAAI,CAAC;qBACZ;oBACD,IAAI,IAAI,CAAC,QAAQ,EAAE;wBAClB,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;qBAC7B;iBACD;aACD;YAED,OAAO,KAAK,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;YACvC,IAAI,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBACvC,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC;gBACnC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;aACvC;SACD;IACF,CAAC;IAED,kEAAkE;IAClE,kDAAkD;IAC1C,YAAY,CAAC,IAAY;QAChC,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,IAAI,CAAC,EAAE;YACnF,eAAe;YACf,OAAO,IAAI,CAAC;SACZ;QACD,IAAI,IAAI,CAAC,YAAY,EAAE;YACtB,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE;gBACnD,IAAI,SAAS,KAAK,IAAI,EAAE;oBACvB,6CAA6C;oBAC7C,OAAO,IAAI,CAAC;iBACZ;aACD;SACD;QACD,IAAU,IAAI,CAAC,IAAI,CAAC,aAAa,EAAG,CAAC,WAAW,YAAY,GAAG,EAAE;YAChE,2BAA2B;YAC3B,IAAU,IAAI,CAAC,IAAI,CAAC,aAAa,EAAG,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gBAC3D,OAAO,IAAI,CAAC;aACZ;SACD;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,eAAe,CAAC,IAAY;QAC3B,IAAI,KAAK,GAAG,IAAI,CAAC,YAAa,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC;QAC1C,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QACzB,OAAO,MAAM,EAAE;YACd,IAAI,MAAM,CAAC,YAAa,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,gCAAwB,EAAE;gBAC5F,KAAK,GAAG,MAAM,CAAC,YAAa,CAAC,GAAG,CAAC,IAAI,CAAE,IAAI,KAAK,CAAC;aACjD;YACD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;SACvB;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,sBAAsB;IAEtB,QAAQ,CAAC,KAAgB;QACxB,IAAI,CAAC,QAAQ,KAAK,EAAE,CAAC;QACrB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1B,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,CAAC;CACD;AAED,MAAM,yBAAyB;IAKT;IAHJ,QAAQ,CAAuB;IAC/B,gBAAgB,GAAoC,IAAI,GAAG,EAAE,CAAC;IAE/E,YAAqB,WAAmB;QAAnB,gBAAW,GAAX,WAAW,CAAQ;QACvC,MAAM,eAAe,GAAgC,EAAE,CAAC;QACxD,MAAM,MAAM,GAAG,EAAE,CAAC,cAAc,CAAC,WAAW,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC/D,IAAI,MAAM,CAAC,KAAK,EAAE;YACjB,MAAM,MAAM,CAAC,KAAK,CAAC;SACnB;QACD,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC,0BAA0B,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,eAAe,CAAC,CAAC;QACjH,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YACpC,MAAM,MAAM,CAAC,KAAK,CAAC;SACnB;IACF,CAAC;IACD,sBAAsB;QACrB,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;IAC9B,CAAC;IACD,kBAAkB;QACjB,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;IAChC,CAAC;IACD,gBAAgB,CAAC,SAAiB;QACjC,OAAO,GAAG,CAAC;IACZ,CAAC;IACD,iBAAiB;QAChB,OAAO,GAAG,CAAC;IACZ,CAAC;IACD,iBAAiB,CAAC,QAAgB;QACjC,IAAI,MAAM,GAAmC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACjF,IAAI,MAAM,KAAK,SAAS,EAAE;YACzB,MAAM,OAAO,GAAG,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAC1C,IAAI,OAAO,KAAK,SAAS,EAAE;gBAC1B,OAAO,SAAS,CAAC;aACjB;YACD,MAAM,GAAG,EAAE,CAAC,cAAc,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC/C,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;SAC5C;QACD,OAAO,MAAM,CAAC;IACf,CAAC;IACD,mBAAmB;QAClB,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACvC,CAAC;IACD,qBAAqB,CAAC,OAA2B;QAChD,OAAO,EAAE,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IACD,eAAe,GAAG,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC;IACzC,cAAc,GAAG,EAAE,CAAC,GAAG,CAAC,cAAc,CAAC;IACvC,UAAU,GAAG,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC;IAC/B,QAAQ,GAAG,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC;IAC3B,aAAa,GAAG,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC;IACrC,oDAAoD;IACpD,QAAQ,GAAG,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC;CAC3B;AAOD;;;;;;;;GAQG;AACH,MAAa,OAAO;IAME;IAA8B;IAJlC,iBAAiB,GAAG,IAAI,GAAG,EAAqB,CAAC;IAEjD,OAAO,CAAqB;IAE7C,YAAqB,WAAmB,EAAW,MAA0B,GAAG,EAAE,GAAG,CAAC;QAAjE,gBAAW,GAAX,WAAW,CAAQ;QAAW,QAAG,GAAH,GAAG,CAAgC;QACrF,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,qBAAqB,CAAC,IAAI,yBAAyB,CAAC,WAAW,CAAC,CAAC,CAAC;IACrF,CAAC;IAED,sBAAsB;QAErB,8CAA8C;QAE9C,MAAM,KAAK,GAAG,CAAC,IAAa,EAAQ,EAAE;YACrC,IAAI,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE;gBAC9D,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC;gBACjC,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;gBACpE,IAAI,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;oBACpC,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;iBACzB;gBACD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;aACpF;YACD,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC9B,CAAC,CAAC;QAEF,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAG,CAAC,cAAc,EAAE,EAAE;YAC/D,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;gBAC5B,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;aAC7B;SACD;QACD,IAAI,CAAC,GAAG,CAAC,4BAA4B,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC;QAGpE,qCAAqC;QAErC,MAAM,YAAY,GAAG,CAAC,IAAe,EAAE,EAAE;YACxC,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;YACrG,IAAI,CAAC,aAAa,EAAE;gBACnB,oBAAoB;gBACpB,OAAO;aACP;YAED,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;YAC7G,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC/B,2CAA2C;gBAC3C,OAAO;aACP;YAED,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;gBACtB,sCAAsC;gBACtC,OAAO;aACP;YAED,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;YAC1B,MAAM,GAAG,GAAG,GAAG,UAAU,CAAC,QAAQ,IAAI,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YAClE,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC/C,IAAI,CAAC,MAAM,EAAE;gBACZ,mDAAmD;gBACnD,OAAO;aACP;YACD,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC,CAAC;QACF,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE;YACnD,YAAY,CAAC,IAAI,CAAC,CAAC;SACnB;QAED,uEAAuE;QACvE,MAAM,UAAU,GAAG,IAAI,GAAG,EAAoB,CAAC;QAC/C,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE;YACnD,SAAS,CAAC,gCAAgC,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;gBAC9D,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACjC,IAAI,GAAG,EAAE;oBACR,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;iBACd;qBAAM;oBACN,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;iBAC5B;YACF,CAAC,CAAC,CAAC;SACH;QACD,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,UAAU,EAAE;YACrC,IAAI,CAAC,GAAG,CAAC,SAAS,GAAG,8BAA8B,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;SACvE;QAED,iDAAiD;QACjD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE;YACnD,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;SAClC;QACD,IAAI,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;QAIvC,MAAM,WAAW,GAAG,IAAI,GAAG,EAAkB,CAAC;QAE9C,MAAM,UAAU,GAAG,CAAC,QAAgB,EAAE,IAAU,EAAE,EAAE;YACnD,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACxC,IAAI,CAAC,KAAK,EAAE;gBACX,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;aAClC;iBAAM;gBACN,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACjB;QACF,CAAC,CAAC;QAEF,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE;YAEnD,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;gBACzD,SAAS;aACT;YAED,MAAM,EAAE,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;gBAC/C,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;oBACxC,SAAS,MAAM,CAAC;iBAChB;gBAED,oDAAoD;gBACpD,uDAAuD;gBACvD,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;gBACzB,OAAO,MAAM,EAAE;oBACd,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,6BAAqB,EAAE;wBACvD,SAAS,MAAM,CAAC;qBAChB;oBACD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;iBACvB;gBAED,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;gBAC3C,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;gBACtG,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE;oBAC5B,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE;wBACxB,OAAO,EAAE,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC,GAAG,OAAO,GAAG,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC;wBAClE,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK;wBAC1B,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,MAAM;qBAC3B,CAAC,CAAC;iBACH;aACD;SACD;QAED,IAAI,CAAC,GAAG,CAAC,yBAAyB,WAAW,CAAC,IAAI,QAAQ,CAAC,CAAC;QAE5D,0CAA0C;QAC1C,MAAM,MAAM,GAAG,IAAI,GAAG,EAAwB,CAAC;QAC/C,IAAI,UAAU,GAAG,CAAC,CAAC;QAEnB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAG,CAAC,cAAc,EAAE,EAAE;YAE/D,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,EAAG,CAAC,kBAAkB,EAAE,CAAC;YAChF,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAClD,MAAM,aAAa,GAAG,OAAO,IAAI,IAAA,mBAAa,EAAC,UAAU,IAAI,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC;YAEpF,cAAc;YACd,IAAI,SAAyC,CAAC;YAE9C,IAAI,WAAmB,CAAC;YACxB,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC7C,IAAI,CAAC,KAAK,EAAE;gBACX,YAAY;gBACZ,WAAW,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;aAEjC;iBAAM;gBACN,uBAAuB;gBACvB,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAClE,MAAM,cAAc,GAAG,IAAI,GAAG,EAAqB,CAAC;gBAEpD,gBAAgB;gBAChB,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC;gBAC1C,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAEhD,IAAI,QAA0B,CAAC;gBAE/B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;oBACzB,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,EAAE;wBAChD,EAAE;wBACF,IAAI,QAAQ,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,IAAI,QAAQ,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,EAAE;4BACzE,IAAI,CAAC,GAAG,CAAC,yBAAyB,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;4BACvE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;yBACpC;6BAAM;4BACN,SAAS;yBACT;qBACD;oBACD,QAAQ,GAAG,IAAI,CAAC;oBAChB,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBACvF,UAAU,IAAI,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;oBAEvD,cAAc;oBACd,MAAM,GAAG,GAAG,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBAG5D,IAAI,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBAC5C,IAAI,CAAC,QAAQ,EAAE;wBACd,QAAQ,GAAG,EAAE,CAAC;wBACd,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;qBACvC;oBACD,QAAQ,CAAC,OAAO,CAAC;wBAChB,MAAM,EAAE,gBAAgB;wBACxB,QAAQ,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,SAAS,EAAE;wBACvD,SAAS,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,SAAS,EAAE;wBACxD,IAAI,EAAE,WAAW;qBACjB,EAAE;wBACF,MAAM,EAAE,gBAAgB;wBACxB,QAAQ,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,EAAE;wBACrE,SAAS,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;qBAC9E,CAAC,CAAC;iBACH;gBAED,oEAAoE;gBACpE,SAAS,GAAG,IAAI,+BAAkB,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC,CAAC;gBACtG,SAAS,CAAC,gBAAgB,CAAC,gBAAgB,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;gBACjE,KAAK,MAAM,CAAC,EAAE,QAAQ,CAAC,IAAI,cAAc,EAAE;oBAC1C,IAAI,SAAS,GAAG,CAAC,CAAC;oBAClB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;wBAC/B,SAAS,CAAC,UAAU,CAAC;4BACpB,GAAG,OAAO;4BACV,SAAS,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,MAAM,GAAG,SAAS,EAAE;yBACzF,CAAC,CAAC;wBACH,SAAS,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC;qBAChE;iBACD;gBAED,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aAClC;YACD,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;SAClF;QAED,IAAI,CAAC,GAAG,CAAC,SAAS,UAAU,GAAG,IAAI,UAAU,CAAC,CAAC;QAC/C,OAAO,MAAM,CAAC;IACf,CAAC;CACD;AAhOD,0BAgOC;AAED,gBAAgB;AAEhB,SAAS,WAAW,CAAC,IAAa,EAAE,IAAmB;IACtD,MAAM,SAAS,GAAG,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAChF,OAAO,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC;AAC7D,CAAC;AAGD,KAAK,UAAU,IAAI;IAElB,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,yBAAyB,CAAC,CAAC;IACpE,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC9C,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,GAAG,CAAC,CAAC;IAE9F,IAAI,KAAK,EAAE,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,sBAAsB,EAAE,EAAE;QACxG,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;QACpF,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACxE,MAAM,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;QACvD,IAAI,QAAQ,CAAC,SAAS,EAAE;YACvB,MAAM,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,WAAW,GAAG,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;SACtE;KACD;AACF,CAAC;AAED,IAAI,UAAU,KAAK,cAAI,CAAC,CAAC,CAAC,EAAE;IAC3B,IAAI,EAAE,CAAC;CACP"}
\ No newline at end of file
diff --git a/build/lib/mangleTypeScript.ts b/build/lib/mangleTypeScript.ts
index 214deec0aeff99..626f45be1ec1c8 100644
--- a/build/lib/mangleTypeScript.ts
+++ b/build/lib/mangleTypeScript.ts
@@ -7,6 +7,8 @@ import * as ts from 'typescript';
 import * as path from 'path';
 import * as fs from 'fs';
 import { argv } from 'process';
+import { Mapping, SourceMapGenerator } from 'source-map';
+import { pathToFileURL } from 'url';
 
 class ShortIdent {
 
@@ -320,6 +322,11 @@ class StaticLanguageServiceHost implements ts.LanguageServiceHost {
 	realpath = ts.sys.realpath;
 }
 
+export interface MangleOutput {
+	out: string;
+	sourceMap?: string;
+}
+
 /**
  * TypeScript2TypeScript transformer that mangles all private and protected fields
  *
@@ -339,7 +346,7 @@ export class Mangler {
 		this.service = ts.createLanguageService(new StaticLanguageServiceHost(projectPath));
 	}
 
-	computeNewFileContents(): Map<string, string> {
+	computeNewFileContents(): Map<string, MangleOutput> {
 
 		// STEP: find all classes and their field info
 
@@ -360,7 +367,7 @@ export class Mangler {
 				ts.forEachChild(file, visit);
 			}
 		}
-		this.log(`done COLLECTING ${this.allClassDataByKey.size} classes`);
+		this.log(`Done collecting classes: ${this.allClassDataByKey.size}`);
 
 
 		//  STEP: connect sub and super-types
@@ -416,7 +423,7 @@ export class Mangler {
 		for (const data of this.allClassDataByKey.values()) {
 			ClassData.fillInReplacement(data);
 		}
-		this.log(`done creating REPLACEMENTS`);
+		this.log(`Done creating replacements`);
 
 		// STEP: prepare rename edits
 		type Edit = { newText: string; offset: number; length: number };
@@ -464,14 +471,21 @@ export class Mangler {
 			}
 		}
 
-		this.log(`done preparing EDITS for ${editsByFile.size} files`);
+		this.log(`Done preparing edits: ${editsByFile.size} files`);
 
 		// STEP: apply all rename edits (per file)
-		const result = new Map<string, string>();
+		const result = new Map<string, MangleOutput>();
 		let savedBytes = 0;
 
 		for (const item of this.service.getProgram()!.getSourceFiles()) {
 
+			const { mapRoot, sourceRoot } = this.service.getProgram()!.getCompilerOptions();
+			const projectDir = path.dirname(this.projectPath);
+			const sourceMapRoot = mapRoot ?? pathToFileURL(sourceRoot ?? projectDir).toString();
+
+			// source maps
+			let generator: SourceMapGenerator | undefined;
+
 			let newFullText: string;
 			const edits = editsByFile.get(item.fileName);
 			if (!edits) {
@@ -479,6 +493,10 @@ export class Mangler {
 				newFullText = item.getFullText();
 
 			} else {
+				// source map generator
+				const relativeFileName = path.relative(projectDir, item.fileName);
+				const mappingsByLine = new Map<number, Mapping[]>();
+
 				// apply renames
 				edits.sort((a, b) => b.offset - a.offset);
 				const characters = item.getFullText().split('');
@@ -486,27 +504,60 @@ export class Mangler {
 				let lastEdit: Edit | undefined;
 
 				for (const edit of edits) {
-					if (lastEdit) {
-						if (lastEdit.offset === edit.offset) {
-							//
-							if (lastEdit.length !== edit.length || lastEdit.newText !== edit.newText) {
-								this.log('OVERLAPPING edit', item.fileName, edit.offset, edits);
-								throw new Error('OVERLAPPING edit');
-							} else {
-								continue;
-							}
+					if (lastEdit && lastEdit.offset === edit.offset) {
+						//
+						if (lastEdit.length !== edit.length || lastEdit.newText !== edit.newText) {
+							this.log('ERROR: Overlapping edit', item.fileName, edit.offset, edits);
+							throw new Error('OVERLAPPING edit');
+						} else {
+							continue;
 						}
 					}
 					lastEdit = edit;
-					const removed = characters.splice(edit.offset, edit.length, edit.newText);
-					savedBytes += removed.length - edit.newText.length;
+					const mangledName = characters.splice(edit.offset, edit.length, edit.newText).join('');
+					savedBytes += mangledName.length - edit.newText.length;
+
+					// source maps
+					const pos = item.getLineAndCharacterOfPosition(edit.offset);
+
+
+					let mappings = mappingsByLine.get(pos.line);
+					if (!mappings) {
+						mappings = [];
+						mappingsByLine.set(pos.line, mappings);
+					}
+					mappings.unshift({
+						source: relativeFileName,
+						original: { line: pos.line + 1, column: pos.character },
+						generated: { line: pos.line + 1, column: pos.character },
+						name: mangledName
+					}, {
+						source: relativeFileName,
+						original: { line: pos.line + 1, column: pos.character + edit.length },
+						generated: { line: pos.line + 1, column: pos.character + edit.newText.length },
+					});
 				}
+
+				// source map generation, make sure to get mappings per line correct
+				generator = new SourceMapGenerator({ file: path.basename(item.fileName), sourceRoot: sourceMapRoot });
+				generator.setSourceContent(relativeFileName, item.getFullText());
+				for (const [, mappings] of mappingsByLine) {
+					let lineDelta = 0;
+					for (const mapping of mappings) {
+						generator.addMapping({
+							...mapping,
+							generated: { line: mapping.generated.line, column: mapping.generated.column - lineDelta }
+						});
+						lineDelta += mapping.original.column - mapping.generated.column;
+					}
+				}
+
 				newFullText = characters.join('');
 			}
-			result.set(item.fileName, newFullText);
+			result.set(item.fileName, { out: newFullText, sourceMap: generator?.toString() });
 		}
 
-		this.log(`DONE saved ${savedBytes / 1000}kb`);
+		this.log(`Done: ${savedBytes / 1000}kb saved`);
 		return result;
 	}
 }
@@ -523,12 +574,15 @@ async function _run() {
 
 	const projectPath = path.join(__dirname, '../../src/tsconfig.json');
 	const projectBase = path.dirname(projectPath);
-	const newProjectBase = path.join(path.dirname(projectBase), path.basename(projectBase) + '-mangle');
+	const newProjectBase = path.join(path.dirname(projectBase), path.basename(projectBase) + '2');
 
 	for await (const [fileName, contents] of new Mangler(projectPath, console.log).computeNewFileContents()) {
 		const newFilePath = path.join(newProjectBase, path.relative(projectBase, fileName));
 		await fs.promises.mkdir(path.dirname(newFilePath), { recursive: true });
-		await fs.promises.writeFile(newFilePath, contents);
+		await fs.promises.writeFile(newFilePath, contents.out);
+		if (contents.sourceMap) {
+			await fs.promises.writeFile(newFilePath + '.map', contents.sourceMap);
+		}
 	}
 }
 
diff --git a/build/lib/tsb/builder.js b/build/lib/tsb/builder.js
index b9722eac102529..e785ed24ec9861 100644
--- a/build/lib/tsb/builder.js
+++ b/build/lib/tsb/builder.js
@@ -5,13 +5,14 @@
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTypeScriptBuilder = exports.CancellationToken = void 0;
-const fs_1 = require("fs");
+const fs = require("fs");
 const path = require("path");
 const crypto = require("crypto");
 const utils = require("./utils");
 const colors = require("ansi-colors");
 const ts = require("typescript");
 const Vinyl = require("vinyl");
+const source_map_1 = require("source-map");
 var CancellationToken;
 (function (CancellationToken) {
     CancellationToken.None = {
@@ -125,8 +126,74 @@ function createTypeScriptBuilder(config, projectFile, cmd) {
                                 const basename = path.basename(vinyl.relative, extname);
                                 const dirname = path.dirname(vinyl.relative);
                                 const tsname = (dirname === '.' ? '' : dirname + '/') + basename + '.ts';
-                                const sourceMap = JSON.parse(sourcemapFile.text);
+                                let sourceMap = JSON.parse(sourcemapFile.text);
                                 sourceMap.sources[0] = tsname.replace(/\\/g, '/');
+                                // check for an "input source" map and combine them
+                                // in step 1 we extract all line edit from the input source map, and
+                                // in step 2 we apply the line edits to the typescript source map
+                                const snapshot = host.getScriptSnapshot(fileName);
+                                if (snapshot instanceof VinylScriptSnapshot && snapshot.sourceMap) {
+                                    const inputSMC = new source_map_1.SourceMapConsumer(snapshot.sourceMap);
+                                    const tsSMC = new source_map_1.SourceMapConsumer(sourceMap);
+                                    let didChange = false;
+                                    const smg = new source_map_1.SourceMapGenerator({
+                                        file: sourceMap.file,
+                                        sourceRoot: sourceMap.sourceRoot
+                                    });
+                                    // step 1
+                                    const lineEdits = new Map();
+                                    inputSMC.eachMapping(m => {
+                                        if (m.originalLine === m.generatedLine) {
+                                            // same line mapping
+                                            let array = lineEdits.get(m.originalLine);
+                                            if (!array) {
+                                                array = [];
+                                                lineEdits.set(m.originalLine, array);
+                                            }
+                                            array.push([m.originalColumn, m.generatedColumn]);
+                                        }
+                                        else {
+                                            // NOT SUPPORTED
+                                        }
+                                    });
+                                    // step 2
+                                    tsSMC.eachMapping(m => {
+                                        didChange = true;
+                                        const edits = lineEdits.get(m.originalLine);
+                                        let originalColumnDelta = 0;
+                                        if (edits) {
+                                            for (const [from, to] of edits) {
+                                                if (to >= m.originalColumn) {
+                                                    break;
+                                                }
+                                                originalColumnDelta = from - to;
+                                            }
+                                        }
+                                        smg.addMapping({
+                                            source: m.source,
+                                            name: m.name,
+                                            generated: { line: m.generatedLine, column: m.generatedColumn },
+                                            original: { line: m.originalLine, column: m.originalColumn + originalColumnDelta }
+                                        });
+                                    });
+                                    if (didChange) {
+                                        [tsSMC, inputSMC].forEach((consumer) => {
+                                            consumer.sources.forEach((sourceFile) => {
+                                                smg._sources.add(sourceFile);
+                                                const sourceContent = consumer.sourceContentFor(sourceFile);
+                                                if (sourceContent !== null) {
+                                                    smg.setSourceContent(sourceFile, sourceContent);
+                                                }
+                                            });
+                                        });
+                                        sourceMap = JSON.parse(smg.toString());
+                                        // const filename = '/Users/jrieken/Code/vscode/src2/' + vinyl.relative + '.map';
+                                        // fs.promises.mkdir(path.dirname(filename), { recursive: true }).then(async () => {
+                                        // 	await fs.promises.writeFile(filename, smg.toString());
+                                        // 	await fs.promises.writeFile('/Users/jrieken/Code/vscode/src2/' + vinyl.relative, vinyl.contents);
+                                        // });
+                                    }
+                                }
                                 vinyl.sourceMap = sourceMap;
                             }
                         }
@@ -320,9 +387,11 @@ class ScriptSnapshot {
 }
 class VinylScriptSnapshot extends ScriptSnapshot {
     _base;
+    sourceMap;
     constructor(file) {
         super(file.contents.toString(), file.stat.mtime);
         this._base = file.base;
+        this.sourceMap = file.sourceMap;
     }
     getBase() {
         return this._base;
@@ -385,9 +454,9 @@ class LanguageServiceHost {
             try {
                 result = new VinylScriptSnapshot(new Vinyl({
                     path: filename,
-                    contents: (0, fs_1.readFileSync)(filename),
+                    contents: fs.readFileSync(filename),
                     base: this.getCompilationSettings().outDir,
-                    stat: (0, fs_1.statSync)(filename)
+                    stat: fs.statSync(filename)
                 }));
                 this.addScriptSnapshot(filename, result);
             }
@@ -502,4 +571,4 @@ class LanguageServiceHost {
         });
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"builder.js","sourceRoot":"","sources":["builder.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,2BAA4C;AAC5C,6BAA6B;AAC7B,iCAAiC;AACjC,iCAAiC;AACjC,sCAAsC;AACtC,iCAAiC;AACjC,+BAA+B;AAW/B,IAAiB,iBAAiB,CAIjC;AAJD,WAAiB,iBAAiB;IACpB,sBAAI,GAAsB;QACtC,uBAAuB,KAAK,OAAO,KAAK,CAAC,CAAC,CAAC;KAC3C,CAAC;AACH,CAAC,EAJgB,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAIjC;AAQD,SAAS,SAAS,CAAC,IAAY;IAC9B,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AACjC,CAAC;AAED,SAAgB,uBAAuB,CAAC,MAAsB,EAAE,WAAmB,EAAE,GAAyB;IAE7G,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC;IAE1B,MAAM,IAAI,GAAG,IAAI,mBAAmB,CAAC,GAAG,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;IAC7D,MAAM,OAAO,GAAG,EAAE,CAAC,qBAAqB,CAAC,IAAI,EAAE,EAAE,CAAC,sBAAsB,EAAE,CAAC,CAAC;IAC5E,MAAM,gBAAgB,GAA+B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACzE,MAAM,WAAW,GAA+B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACpE,MAAM,qBAAqB,GAAG,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC;IACtD,IAAI,SAAS,GAAwC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACzE,IAAI,QAAQ,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;IAC9C,IAAI,sBAAsB,GAAG,IAAI,CAAC;IAElC,iCAAiC;IACjC,IAAI,CAAC,sBAAsB,EAAE,CAAC,WAAW,GAAG,IAAI,CAAC;IAEjD,SAAS,IAAI,CAAC,IAAW;QACxB,0BAA0B;QAC1B,IAAU,IAAK,CAAC,SAAS,EAAE;YAC1B,sBAAsB,GAAG,KAAK,CAAC;SAC/B;QAED,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YACnB,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACrC;aAAM;YACN,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC;SACjE;IACF,CAAC;IAED,SAAS,OAAO,CAAC,QAAwB;QACxC,IAAI,QAAQ,YAAY,mBAAmB,EAAE;YAC5C,OAAO,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;SAChD;aAAM;YACN,OAAO,EAAE,CAAC;SACV;IACF,CAAC;IAED,SAAS,gBAAgB,CAAC,UAAyB;QAClD,OAAa,UAAW,CAAC,uBAAuB;eAC5C,gCAAgC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC;IACjE,CAAC;IAED,SAAS,KAAK,CAAC,GAA0B,EAAE,OAA2B,EAAE,KAAK,GAAG,iBAAiB,CAAC,IAAI;QAErG,SAAS,eAAe,CAAC,QAAgB;YACxC,OAAO,IAAI,OAAO,CAAkB,OAAO,CAAC,EAAE;gBAC7C,OAAO,CAAC,QAAQ,CAAC;oBAChB,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE;wBAC7C,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,yBAAyB;qBACtC;yBAAM;wBACN,OAAO,CAAC,OAAO,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC,CAAC;qBACnD;gBACF,CAAC,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;QACJ,CAAC;QAED,SAAS,kBAAkB,CAAC,QAAgB;YAC3C,OAAO,IAAI,OAAO,CAAkB,OAAO,CAAC,EAAE;gBAC7C,OAAO,CAAC,QAAQ,CAAC;oBAChB,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE;wBAC7C,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,yBAAyB;qBACtC;yBAAM;wBACN,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,CAAC;qBAClD;gBACF,CAAC,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;QACJ,CAAC;QAED,SAAS,QAAQ,CAAC,QAAgB;YAEjC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;gBAC5B,OAAO,CAAC,QAAQ,CAAC;oBAEhB,IAAI,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;wBAC9B,qDAAqD;wBACrD,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;wBAClD,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC;6BACxC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC;6BACjD,MAAM,CAAC,QAAQ,CAAC,CAAC;wBAEnB,OAAO,OAAO,CAAC;4BACd,QAAQ;4BACR,SAAS;4BACT,KAAK,EAAE,EAAE;yBACT,CAAC,CAAC;qBACH;oBAED,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;oBAC/C,MAAM,KAAK,GAAY,EAAE,CAAC;oBAC1B,IAAI,SAA6B,CAAC;oBAElC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,WAAW,EAAE;wBACtC,IAAI,CAAC,sBAAsB,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;4BAC5D,SAAS;yBACT;wBAED,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;4BAC/B,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC;iCAClC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;iCACjB,MAAM,CAAC,QAAQ,CAAC,CAAC;4BAEnB,IAAI,CAAC,qBAAqB,EAAE;gCAC3B,kDAAkD;gCAClD,SAAS;6BACT;yBACD;wBAED,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC;4BACvB,IAAI,EAAE,IAAI,CAAC,IAAI;4BACf,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;4BAChC,IAAI,EAAE,CAAC,MAAM,CAAC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,IAAI,SAAS;yBAC5F,CAAC,CAAC;wBAEH,IAAI,CAAC,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;4BACvD,MAAM,aAAa,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;4BAEnF,IAAI,aAAa,EAAE;gCAClB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gCAC7C,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;gCACxD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gCAC7C,MAAM,MAAM,GAAG,CAAC,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,GAAG,CAAC,GAAG,QAAQ,GAAG,KAAK,CAAC;gCAEzE,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;gCACjD,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;gCAC5C,KAAM,CAAC,SAAS,GAAG,SAAS,CAAC;6BACnC;yBACD;wBAED,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;qBAClB;oBAED,OAAO,CAAC;wBACP,QAAQ;wBACR,SAAS;wBACT,KAAK;qBACL,CAAC,CAAC;gBACJ,CAAC,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;QACJ,CAAC;QAED,MAAM,SAAS,GAAwC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3E,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEtB,MAAM,WAAW,GAAa,EAAE,CAAC;QACjC,MAAM,wBAAwB,GAAa,EAAE,CAAC;QAC9C,MAAM,uBAAuB,GAAa,EAAE,CAAC;QAC7C,MAAM,yBAAyB,GAAa,EAAE,CAAC;QAC/C,MAAM,cAAc,GAAa,EAAE,CAAC;QACpC,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAkB,CAAC;QAEtD,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,kBAAkB,EAAE,EAAE;YACjD,IAAI,gBAAgB,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE;gBAEnE,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC3B,wBAAwB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACxC,uBAAuB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aACvC;SACD;QAED,OAAO,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE;YAElC,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAkB,CAAC;YACpD,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAU,CAAC;YAE9C,SAAS,UAAU;gBAElB,IAAI,OAAiC,CAAC;gBACtC,wBAAwB;gBAExB,+BAA+B;gBAC/B,IAAI,KAAK,CAAC,uBAAuB,EAAE,EAAE;oBACpC,IAAI,CAAC,UAAU,EAAE,oCAAoC,CAAC,CAAC;oBACvD,mBAAmB,CAAC,KAAK,EAAE,CAAC;oBAC5B,OAAO,EAAE,CAAC;oBACV,OAAO;iBACP;gBAED,kBAAkB;qBACb,IAAI,WAAW,CAAC,MAAM,EAAE;oBAC5B,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAG,CAAC;oBACpC,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;wBAEzC,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,EAAE;4BAC/B,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;4BAC/B,GAAG,CAAC,IAAI,CAAC,CAAC;yBACV;wBAED,+BAA+B;wBAC/B,mBAAmB,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC;wBAEnE,wBAAwB;wBACxB,IAAI,KAAK,CAAC,SAAS,IAAI,WAAW,CAAC,QAAQ,CAAC,KAAK,KAAK,CAAC,SAAS,EAAE;4BACjE,WAAW,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC;4BACxC,yBAAyB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;yBACzC;oBACF,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;wBACZ,6CAA6C;wBAC7C,IAAI,CAAC,KAAK,CAAC,kBAAkB,QAAQ,EAAE,CAAC,CAAC;wBACzC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBACf,CAAC,CAAC,CAAC;iBACH;gBAED,qBAAqB;qBAChB,IAAI,wBAAwB,CAAC,MAAM,EAAE;oBACzC,MAAM,QAAQ,GAAG,wBAAwB,CAAC,GAAG,EAAG,CAAC;oBACjD,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;oBACjC,OAAO,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;wBACtD,OAAO,SAAS,CAAC,QAAQ,CAAC,CAAC;wBAC3B,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;4BAC3B,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;4BACrC,SAAS,CAAC,QAAQ,CAAC,GAAG,WAAW,CAAC;4BAElC,8CAA8C;4BAC9C,wBAAwB,CAAC,MAAM,GAAG,CAAC,CAAC;4BACpC,uBAAuB,CAAC,MAAM,GAAG,CAAC,CAAC;4BACnC,yBAAyB,CAAC,MAAM,GAAG,CAAC,CAAC;yBACrC;oBACF,CAAC,CAAC,CAAC;iBACH;gBAED,wBAAwB;qBACnB,IAAI,uBAAuB,CAAC,MAAM,EAAE;oBAExC,IAAI,QAAQ,GAAG,uBAAuB,CAAC,GAAG,EAAE,CAAC;oBAC7C,OAAO,QAAQ,IAAI,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;wBACnD,QAAQ,GAAG,uBAAuB,CAAC,GAAG,EAAG,CAAC;qBAC1C;oBAED,IAAI,QAAQ,EAAE;wBACb,IAAI,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;wBACpC,OAAO,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;4BACzD,OAAO,SAAS,CAAC,QAAS,CAAC,CAAC;4BAC5B,iBAAiB,CAAC,GAAG,CAAC,QAAS,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;4BACrD,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;gCAC3B,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;gCACrC,SAAS,CAAC,QAAS,CAAC,GAAG,WAAW,CAAC;6BACnC;wBACF,CAAC,CAAC,CAAC;qBACH;iBACD;gBAED,yBAAyB;qBACpB,IAAI,yBAAyB,CAAC,MAAM,EAAE;oBAC1C,OAAO,yBAAyB,CAAC,MAAM,EAAE;wBACxC,MAAM,QAAQ,GAAG,yBAAyB,CAAC,GAAG,EAAG,CAAC;wBAElD,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,UAAU,EAAG,CAAC,aAAa,CAAC,QAAQ,CAAE,CAAC,EAAE;4BACtE,IAAI,CAAC,oBAAoB,EAAE,QAAQ,GAAG,4FAA4F,CAAC,CAAC;4BACpI,uBAAuB,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;4BAC3D,yBAAyB,CAAC,MAAM,GAAG,CAAC,CAAC;4BACrC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC;4BAC1B,MAAM;yBACN;wBAED,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;qBACjD;iBACD;gBAED,yBAAyB;qBACpB,IAAI,cAAc,CAAC,MAAM,EAAE;oBAC/B,IAAI,QAAQ,GAAG,cAAc,CAAC,GAAG,EAAE,CAAC;oBACpC,OAAO,QAAQ,IAAI,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;wBACrD,QAAQ,GAAG,cAAc,CAAC,GAAG,EAAE,CAAC;qBAChC;oBACD,IAAI,QAAQ,EAAE;wBACb,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;wBAClC,MAAM,KAAK,GAAG,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;wBAC9C,IAAI,KAAK,KAAK,CAAC,EAAE;4BAChB,4DAA4D;4BAC5D,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;yBAEjD;6BAAM,IAAI,OAAO,KAAK,KAAK,WAAW,EAAE;4BACxC,4CAA4C;4BAC5C,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;4BAC9B,uBAAuB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;yBACvC;qBACD;iBACD;gBAED,cAAc;qBACT;oBACJ,OAAO,EAAE,CAAC;oBACV,OAAO;iBACP;gBAED,IAAI,CAAC,OAAO,EAAE;oBACb,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;iBAC5B;gBAED,OAAO,CAAC,IAAI,CAAC;oBACZ,mBAAmB;oBACnB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;gBAC9B,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;oBACd,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACpB,CAAC,CAAC,CAAC;YACJ,CAAC;YAED,UAAU,EAAE,CAAC;QAEd,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YACZ,wDAAwD;YACxD,mBAAmB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;gBAC1C,gBAAgB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YAC/B,CAAC,CAAC,CAAC;YAEH,iCAAiC;YACjC,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE;gBAC5C,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC3C,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC;YACpC,CAAC,CAAC,CAAC;YACH,SAAS,GAAG,SAAS,CAAC;YAEtB,cAAc;YACd,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;YAC/C,MAAM,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC;YACvB,IAAI,CACH,OAAO,EACP,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,cAAc,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAC/K,CAAC;YACF,QAAQ,GAAG,OAAO,CAAC;QACpB,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,OAAO;QACN,IAAI;QACJ,KAAK;QACL,eAAe,EAAE,OAAO;KACxB,CAAC;AACH,CAAC;AAxUD,0DAwUC;AAED,MAAM,cAAc;IAEF,KAAK,CAAS;IACd,MAAM,CAAO;IAE9B,YAAY,IAAY,EAAE,KAAW;QACpC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,UAAU;QACT,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;IAClC,CAAC;IAED,OAAO,CAAC,KAAa,EAAE,GAAW;QACjC,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACzC,CAAC;IAED,SAAS;QACR,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;IAC1B,CAAC;IAED,cAAc,CAAC,YAAgC;QAC9C,OAAO,SAAS,CAAC;IAClB,CAAC;CACD;AAED,MAAM,mBAAoB,SAAQ,cAAc;IAE9B,KAAK,CAAS;IAE/B,YAAY,IAAW;QACtB,KAAK,CAAC,IAAI,CAAC,QAAS,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,IAAK,CAAC,KAAK,CAAC,CAAC;QACnD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC;IACxB,CAAC;IAED,OAAO;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACnB,CAAC;CACD;AAED,MAAM,mBAAmB;IAYN;IACA;IACA;IAZD,UAAU,CAAqC;IAC/C,eAAe,CAAc;IAC7B,WAAW,CAAc;IACzB,aAAa,CAA4B;IACzC,0BAA0B,CAAW;IACrC,yBAAyB,CAA+B;IAEjE,eAAe,CAAS;IAEhC,YACkB,QAA8B,EAC9B,YAAoB,EACpB,IAA8C;QAF9C,aAAQ,GAAR,QAAQ,CAAsB;QAC9B,iBAAY,GAAZ,YAAY,CAAQ;QACpB,SAAI,GAAJ,IAAI,CAA0C;QAE/D,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,CAAC,eAAe,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACnD,IAAI,CAAC,WAAW,GAAG,IAAI,GAAG,EAAE,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,KAAK,CAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3D,IAAI,CAAC,0BAA0B,GAAG,EAAE,CAAC;QACrC,IAAI,CAAC,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAErD,IAAI,CAAC,eAAe,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED,GAAG,CAAC,EAAU;QACb,kBAAkB;IACnB,CAAC;IAED,KAAK,CAAC,EAAU;QACf,kBAAkB;IACnB,CAAC;IAED,KAAK,CAAC,CAAS;QACd,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,sBAAsB;QACrB,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;IAC9B,CAAC;IAED,iBAAiB;QAChB,OAAO,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACrC,CAAC;IAED,kBAAkB;QACjB,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QACtH,OAAO,GAAG,CAAC;IACZ,CAAC;IAED,gBAAgB,CAAC,QAAgB;QAChC,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACzC,IAAI,MAAM,EAAE;YACX,OAAO,MAAM,CAAC,UAAU,EAAE,CAAC;SAC3B;QACD,OAAO,eAAe,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,iBAAiB,CAAC,QAAgB,EAAE,UAAmB,IAAI;QAC1D,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC/B,IAAI,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACvC,IAAI,CAAC,MAAM,IAAI,OAAO,EAAE;YACvB,IAAI;gBACH,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,KAAK,CAAM;oBAC/C,IAAI,EAAE,QAAQ;oBACd,QAAQ,EAAE,IAAA,iBAAY,EAAC,QAAQ,CAAC;oBAChC,IAAI,EAAE,IAAI,CAAC,sBAAsB,EAAE,CAAC,MAAM;oBAC1C,IAAI,EAAE,IAAA,aAAQ,EAAC,QAAQ,CAAC;iBACxB,CAAC,CAAC,CAAC;gBACJ,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;aACzC;YAAC,OAAO,CAAC,EAAE;gBACX,SAAS;aACT;SACD;QACD,OAAO,MAAM,CAAC;IACf,CAAC;IAEO,MAAM,CAAC,cAAc,GAAG,iCAAiC,CAAC;IAElE,iBAAiB,CAAC,QAAgB,EAAE,QAAwB;QAC3D,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YAC/E,0EAA0E;YAC1E,gEAAgE;YAChE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;SAC/B;QACD,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,EAAE,KAAK,QAAQ,CAAC,UAAU,EAAE,EAAE;YACvD,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC/C,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACjD,IAAI,IAAI,EAAE;gBACT,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;aACpC;YAED,mCAAmC;YACnC,mBAAmB,CAAC,cAAc,CAAC,SAAS,GAAG,CAAC,CAAC;YACjD,IAAI,KAAyC,CAAC;YAC9C,OAAO,CAAC,KAAK,GAAG,mBAAmB,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE;gBACpG,IAAI,eAAe,GAAG,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;gBAC/D,IAAI,CAAC,eAAe,EAAE;oBACrB,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,GAAG,eAAe,GAAG,EAAE,CAAC;iBAChE;gBACD,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;aAC/B;SACD;QACD,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;QACrC,OAAO,GAAG,CAAC;IACZ,CAAC;IAED,oBAAoB,CAAC,QAAgB;QACpC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAClC,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAChD,OAAO,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC;IAED,mBAAmB;QAClB,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACxC,CAAC;IAED,qBAAqB,CAAC,OAA2B;QAChD,OAAO,EAAE,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IAEQ,eAAe,GAAG,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC;IACzC,cAAc,GAAG,EAAE,CAAC,GAAG,CAAC,cAAc,CAAC;IACvC,UAAU,GAAG,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC;IAC/B,QAAQ,GAAG,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC;IAC3B,aAAa,GAAG,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC;IAE9C,6BAA6B;IAE7B,iBAAiB,CAAC,QAAgB,EAAE,MAAgB;QACnD,OAAO,IAAI,CAAC,0BAA0B,CAAC,MAAM,EAAE;YAC9C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,0BAA0B,CAAC,GAAG,EAAG,CAAC,CAAC;SAC1D;QACD,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACjD,IAAI,IAAI,EAAE;YACT,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;SAC1E;IACF,CAAC;IAED,YAAY,CAAC,QAAgB;QAC5B,IAAI,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE;YACjC,OAAO;SACP;QACD,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC/B,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,CAAC,QAAQ,EAAE;YACd,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,yBAAyB,QAAQ,EAAE,CAAC,CAAC;YAC9D,OAAO;SACP;QACD,MAAM,IAAI,GAAG,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;QAEhF,qBAAqB;QACrB,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAClC,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;YACxE,MAAM,cAAc,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;YAE/C,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;QAEH,gCAAgC;QAChC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAChC,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC;YAC1D,IAAI,OAAO,GAAG,QAAQ,CAAC;YACvB,IAAI,KAAK,GAAG,KAAK,CAAC;YAElB,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE;gBACpD,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAChC,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;gBACzD,MAAM,cAAc,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;gBAE/C,IAAI,IAAI,CAAC,iBAAiB,CAAC,cAAc,GAAG,KAAK,CAAC,EAAE;oBACnD,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,cAAc,GAAG,KAAK,CAAC,CAAC;oBAC/D,KAAK,GAAG,IAAI,CAAC;iBAEb;qBAAM,IAAI,IAAI,CAAC,iBAAiB,CAAC,cAAc,GAAG,OAAO,CAAC,EAAE;oBAC5D,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,cAAc,GAAG,OAAO,CAAC,CAAC;oBACjE,KAAK,GAAG,IAAI,CAAC;iBACb;aACD;YAED,IAAI,CAAC,KAAK,EAAE;gBACX,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,yBAAyB,EAAE;oBACjD,IAAI,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;wBACtG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;qBAC5C;iBACD;aACD;QACF,CAAC,CAAC,CAAC;IACJ,CAAC"}
\ No newline at end of file
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"builder.js","sourceRoot":"","sources":["builder.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,yBAAyB;AACzB,6BAA6B;AAC7B,iCAAiC;AACjC,iCAAiC;AACjC,sCAAsC;AACtC,iCAAiC;AACjC,+BAA+B;AAC/B,2CAAiF;AAWjF,IAAiB,iBAAiB,CAIjC;AAJD,WAAiB,iBAAiB;IACpB,sBAAI,GAAsB;QACtC,uBAAuB,KAAK,OAAO,KAAK,CAAC,CAAC,CAAC;KAC3C,CAAC;AACH,CAAC,EAJgB,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAIjC;AAQD,SAAS,SAAS,CAAC,IAAY;IAC9B,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AACjC,CAAC;AAED,SAAgB,uBAAuB,CAAC,MAAsB,EAAE,WAAmB,EAAE,GAAyB;IAE7G,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC;IAE1B,MAAM,IAAI,GAAG,IAAI,mBAAmB,CAAC,GAAG,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;IAC7D,MAAM,OAAO,GAAG,EAAE,CAAC,qBAAqB,CAAC,IAAI,EAAE,EAAE,CAAC,sBAAsB,EAAE,CAAC,CAAC;IAC5E,MAAM,gBAAgB,GAA+B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACzE,MAAM,WAAW,GAA+B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACpE,MAAM,qBAAqB,GAAG,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC;IACtD,IAAI,SAAS,GAAwC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACzE,IAAI,QAAQ,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;IAC9C,IAAI,sBAAsB,GAAG,IAAI,CAAC;IAElC,iCAAiC;IACjC,IAAI,CAAC,sBAAsB,EAAE,CAAC,WAAW,GAAG,IAAI,CAAC;IAEjD,SAAS,IAAI,CAAC,IAAW;QACxB,0BAA0B;QAC1B,IAAU,IAAK,CAAC,SAAS,EAAE;YAC1B,sBAAsB,GAAG,KAAK,CAAC;SAC/B;QAED,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YACnB,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACrC;aAAM;YACN,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC;SACjE;IACF,CAAC;IAED,SAAS,OAAO,CAAC,QAAwB;QACxC,IAAI,QAAQ,YAAY,mBAAmB,EAAE;YAC5C,OAAO,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;SAChD;aAAM;YACN,OAAO,EAAE,CAAC;SACV;IACF,CAAC;IAED,SAAS,gBAAgB,CAAC,UAAyB;QAClD,OAAa,UAAW,CAAC,uBAAuB;eAC5C,gCAAgC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC;IACjE,CAAC;IAED,SAAS,KAAK,CAAC,GAA0B,EAAE,OAA2B,EAAE,KAAK,GAAG,iBAAiB,CAAC,IAAI;QAErG,SAAS,eAAe,CAAC,QAAgB;YACxC,OAAO,IAAI,OAAO,CAAkB,OAAO,CAAC,EAAE;gBAC7C,OAAO,CAAC,QAAQ,CAAC;oBAChB,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE;wBAC7C,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,yBAAyB;qBACtC;yBAAM;wBACN,OAAO,CAAC,OAAO,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC,CAAC;qBACnD;gBACF,CAAC,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;QACJ,CAAC;QAED,SAAS,kBAAkB,CAAC,QAAgB;YAC3C,OAAO,IAAI,OAAO,CAAkB,OAAO,CAAC,EAAE;gBAC7C,OAAO,CAAC,QAAQ,CAAC;oBAChB,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE;wBAC7C,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,yBAAyB;qBACtC;yBAAM;wBACN,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,CAAC;qBAClD;gBACF,CAAC,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;QACJ,CAAC;QAED,SAAS,QAAQ,CAAC,QAAgB;YAEjC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;gBAC5B,OAAO,CAAC,QAAQ,CAAC;oBAEhB,IAAI,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;wBAC9B,qDAAqD;wBACrD,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;wBAClD,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC;6BACxC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC;6BACjD,MAAM,CAAC,QAAQ,CAAC,CAAC;wBAEnB,OAAO,OAAO,CAAC;4BACd,QAAQ;4BACR,SAAS;4BACT,KAAK,EAAE,EAAE;yBACT,CAAC,CAAC;qBACH;oBAED,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;oBAC/C,MAAM,KAAK,GAAY,EAAE,CAAC;oBAC1B,IAAI,SAA6B,CAAC;oBAElC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,WAAW,EAAE;wBACtC,IAAI,CAAC,sBAAsB,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;4BAC5D,SAAS;yBACT;wBAED,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;4BAC/B,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC;iCAClC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;iCACjB,MAAM,CAAC,QAAQ,CAAC,CAAC;4BAEnB,IAAI,CAAC,qBAAqB,EAAE;gCAC3B,kDAAkD;gCAClD,SAAS;6BACT;yBACD;wBAED,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC;4BACvB,IAAI,EAAE,IAAI,CAAC,IAAI;4BACf,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;4BAChC,IAAI,EAAE,CAAC,MAAM,CAAC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,IAAI,SAAS;yBAC5F,CAAC,CAAC;wBAEH,IAAI,CAAC,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;4BACvD,MAAM,aAAa,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;4BAEnF,IAAI,aAAa,EAAE;gCAClB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gCAC7C,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;gCACxD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gCAC7C,MAAM,MAAM,GAAG,CAAC,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,GAAG,CAAC,GAAG,QAAQ,GAAG,KAAK,CAAC;gCAEzE,IAAI,SAAS,GAAiB,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;gCAC7D,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;gCAElD,mDAAmD;gCACnD,oEAAoE;gCACpE,iEAAiE;gCACjE,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;gCAClD,IAAI,QAAQ,YAAY,mBAAmB,IAAI,QAAQ,CAAC,SAAS,EAAE;oCAClE,MAAM,QAAQ,GAAG,IAAI,8BAAiB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;oCAC3D,MAAM,KAAK,GAAG,IAAI,8BAAiB,CAAC,SAAS,CAAC,CAAC;oCAC/C,IAAI,SAAS,GAAG,KAAK,CAAC;oCACtB,MAAM,GAAG,GAAG,IAAI,+BAAkB,CAAC;wCAClC,IAAI,EAAE,SAAS,CAAC,IAAI;wCACpB,UAAU,EAAE,SAAS,CAAC,UAAU;qCAChC,CAAC,CAAC;oCAEH,SAAS;oCACT,MAAM,SAAS,GAAG,IAAI,GAAG,EAAwC,CAAC;oCAClE,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE;wCACxB,IAAI,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC,aAAa,EAAE;4CACvC,oBAAoB;4CACpB,IAAI,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;4CAC1C,IAAI,CAAC,KAAK,EAAE;gDACX,KAAK,GAAG,EAAE,CAAC;gDACX,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;6CACrC;4CACD,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC;yCAClD;6CAAM;4CACN,gBAAgB;yCAChB;oCACF,CAAC,CAAC,CAAC;oCAEH,SAAS;oCACT,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE;wCACrB,SAAS,GAAG,IAAI,CAAC;wCACjB,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;wCAC5C,IAAI,mBAAmB,GAAG,CAAC,CAAC;wCAC5B,IAAI,KAAK,EAAE;4CACV,KAAK,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,EAAE;gDAC/B,IAAI,EAAE,IAAI,CAAC,CAAC,cAAc,EAAE;oDAC3B,MAAM;iDACN;gDACD,mBAAmB,GAAG,IAAI,GAAG,EAAE,CAAC;6CAChC;yCACD;wCACD,GAAG,CAAC,UAAU,CAAC;4CACd,MAAM,EAAE,CAAC,CAAC,MAAM;4CAChB,IAAI,EAAE,CAAC,CAAC,IAAI;4CACZ,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC,CAAC,eAAe,EAAE;4CAC/D,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC,cAAc,GAAG,mBAAmB,EAAE;yCAClF,CAAC,CAAC;oCACJ,CAAC,CAAC,CAAC;oCAEH,IAAI,SAAS,EAAE;wCAEd,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;4CACM,QAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,UAAe,EAAE,EAAE;gDACnF,GAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gDACpC,MAAM,aAAa,GAAG,QAAQ,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;gDAC5D,IAAI,aAAa,KAAK,IAAI,EAAE;oDAC3B,GAAG,CAAC,gBAAgB,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;iDAChD;4CACF,CAAC,CAAC,CAAC;wCACJ,CAAC,CAAC,CAAC;wCAEH,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;wCAEvC,iFAAiF;wCACjF,oFAAoF;wCACpF,0DAA0D;wCAC1D,qGAAqG;wCACrG,MAAM;qCACN;iCACD;gCAEK,KAAM,CAAC,SAAS,GAAG,SAAS,CAAC;6BACnC;yBACD;wBAED,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;qBAClB;oBAED,OAAO,CAAC;wBACP,QAAQ;wBACR,SAAS;wBACT,KAAK;qBACL,CAAC,CAAC;gBACJ,CAAC,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;QACJ,CAAC;QAED,MAAM,SAAS,GAAwC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3E,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEtB,MAAM,WAAW,GAAa,EAAE,CAAC;QACjC,MAAM,wBAAwB,GAAa,EAAE,CAAC;QAC9C,MAAM,uBAAuB,GAAa,EAAE,CAAC;QAC7C,MAAM,yBAAyB,GAAa,EAAE,CAAC;QAC/C,MAAM,cAAc,GAAa,EAAE,CAAC;QACpC,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAkB,CAAC;QAEtD,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,kBAAkB,EAAE,EAAE;YACjD,IAAI,gBAAgB,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE;gBAEnE,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC3B,wBAAwB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACxC,uBAAuB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aACvC;SACD;QAED,OAAO,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE;YAElC,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAkB,CAAC;YACpD,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAU,CAAC;YAE9C,SAAS,UAAU;gBAElB,IAAI,OAAiC,CAAC;gBACtC,wBAAwB;gBAExB,+BAA+B;gBAC/B,IAAI,KAAK,CAAC,uBAAuB,EAAE,EAAE;oBACpC,IAAI,CAAC,UAAU,EAAE,oCAAoC,CAAC,CAAC;oBACvD,mBAAmB,CAAC,KAAK,EAAE,CAAC;oBAC5B,OAAO,EAAE,CAAC;oBACV,OAAO;iBACP;gBAED,kBAAkB;qBACb,IAAI,WAAW,CAAC,MAAM,EAAE;oBAC5B,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAG,CAAC;oBACpC,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;wBAEzC,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,EAAE;4BAC/B,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;4BAC/B,GAAG,CAAC,IAAI,CAAC,CAAC;yBACV;wBAED,+BAA+B;wBAC/B,mBAAmB,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC;wBAEnE,wBAAwB;wBACxB,IAAI,KAAK,CAAC,SAAS,IAAI,WAAW,CAAC,QAAQ,CAAC,KAAK,KAAK,CAAC,SAAS,EAAE;4BACjE,WAAW,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC;4BACxC,yBAAyB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;yBACzC;oBACF,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;wBACZ,6CAA6C;wBAC7C,IAAI,CAAC,KAAK,CAAC,kBAAkB,QAAQ,EAAE,CAAC,CAAC;wBACzC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBACf,CAAC,CAAC,CAAC;iBACH;gBAED,qBAAqB;qBAChB,IAAI,wBAAwB,CAAC,MAAM,EAAE;oBACzC,MAAM,QAAQ,GAAG,wBAAwB,CAAC,GAAG,EAAG,CAAC;oBACjD,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;oBACjC,OAAO,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;wBACtD,OAAO,SAAS,CAAC,QAAQ,CAAC,CAAC;wBAC3B,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;4BAC3B,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;4BACrC,SAAS,CAAC,QAAQ,CAAC,GAAG,WAAW,CAAC;4BAElC,8CAA8C;4BAC9C,wBAAwB,CAAC,MAAM,GAAG,CAAC,CAAC;4BACpC,uBAAuB,CAAC,MAAM,GAAG,CAAC,CAAC;4BACnC,yBAAyB,CAAC,MAAM,GAAG,CAAC,CAAC;yBACrC;oBACF,CAAC,CAAC,CAAC;iBACH;gBAED,wBAAwB;qBACnB,IAAI,uBAAuB,CAAC,MAAM,EAAE;oBAExC,IAAI,QAAQ,GAAG,uBAAuB,CAAC,GAAG,EAAE,CAAC;oBAC7C,OAAO,QAAQ,IAAI,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;wBACnD,QAAQ,GAAG,uBAAuB,CAAC,GAAG,EAAG,CAAC;qBAC1C;oBAED,IAAI,QAAQ,EAAE;wBACb,IAAI,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;wBACpC,OAAO,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;4BACzD,OAAO,SAAS,CAAC,QAAS,CAAC,CAAC;4BAC5B,iBAAiB,CAAC,GAAG,CAAC,QAAS,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;4BACrD,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;gCAC3B,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;gCACrC,SAAS,CAAC,QAAS,CAAC,GAAG,WAAW,CAAC;6BACnC;wBACF,CAAC,CAAC,CAAC;qBACH;iBACD;gBAED,yBAAyB;qBACpB,IAAI,yBAAyB,CAAC,MAAM,EAAE;oBAC1C,OAAO,yBAAyB,CAAC,MAAM,EAAE;wBACxC,MAAM,QAAQ,GAAG,yBAAyB,CAAC,GAAG,EAAG,CAAC;wBAElD,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,UAAU,EAAG,CAAC,aAAa,CAAC,QAAQ,CAAE,CAAC,EAAE;4BACtE,IAAI,CAAC,oBAAoB,EAAE,QAAQ,GAAG,4FAA4F,CAAC,CAAC;4BACpI,uBAAuB,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;4BAC3D,yBAAyB,CAAC,MAAM,GAAG,CAAC,CAAC;4BACrC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC;4BAC1B,MAAM;yBACN;wBAED,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;qBACjD;iBACD;gBAED,yBAAyB;qBACpB,IAAI,cAAc,CAAC,MAAM,EAAE;oBAC/B,IAAI,QAAQ,GAAG,cAAc,CAAC,GAAG,EAAE,CAAC;oBACpC,OAAO,QAAQ,IAAI,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;wBACrD,QAAQ,GAAG,cAAc,CAAC,GAAG,EAAE,CAAC;qBAChC;oBACD,IAAI,QAAQ,EAAE;wBACb,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;wBAClC,MAAM,KAAK,GAAG,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;wBAC9C,IAAI,KAAK,KAAK,CAAC,EAAE;4BAChB,4DAA4D;4BAC5D,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;yBAEjD;6BAAM,IAAI,OAAO,KAAK,KAAK,WAAW,EAAE;4BACxC,4CAA4C;4BAC5C,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;4BAC9B,uBAAuB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;yBACvC;qBACD;iBACD;gBAED,cAAc;qBACT;oBACJ,OAAO,EAAE,CAAC;oBACV,OAAO;iBACP;gBAED,IAAI,CAAC,OAAO,EAAE;oBACb,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;iBAC5B;gBAED,OAAO,CAAC,IAAI,CAAC;oBACZ,mBAAmB;oBACnB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;gBAC9B,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;oBACd,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACpB,CAAC,CAAC,CAAC;YACJ,CAAC;YAED,UAAU,EAAE,CAAC;QAEd,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YACZ,wDAAwD;YACxD,mBAAmB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;gBAC1C,gBAAgB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YAC/B,CAAC,CAAC,CAAC;YAEH,iCAAiC;YACjC,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE;gBAC5C,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC3C,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC;YACpC,CAAC,CAAC,CAAC;YACH,SAAS,GAAG,SAAS,CAAC;YAEtB,cAAc;YACd,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;YAC/C,MAAM,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC;YACvB,IAAI,CACH,OAAO,EACP,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,cAAc,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAC/K,CAAC;YACF,QAAQ,GAAG,OAAO,CAAC;QACpB,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,OAAO;QACN,IAAI;QACJ,KAAK;QACL,eAAe,EAAE,OAAO;KACxB,CAAC;AACH,CAAC;AAjZD,0DAiZC;AAED,MAAM,cAAc;IAEF,KAAK,CAAS;IACd,MAAM,CAAO;IAE9B,YAAY,IAAY,EAAE,KAAW;QACpC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,UAAU;QACT,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;IAClC,CAAC;IAED,OAAO,CAAC,KAAa,EAAE,GAAW;QACjC,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACzC,CAAC;IAED,SAAS;QACR,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;IAC1B,CAAC;IAED,cAAc,CAAC,YAAgC;QAC9C,OAAO,SAAS,CAAC;IAClB,CAAC;CACD;AAED,MAAM,mBAAoB,SAAQ,cAAc;IAE9B,KAAK,CAAS;IAEtB,SAAS,CAAgB;IAElC,YAAY,IAA0C;QACrD,KAAK,CAAC,IAAI,CAAC,QAAS,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,IAAK,CAAC,KAAK,CAAC,CAAC;QACnD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;IACjC,CAAC;IAED,OAAO;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACnB,CAAC;CACD;AAED,MAAM,mBAAmB;IAYN;IACA;IACA;IAZD,UAAU,CAAqC;IAC/C,eAAe,CAAc;IAC7B,WAAW,CAAc;IACzB,aAAa,CAA4B;IACzC,0BAA0B,CAAW;IACrC,yBAAyB,CAA+B;IAEjE,eAAe,CAAS;IAEhC,YACkB,QAA8B,EAC9B,YAAoB,EACpB,IAA8C;QAF9C,aAAQ,GAAR,QAAQ,CAAsB;QAC9B,iBAAY,GAAZ,YAAY,CAAQ;QACpB,SAAI,GAAJ,IAAI,CAA0C;QAE/D,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,CAAC,eAAe,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACnD,IAAI,CAAC,WAAW,GAAG,IAAI,GAAG,EAAE,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,KAAK,CAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3D,IAAI,CAAC,0BAA0B,GAAG,EAAE,CAAC;QACrC,IAAI,CAAC,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAErD,IAAI,CAAC,eAAe,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED,GAAG,CAAC,EAAU;QACb,kBAAkB;IACnB,CAAC;IAED,KAAK,CAAC,EAAU;QACf,kBAAkB;IACnB,CAAC;IAED,KAAK,CAAC,CAAS;QACd,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,sBAAsB;QACrB,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;IAC9B,CAAC;IAED,iBAAiB;QAChB,OAAO,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACrC,CAAC;IAED,kBAAkB;QACjB,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QACtH,OAAO,GAAG,CAAC;IACZ,CAAC;IAED,gBAAgB,CAAC,QAAgB;QAChC,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACzC,IAAI,MAAM,EAAE;YACX,OAAO,MAAM,CAAC,UAAU,EAAE,CAAC;SAC3B;QACD,OAAO,eAAe,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,iBAAiB,CAAC,QAAgB,EAAE,UAAmB,IAAI;QAC1D,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC/B,IAAI,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACvC,IAAI,CAAC,MAAM,IAAI,OAAO,EAAE;YACvB,IAAI;gBACH,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,KAAK,CAAM;oBAC/C,IAAI,EAAE,QAAQ;oBACd,QAAQ,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC;oBACnC,IAAI,EAAE,IAAI,CAAC,sBAAsB,EAAE,CAAC,MAAM;oBAC1C,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC;iBAC3B,CAAC,CAAC,CAAC;gBACJ,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;aACzC;YAAC,OAAO,CAAC,EAAE;gBACX,SAAS;aACT;SACD;QACD,OAAO,MAAM,CAAC;IACf,CAAC;IAEO,MAAM,CAAC,cAAc,GAAG,iCAAiC,CAAC;IAElE,iBAAiB,CAAC,QAAgB,EAAE,QAAwB;QAC3D,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YAC/E,0EAA0E;YAC1E,gEAAgE;YAChE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;SAC/B;QACD,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,EAAE,KAAK,QAAQ,CAAC,UAAU,EAAE,EAAE;YACvD,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC/C,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACjD,IAAI,IAAI,EAAE;gBACT,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;aACpC;YAED,mCAAmC;YACnC,mBAAmB,CAAC,cAAc,CAAC,SAAS,GAAG,CAAC,CAAC;YACjD,IAAI,KAAyC,CAAC;YAC9C,OAAO,CAAC,KAAK,GAAG,mBAAmB,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE;gBACpG,IAAI,eAAe,GAAG,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;gBAC/D,IAAI,CAAC,eAAe,EAAE;oBACrB,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,GAAG,eAAe,GAAG,EAAE,CAAC;iBAChE;gBACD,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;aAC/B;SACD;QACD,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;QACrC,OAAO,GAAG,CAAC;IACZ,CAAC;IAED,oBAAoB,CAAC,QAAgB;QACpC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAClC,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAChD,OAAO,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC;IAED,mBAAmB;QAClB,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACxC,CAAC;IAED,qBAAqB,CAAC,OAA2B;QAChD,OAAO,EAAE,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IAEQ,eAAe,GAAG,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC;IACzC,cAAc,GAAG,EAAE,CAAC,GAAG,CAAC,cAAc,CAAC;IACvC,UAAU,GAAG,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC;IAC/B,QAAQ,GAAG,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC;IAC3B,aAAa,GAAG,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC;IAE9C,6BAA6B;IAE7B,iBAAiB,CAAC,QAAgB,EAAE,MAAgB;QACnD,OAAO,IAAI,CAAC,0BAA0B,CAAC,MAAM,EAAE;YAC9C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,0BAA0B,CAAC,GAAG,EAAG,CAAC,CAAC;SAC1D;QACD,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACjD,IAAI,IAAI,EAAE;YACT,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;SAC1E;IACF,CAAC;IAED,YAAY,CAAC,QAAgB;QAC5B,IAAI,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE;YACjC,OAAO;SACP;QACD,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC/B,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,CAAC,QAAQ,EAAE;YACd,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,yBAAyB,QAAQ,EAAE,CAAC,CAAC;YAC9D,OAAO;SACP;QACD,MAAM,IAAI,GAAG,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;QAEhF,qBAAqB;QACrB,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAClC,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;YACxE,MAAM,cAAc,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;YAE/C,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;QAEH,gCAAgC;QAChC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAChC,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC;YAC1D,IAAI,OAAO,GAAG,QAAQ,CAAC;YACvB,IAAI,KAAK,GAAG,KAAK,CAAC;YAElB,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE;gBACpD,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAChC,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;gBACzD,MAAM,cAAc,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;gBAE/C,IAAI,IAAI,CAAC,iBAAiB,CAAC,cAAc,GAAG,KAAK,CAAC,EAAE;oBACnD,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,cAAc,GAAG,KAAK,CAAC,CAAC;oBAC/D,KAAK,GAAG,IAAI,CAAC;iBAEb;qBAAM,IAAI,IAAI,CAAC,iBAAiB,CAAC,cAAc,GAAG,OAAO,CAAC,EAAE;oBAC5D,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,cAAc,GAAG,OAAO,CAAC,CAAC;oBACjE,KAAK,GAAG,IAAI,CAAC;iBACb;aACD;YAED,IAAI,CAAC,KAAK,EAAE;gBACX,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,yBAAyB,EAAE;oBACjD,IAAI,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;wBACtG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;qBAC5C;iBACD;aACD;QACF,CAAC,CAAC,CAAC;IACJ,CAAC"}
\ No newline at end of file
diff --git a/build/lib/tsb/builder.ts b/build/lib/tsb/builder.ts
index b6d3b153f6a66b..7d40239e7159c0 100644
--- a/build/lib/tsb/builder.ts
+++ b/build/lib/tsb/builder.ts
@@ -3,13 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { statSync, readFileSync } from 'fs';
+import * as fs from 'fs';
 import * as path from 'path';
 import * as crypto from 'crypto';
 import * as utils from './utils';
 import * as colors from 'ansi-colors';
 import * as ts from 'typescript';
 import * as Vinyl from 'vinyl';
+import { RawSourceMap, SourceMapConsumer, SourceMapGenerator } from 'source-map';
 
 export interface IConfiguration {
 	logFn: (topic: string, message: string) => void;
@@ -158,8 +159,81 @@ export function createTypeScriptBuilder(config: IConfiguration, projectFile: str
 								const dirname = path.dirname(vinyl.relative);
 								const tsname = (dirname === '.' ? '' : dirname + '/') + basename + '.ts';
 
-								const sourceMap = JSON.parse(sourcemapFile.text);
+								let sourceMap = <RawSourceMap>JSON.parse(sourcemapFile.text);
 								sourceMap.sources[0] = tsname.replace(/\\/g, '/');
+
+								// check for an "input source" map and combine them
+								// in step 1 we extract all line edit from the input source map, and
+								// in step 2 we apply the line edits to the typescript source map
+								const snapshot = host.getScriptSnapshot(fileName);
+								if (snapshot instanceof VinylScriptSnapshot && snapshot.sourceMap) {
+									const inputSMC = new SourceMapConsumer(snapshot.sourceMap);
+									const tsSMC = new SourceMapConsumer(sourceMap);
+									let didChange = false;
+									const smg = new SourceMapGenerator({
+										file: sourceMap.file,
+										sourceRoot: sourceMap.sourceRoot
+									});
+
+									// step 1
+									const lineEdits = new Map<number, [from: number, to: number][]>();
+									inputSMC.eachMapping(m => {
+										if (m.originalLine === m.generatedLine) {
+											// same line mapping
+											let array = lineEdits.get(m.originalLine);
+											if (!array) {
+												array = [];
+												lineEdits.set(m.originalLine, array);
+											}
+											array.push([m.originalColumn, m.generatedColumn]);
+										} else {
+											// NOT SUPPORTED
+										}
+									});
+
+									// step 2
+									tsSMC.eachMapping(m => {
+										didChange = true;
+										const edits = lineEdits.get(m.originalLine);
+										let originalColumnDelta = 0;
+										if (edits) {
+											for (const [from, to] of edits) {
+												if (to >= m.originalColumn) {
+													break;
+												}
+												originalColumnDelta = from - to;
+											}
+										}
+										smg.addMapping({
+											source: m.source,
+											name: m.name,
+											generated: { line: m.generatedLine, column: m.generatedColumn },
+											original: { line: m.originalLine, column: m.originalColumn + originalColumnDelta }
+										});
+									});
+
+									if (didChange) {
+
+										[tsSMC, inputSMC].forEach((consumer) => {
+											(<SourceMapConsumer & { sources: string[] }>consumer).sources.forEach((sourceFile: any) => {
+												(<any>smg)._sources.add(sourceFile);
+												const sourceContent = consumer.sourceContentFor(sourceFile);
+												if (sourceContent !== null) {
+													smg.setSourceContent(sourceFile, sourceContent);
+												}
+											});
+										});
+
+										sourceMap = JSON.parse(smg.toString());
+
+										// const filename = '/Users/jrieken/Code/vscode/src2/' + vinyl.relative + '.map';
+										// fs.promises.mkdir(path.dirname(filename), { recursive: true }).then(async () => {
+										// 	await fs.promises.writeFile(filename, smg.toString());
+										// 	await fs.promises.writeFile('/Users/jrieken/Code/vscode/src2/' + vinyl.relative, vinyl.contents);
+										// });
+									}
+								}
+
 								(<any>vinyl).sourceMap = sourceMap;
 							}
 						}
@@ -397,9 +471,12 @@ class VinylScriptSnapshot extends ScriptSnapshot {
 
 	private readonly _base: string;
 
-	constructor(file: Vinyl) {
+	readonly sourceMap?: RawSourceMap;
+
+	constructor(file: Vinyl & { sourceMap?: RawSourceMap }) {
 		super(file.contents!.toString(), file.stat!.mtime);
 		this._base = file.base;
+		this.sourceMap = file.sourceMap;
 	}
 
 	getBase(): string {
@@ -474,9 +551,9 @@ class LanguageServiceHost implements ts.LanguageServiceHost {
 			try {
 				result = new VinylScriptSnapshot(new Vinyl(<any>{
 					path: filename,
-					contents: readFileSync(filename),
+					contents: fs.readFileSync(filename),
 					base: this.getCompilationSettings().outDir,
-					stat: statSync(filename)
+					stat: fs.statSync(filename)
 				}));
 				this.addScriptSnapshot(filename, result);
 			} catch (e) {
diff --git a/build/yarn.lock b/build/yarn.lock
index 033f22cb0237d5..abd2732ca528cc 100644
--- a/build/yarn.lock
+++ b/build/yarn.lock
@@ -1642,13 +1642,13 @@ gauge@~2.7.3:
     wide-align "^1.1.0"
 
 get-intrinsic@^1.0.2:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
-  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385"
+  integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==
   dependencies:
     function-bind "^1.1.1"
     has "^1.0.3"
-    has-symbols "^1.0.1"
+    has-symbols "^1.0.3"
 
 get-stream@^4.1.0:
   version "4.1.0"
@@ -1812,10 +1812,10 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-symbols@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
-  integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
+has-symbols@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
+  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
 
 has-unicode@^2.0.0:
   version "2.0.1"
@@ -2383,9 +2383,9 @@ object-assign@^4.1.0, object-assign@^4.1.1:
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
 object-inspect@^1.9.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1"
-  integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
+  integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==
 
 object-keys@^1.0.12:
   version "1.1.1"
@@ -2597,9 +2597,9 @@ punycode@^2.1.1:
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
 qs@^6.9.1:
-  version "6.10.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a"
-  integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
+  integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
   dependencies:
     side-channel "^1.0.4"
 
diff --git a/cglicenses.json b/cglicenses.json
index b2ab858f9690d2..fed6d51856467a 100644
--- a/cglicenses.json
+++ b/cglicenses.json
@@ -307,5 +307,32 @@
 			"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": "emitter-listener",
+		"fullLicenseText": [
+			"This software is released under the BSD-2-Clause license:",
+			"Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:",
+			"",
+			"1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.",
+			"",
+			"2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer",
+			"in the documentation and/or other materials provided with the distribution.",
+			"",
+			"THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT",
+			"NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE",
+			"COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,",
+			"BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED",
+			"AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT",
+			"OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+		]
+	},
+	{ // Reason: Missing license file
+		"name": "const_format_proc_macros",
+		"fullLicenseTextUri": "https://raw.githubusercontent.com/rodrimati1992/const_format_crates/b2207af46bfbd9f1a6bd12dbffd10feeea3d9fd7/LICENSE-ZLIB.md"
+	},
+	{ // Reason: Missing license file
+		"name": "const_format",
+		"fullLicenseTextUri": "https://raw.githubusercontent.com/rodrimati1992/const_format_crates/b2207af46bfbd9f1a6bd12dbffd10feeea3d9fd7/LICENSE-ZLIB.md"
 	}
 ]
diff --git a/cgmanifest.json b/cgmanifest.json
index 315b64cf71b324..94cc9ae5bb14d3 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -528,12 +528,12 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "165d5a2547bfc5ff22cd98950bca7fcddb7dea9d"
+					"commitHash": "f887fa45dfaeeddfe20c9835ae7ca3a0823b661b"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "19.1.6"
+			"version": "19.1.8"
 		},
 		{
 			"component": {
diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 4b7ab3e3c2392b..2026626c5b3c67 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -229,6 +229,7 @@ version = "0.1.0"
 dependencies = [
  "async-trait",
  "atty",
+ "base64",
  "chrono",
  "clap",
  "clap_lex",
@@ -254,6 +255,7 @@ dependencies = [
  "serde",
  "serde_bytes",
  "serde_json",
+ "sha2",
  "sysinfo",
  "tar",
  "tempfile",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index c288e84751495e..a632e10e432f5d 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -47,6 +47,8 @@ url = "2.3"
 async-trait = "0.1"
 log = "0.4"
 const_format = "0.2"
+sha2 = "0.10"
+base64 = "0.13"
 
 [build-dependencies]
 serde = { version = "1.0" }
diff --git a/cli/src/auth.rs b/cli/src/auth.rs
index e6f0e847e6370a..0b67916be06d9a 100644
--- a/cli/src/auth.rs
+++ b/cli/src/auth.rs
@@ -9,7 +9,9 @@ use crate::{
 	state::{LauncherPaths, PersistedState},
 	trace,
 	util::{
-		errors::{wrap, AnyError, RefreshTokenNotAvailableError, StatusError, WrappedError},
+		errors::{
+			wrap, AnyError, OAuthError, RefreshTokenNotAvailableError, StatusError, WrappedError,
+		},
 		input::prompt_options,
 	},
 	warning,
@@ -41,6 +43,12 @@ struct AuthenticationResponse {
 	expires_in: Option<i64>,
 }
 
+#[derive(Deserialize)]
+struct AuthenticationError {
+	error: String,
+	error_description: Option<String>,
+}
+
 #[derive(clap::ArgEnum, Serialize, Deserialize, Debug, Clone, Copy)]
 pub enum AuthProvider {
 	Microsoft,
@@ -480,12 +488,26 @@ impl Auth {
 			.send()
 			.await?;
 
-		if !response.status().is_success() {
-			return Err(StatusError::from_res(response).await?.into());
+		let status_code = response.status().as_u16();
+		let body = response.bytes().await?;
+		if let Ok(body) = serde_json::from_slice::<AuthenticationResponse>(&body) {
+			return Ok(StoredCredential::from_response(body, provider));
 		}
 
-		let body = response.json::<AuthenticationResponse>().await?;
-		Ok(StoredCredential::from_response(body, provider))
+		if let Ok(res) = serde_json::from_slice::<AuthenticationError>(&body) {
+			return Err(OAuthError {
+				error: res.error,
+				error_description: res.error_description,
+			}
+			.into());
+		}
+
+		return Err(StatusError {
+			body: String::from_utf8_lossy(&body).to_string(),
+			status_code,
+			url: provider.grant_uri().to_string(),
+		}
+		.into());
 	}
 
 	/// Implements the device code flow, returning the credentials upon success.
@@ -540,16 +562,21 @@ impl Auth {
 			};
 
 			let body = format!(
-                "client_id={}&grant_type=urn:ietf:params:oauth:grant-type:device_code&device_code={}",
-                provider.client_id(),
-                init_code_json.device_code
-            );
+					"client_id={}&grant_type=urn:ietf:params:oauth:grant-type:device_code&device_code={}",
+					provider.client_id(),
+					init_code_json.device_code
+			);
 
+			let mut interval_s = 5;
 			while Utc::now() < expires_at {
-				sleep(std::time::Duration::from_secs(5)).await;
+				sleep(std::time::Duration::from_secs(interval_s)).await;
 
 				match self.do_grant(provider, body.clone()).await {
 					Ok(creds) => return Ok(creds),
+					Err(AnyError::OAuthError(e)) if e.error == "slow_down" => {
+						interval_s += 5; // https://www.rfc-editor.org/rfc/rfc8628#section-3.5
+						trace!(self.log, "refresh poll failed, slowing down");
+					}
 					Err(e) => {
 						trace!(self.log, "refresh poll failed, retrying: {}", e);
 					}
diff --git a/cli/src/commands/args.rs b/cli/src/commands/args.rs
index a7f3ec53959b82..21ae6d10aec524 100644
--- a/cli/src/commands/args.rs
+++ b/cli/src/commands/args.rs
@@ -595,7 +595,7 @@ pub enum TunnelSubcommand {
 	#[clap(subcommand)]
 	User(TunnelUserSubCommands),
 
-	/// Manages the tunnel when installed as a system service,
+	/// (Preview) Manages the tunnel when installed as a system service,
 	#[clap(subcommand)]
 	Service(TunnelServiceSubCommands),
 }
diff --git a/cli/src/commands/tunnels.rs b/cli/src/commands/tunnels.rs
index 01e4de805c7d6d..5b0bc0d38fc206 100644
--- a/cli/src/commands/tunnels.rs
+++ b/cli/src/commands/tunnels.rs
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 use async_trait::async_trait;
+use sha2::{Digest, Sha256};
 use std::fmt;
 use std::str::FromStr;
 use sysinfo::{Pid, SystemExt};
@@ -18,6 +19,7 @@ use super::{
 	CommandContext,
 };
 
+use crate::tunnels::dev_tunnels::ActiveTunnel;
 use crate::{
 	auth::Auth,
 	log::{self, Logger},
@@ -234,11 +236,18 @@ pub async fn serve(ctx: CommandContext, gateway_args: TunnelServeArgs) -> Result
 	serve_with_csa(paths, log, gateway_args, csa, None).await
 }
 
+fn get_connection_token(tunnel: &ActiveTunnel) -> String {
+	let mut hash = Sha256::new();
+	hash.update(tunnel.id.as_bytes());
+	let result = hash.finalize();
+	base64::encode_config(result, base64::URL_SAFE_NO_PAD)
+}
+
 async fn serve_with_csa(
 	paths: LauncherPaths,
 	log: Logger,
 	gateway_args: TunnelServeArgs,
-	csa: CodeServerArgs,
+	mut csa: CodeServerArgs,
 	shutdown_rx: Option<mpsc::UnboundedReceiver<ShutdownSignal>>,
 ) -> Result<i32, AnyError> {
 	// Intentionally read before starting the server. If the server updated and
@@ -256,6 +265,8 @@ async fn serve_with_csa(
 			.await
 	}?;
 
+	csa.connection_token = Some(get_connection_token(&tunnel));
+
 	let shutdown_tx = if let Some(tx) = shutdown_rx {
 		tx
 	} else {
diff --git a/cli/src/constants.rs b/cli/src/constants.rs
index 1707d9c93d036d..ca5b32c8e3d683 100644
--- a/cli/src/constants.rs
+++ b/cli/src/constants.rs
@@ -17,7 +17,13 @@ pub const CONTROL_PORT: u16 = 31545;
 ///  1 - Initial protocol version
 ///  2 - Addition of `serve.compressed` property to control whether servermsg's
 ///      are compressed bidirectionally.
-pub const PROTOCOL_VERSION: u32 = 2;
+///  3 - The server's connection token is set to a SHA256 hash of the tunnel ID
+pub const PROTOCOL_VERSION: u32 = 3;
+
+/// Prefix for the tunnel tag that includes the version.
+pub const PROTOCOL_VERSION_TAG_PREFIX: &str = "protocolv";
+/// Tag for the current protocol version, which is included in dev tunnels.
+pub const PROTOCOL_VERSION_TAG: &str = concatcp!("protocolv", PROTOCOL_VERSION);
 
 pub const VSCODE_CLI_VERSION: Option<&'static str> = option_env!("VSCODE_CLI_VERSION");
 pub const VSCODE_CLI_AI_KEY: Option<&'static str> = option_env!("VSCODE_CLI_AI_KEY");
@@ -55,6 +61,8 @@ pub const QUALITYLESS_SERVER_NAME: &str = concatcp!(QUALITYLESS_PRODUCT_NAME, "
 /// Web URL the editor is hosted at. For VS Code, this is vscode.dev.
 pub const EDITOR_WEB_URL: Option<&'static str> = option_env!("VSCODE_CLI_EDITOR_WEB_URL");
 
+const NONINTERACTIVE_VAR: &str = "VSCODE_CLI_NONINTERACTIVE";
+
 pub fn get_default_user_agent() -> String {
 	format!(
 		"vscode-server-launcher/{}",
@@ -88,4 +96,7 @@ lazy_static! {
 	/// Map of qualities to the server name
 	pub static ref SERVER_NAME_MAP: Option<HashMap<Quality, String>> =
 		option_env!("VSCODE_CLI_SERVER_NAME_MAP").and_then(|s| serde_json::from_str(s).unwrap());
+
+	/// Whether i/o interactions are allowed in the current CLI.
+	pub static ref IS_INTERACTIVE_CLI: bool = atty::is(atty::Stream::Stdin) && std::env::var(NONINTERACTIVE_VAR).is_err();
 }
diff --git a/cli/src/tunnels/code_server.rs b/cli/src/tunnels/code_server.rs
index d720edb73f3083..74a8b00efbe59d 100644
--- a/cli/src/tunnels/code_server.rs
+++ b/cli/src/tunnels/code_server.rs
@@ -534,7 +534,6 @@ impl<'a, Http: SimpleHttp + Send + Sync + Clone + 'static> ServerBuilder<'a, Htt
 
 		let mut cmd = self.get_base_command();
 		cmd.arg("--start-server")
-			.arg("--without-connection-token")
 			.arg("--enable-remote-auto-shutdown")
 			.arg(format!("--socket-path={}", socket.display()));
 
diff --git a/cli/src/tunnels/dev_tunnels.rs b/cli/src/tunnels/dev_tunnels.rs
index 911bf547e2f5ca..8759b721ca793d 100644
--- a/cli/src/tunnels/dev_tunnels.rs
+++ b/cli/src/tunnels/dev_tunnels.rs
@@ -3,7 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 use crate::auth;
-use crate::constants::{CONTROL_PORT, TUNNEL_SERVICE_USER_AGENT};
+use crate::constants::{
+	CONTROL_PORT, PROTOCOL_VERSION_TAG, PROTOCOL_VERSION_TAG_PREFIX, TUNNEL_SERVICE_USER_AGENT, IS_INTERACTIVE_CLI,
+};
 use crate::state::{LauncherPaths, PersistedState};
 use crate::util::errors::{
 	wrap, AnyError, DevTunnelError, InvalidTunnelName, TunnelCreationFailed, WrappedError,
@@ -138,6 +140,8 @@ pub struct DevTunnels {
 pub struct ActiveTunnel {
 	/// Name of the tunnel
 	pub name: String,
+	/// Underlying dev tunnels ID
+	pub id: String,
 	manager: ActiveTunnelManager,
 }
 
@@ -378,7 +382,7 @@ impl DevTunnels {
 		preferred_name: Option<String>,
 		use_random_name: bool,
 	) -> Result<ActiveTunnel, AnyError> {
-		let (tunnel, persisted) = match self.launcher_tunnel.load() {
+		let (mut tunnel, persisted) = match self.launcher_tunnel.load() {
 			Some(mut persisted) => {
 				if let Some(name) = preferred_name {
 					if persisted.name.ne(&name) {
@@ -404,6 +408,12 @@ impl DevTunnels {
 			}
 		};
 
+		if !tunnel.tags.iter().any(|t| t == PROTOCOL_VERSION_TAG) {
+			tunnel = self
+				.update_protocol_version_tag(tunnel, &HOST_TUNNEL_REQUEST_OPTIONS)
+				.await?;
+		}
+
 		let locator = TunnelLocator::try_from(&tunnel).unwrap();
 		let host_token = get_host_token_from_tunnel(&tunnel);
 
@@ -462,7 +472,11 @@ impl DevTunnels {
 		let mut tried_recycle = false;
 
 		let new_tunnel = Tunnel {
-			tags: vec![name.to_string(), VSCODE_CLI_TUNNEL_TAG.to_string()],
+			tags: vec![
+				name.to_string(),
+				PROTOCOL_VERSION_TAG.to_string(),
+				VSCODE_CLI_TUNNEL_TAG.to_string(),
+			],
 			..Default::default()
 		};
 
@@ -507,6 +521,40 @@ impl DevTunnels {
 		}
 	}
 
+	/// Ensures the tunnel contains a tag for the current PROTCOL_VERSION, and no
+	/// other version tags.
+	async fn update_protocol_version_tag(
+		&self,
+		tunnel: Tunnel,
+		options: &TunnelRequestOptions,
+	) -> Result<Tunnel, AnyError> {
+		debug!(
+			self.log,
+			"Updating tunnel protocol version tag to {}", PROTOCOL_VERSION_TAG
+		);
+		let mut new_tags: Vec<String> = tunnel
+			.tags
+			.into_iter()
+			.filter(|t| !t.starts_with(PROTOCOL_VERSION_TAG_PREFIX))
+			.collect();
+		new_tags.push(PROTOCOL_VERSION_TAG.to_string());
+
+		let tunnel_update = Tunnel {
+			tags: new_tags,
+			tunnel_id: tunnel.tunnel_id.clone(),
+			cluster_id: tunnel.cluster_id.clone(),
+			..Default::default()
+		};
+
+		let result = spanf!(
+			self.log,
+			self.log.span("dev-tunnel.protocol-tag-update"),
+			self.client.update_tunnel(&tunnel_update, options)
+		);
+
+		result.map_err(|e| wrap(e, "tunnel tag update failed").into())
+	}
+
 	/// Tries to delete an unused tunnel, and then creates a tunnel with the
 	/// given `new_name`.
 	async fn try_recycle_tunnel(&mut self) -> Result<bool, AnyError> {
@@ -611,7 +659,7 @@ impl DevTunnels {
 		}
 
 		let mut placeholder_name = name_generator::generate_name(MAX_TUNNEL_NAME_LENGTH);
-		if use_random_name {
+		if use_random_name || !*IS_INTERACTIVE_CLI {
 			while !is_name_free(&placeholder_name) {
 				placeholder_name = name_generator::generate_name(MAX_TUNNEL_NAME_LENGTH);
 			}
@@ -690,6 +738,7 @@ impl DevTunnels {
 
 		Ok(ActiveTunnel {
 			name: tunnel_details.name.clone(),
+			id: tunnel_details.id.clone(),
 			manager,
 		})
 	}
diff --git a/cli/src/tunnels/legal.rs b/cli/src/tunnels/legal.rs
index 1f115222071b06..1e3d7b1bac3555 100644
--- a/cli/src/tunnels/legal.rs
+++ b/cli/src/tunnels/legal.rs
@@ -2,7 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-use crate::constants::PRODUCT_NAME_LONG;
+use crate::constants::{IS_INTERACTIVE_CLI, PRODUCT_NAME_LONG};
 use crate::state::{LauncherPaths, PersistedState};
 use crate::util::errors::{AnyError, MissingLegalConsent};
 use crate::util::input::prompt_yn;
@@ -25,10 +25,6 @@ pub fn require_consent(
 		None => return Ok(()),
 	}
 
-	if accept_server_license_terms {
-		return Ok(());
-	}
-
 	let prompt = match LICENSE_PROMPT {
 		Some(p) => p,
 		None => return Ok(()),
@@ -37,13 +33,19 @@ pub fn require_consent(
 	let license: PersistedState<PersistedConsent> =
 		PersistedState::new(paths.root().join("license_consent.json"));
 
-	let mut save = false;
 	let mut load = license.load();
+	if let Some(true) = load.consented {
+		return Ok(());
+	}
 
-	if !load.consented.unwrap_or(false) {
+	if accept_server_license_terms {
+		load.consented = Some(true);
+	} else if !*IS_INTERACTIVE_CLI {
+		return Err(MissingLegalConsent("Run this command again with --accept-server-license-terms to indicate your agreement.".to_string())
+		.into());
+	} else {
 		match prompt_yn(prompt) {
 			Ok(true) => {
-				save = true;
 				load.consented = Some(true);
 			}
 			Ok(false) => {
@@ -56,9 +58,6 @@ pub fn require_consent(
 		}
 	}
 
-	if save {
-		license.save(load)?;
-	}
-
+	license.save(load)?;
 	Ok(())
 }
diff --git a/cli/src/tunnels/service_linux.rs b/cli/src/tunnels/service_linux.rs
index 2510ae56473ea4..eae8a46d1906e2 100644
--- a/cli/src/tunnels/service_linux.rs
+++ b/cli/src/tunnels/service_linux.rs
@@ -92,6 +92,19 @@ impl ServiceManager for SystemdService {
 
 		info!(self.log, "Successfully registered service...");
 
+		// note: enablement is implicit in recent systemd version, but required for older systems
+		// https://github.com/microsoft/vscode/issues/167489#issuecomment-1331222826
+		proxy
+			.enable_unit_files(
+				vec![SystemdService::service_name_string()],
+				/* 'runtime only'= */ false,
+				/* replace existing = */ true,
+			)
+			.await
+			.map_err(|e| wrap(e, "error enabling unit files for service"))?;
+
+		info!(self.log, "Successfully enabled unit files...");
+
 		proxy
 			.start_unit(SystemdService::service_name_string(), "replace".to_string())
 			.await
diff --git a/cli/src/util/errors.rs b/cli/src/util/errors.rs
index 3ce70ef3cb86aa..392268fcd6ca7f 100644
--- a/cli/src/util/errors.rs
+++ b/cli/src/util/errors.rs
@@ -401,6 +401,23 @@ impl std::fmt::Display for MissingHomeDirectory {
 	}
 }
 
+#[derive(Debug)]
+pub struct OAuthError {
+	pub error: String,
+	pub error_description: Option<String>,
+}
+
+impl std::fmt::Display for OAuthError {
+	fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+		write!(
+			f,
+			"Error getting authorization: {} {}",
+			self.error,
+			self.error_description.as_deref().unwrap_or("")
+		)
+	}
+}
+
 #[derive(Debug)]
 pub struct CommandFailed {
 	pub output: std::process::Output,
@@ -487,7 +504,8 @@ makeAnyError!(
 	UpdatesNotConfigured,
 	CorruptDownload,
 	MissingHomeDirectory,
-	CommandFailed
+	CommandFailed,
+	OAuthError
 );
 
 impl From<reqwest::Error> for AnyError {
diff --git a/extensions/clojure/package.json b/extensions/clojure/package.json
index 4ea659b3b912c7..4c1dc3db8e9620 100644
--- a/extensions/clojure/package.json
+++ b/extensions/clojure/package.json
@@ -36,7 +36,12 @@
         "scopeName": "source.clojure",
         "path": "./syntaxes/clojure.tmLanguage.json"
       }
-    ]
+    ],
+    "configurationDefaults": {
+      "[clojure]": {
+        "diffEditor.ignoreTrimWhitespace": false
+      }
+    }
   },
   "repository": {
     "type": "git",
diff --git a/extensions/coffeescript/package.json b/extensions/coffeescript/package.json
index e8fda02d0a30b0..61f89ecfee1973 100644
--- a/extensions/coffeescript/package.json
+++ b/extensions/coffeescript/package.json
@@ -45,7 +45,12 @@
         "language": "coffeescript",
         "path": "./snippets/coffeescript.code-snippets"
       }
-    ]
+    ],
+    "configurationDefaults": {
+      "[coffeescript]": {
+        "diffEditor.ignoreTrimWhitespace": false
+      }
+    }
   },
   "repository": {
     "type": "git",
diff --git a/extensions/configuration-editing/schemas/devContainer.schema.generated.json b/extensions/configuration-editing/schemas/devContainer.schema.generated.json
index f94a40021e1cca..0d0dcdeb65669f 100644
--- a/extensions/configuration-editing/schemas/devContainer.schema.generated.json
+++ b/extensions/configuration-editing/schemas/devContainer.schema.generated.json
@@ -364,51 +364,101 @@
 				"onCreateCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run when creating the container. This command is run after \"initializeCommand\" and before \"updateContentCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run when creating the container. This command is run after \"initializeCommand\" and before \"updateContentCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"updateContentCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run when creating the container and rerun when the workspace content was updated while creating the container. This command is run after \"onCreateCommand\" and before \"postCreateCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run when creating the container and rerun when the workspace content was updated while creating the container. This command is run after \"onCreateCommand\" and before \"postCreateCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"postCreateCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run after creating the container. This command is run after \"updateContentCommand\" and before \"postStartCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run after creating the container. This command is run after \"updateContentCommand\" and before \"postStartCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"postStartCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run after starting the container. This command is run after \"postCreateCommand\" and before \"postAttachCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run after starting the container. This command is run after \"postCreateCommand\" and before \"postAttachCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"postAttachCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run when attaching to the container. This command is run after \"postStartCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run when attaching to the container. This command is run after \"postStartCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"waitFor": {
@@ -459,6 +509,39 @@
 							"type": "string",
 							"pattern": "^\\d+([tgmk]b)?$",
 							"description": "Amount of required disk space in bytes. Supports units tb, gb, mb and kb."
+						},
+						"gpu": {
+							"oneOf": [
+								{
+									"type": [
+										"boolean",
+										"string"
+									],
+									"enum": [
+										true,
+										false,
+										"optional"
+									],
+									"description": "Indicates whether a GPU is required. The string \"optional\" indicates that a GPU is optional. An object value can be used to configure more detailed requirements."
+								},
+								{
+									"type": "object",
+									"properties": {
+										"cores": {
+											"type": "integer",
+											"minimum": 1,
+											"description": "Number of required cores."
+										},
+										"memory": {
+											"type": "string",
+											"pattern": "^\\d+([tgmk]b)?$",
+											"description": "Amount of required RAM in bytes. Supports units tb, gb, mb and kb."
+										}
+									},
+									"description": "Indicates whether a GPU is required. The string \"optional\" indicates that a GPU is optional. An object value can be used to configure more detailed requirements.",
+									"additionalProperties": false
+								}
+							]
 						}
 					},
 					"additionalProperties": false
@@ -1040,51 +1123,101 @@
 				"onCreateCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run when creating the container. This command is run after \"initializeCommand\" and before \"updateContentCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run when creating the container. This command is run after \"initializeCommand\" and before \"updateContentCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"updateContentCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run when creating the container and rerun when the workspace content was updated while creating the container. This command is run after \"onCreateCommand\" and before \"postCreateCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run when creating the container and rerun when the workspace content was updated while creating the container. This command is run after \"onCreateCommand\" and before \"postCreateCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"postCreateCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run after creating the container. This command is run after \"updateContentCommand\" and before \"postStartCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run after creating the container. This command is run after \"updateContentCommand\" and before \"postStartCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"postStartCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run after starting the container. This command is run after \"postCreateCommand\" and before \"postAttachCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run after starting the container. This command is run after \"postCreateCommand\" and before \"postAttachCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"postAttachCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run when attaching to the container. This command is run after \"postStartCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run when attaching to the container. This command is run after \"postStartCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"waitFor": {
@@ -1135,6 +1268,39 @@
 							"type": "string",
 							"pattern": "^\\d+([tgmk]b)?$",
 							"description": "Amount of required disk space in bytes. Supports units tb, gb, mb and kb."
+						},
+						"gpu": {
+							"oneOf": [
+								{
+									"type": [
+										"boolean",
+										"string"
+									],
+									"enum": [
+										true,
+										false,
+										"optional"
+									],
+									"description": "Indicates whether a GPU is required. The string \"optional\" indicates that a GPU is optional. An object value can be used to configure more detailed requirements."
+								},
+								{
+									"type": "object",
+									"properties": {
+										"cores": {
+											"type": "integer",
+											"minimum": 1,
+											"description": "Number of required cores."
+										},
+										"memory": {
+											"type": "string",
+											"pattern": "^\\d+([tgmk]b)?$",
+											"description": "Amount of required RAM in bytes. Supports units tb, gb, mb and kb."
+										}
+									},
+									"description": "Indicates whether a GPU is required. The string \"optional\" indicates that a GPU is optional. An object value can be used to configure more detailed requirements.",
+									"additionalProperties": false
+								}
+							]
 						}
 					},
 					"additionalProperties": false
@@ -1682,51 +1848,101 @@
 				"onCreateCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run when creating the container. This command is run after \"initializeCommand\" and before \"updateContentCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run when creating the container. This command is run after \"initializeCommand\" and before \"updateContentCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"updateContentCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run when creating the container and rerun when the workspace content was updated while creating the container. This command is run after \"onCreateCommand\" and before \"postCreateCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run when creating the container and rerun when the workspace content was updated while creating the container. This command is run after \"onCreateCommand\" and before \"postCreateCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"postCreateCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run after creating the container. This command is run after \"updateContentCommand\" and before \"postStartCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run after creating the container. This command is run after \"updateContentCommand\" and before \"postStartCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"postStartCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run after starting the container. This command is run after \"postCreateCommand\" and before \"postAttachCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run after starting the container. This command is run after \"postCreateCommand\" and before \"postAttachCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"postAttachCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run when attaching to the container. This command is run after \"postStartCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run when attaching to the container. This command is run after \"postStartCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"waitFor": {
@@ -1777,6 +1993,39 @@
 							"type": "string",
 							"pattern": "^\\d+([tgmk]b)?$",
 							"description": "Amount of required disk space in bytes. Supports units tb, gb, mb and kb."
+						},
+						"gpu": {
+							"oneOf": [
+								{
+									"type": [
+										"boolean",
+										"string"
+									],
+									"enum": [
+										true,
+										false,
+										"optional"
+									],
+									"description": "Indicates whether a GPU is required. The string \"optional\" indicates that a GPU is optional. An object value can be used to configure more detailed requirements."
+								},
+								{
+									"type": "object",
+									"properties": {
+										"cores": {
+											"type": "integer",
+											"minimum": 1,
+											"description": "Number of required cores."
+										},
+										"memory": {
+											"type": "string",
+											"pattern": "^\\d+([tgmk]b)?$",
+											"description": "Amount of required RAM in bytes. Supports units tb, gb, mb and kb."
+										}
+									},
+									"description": "Indicates whether a GPU is required. The string \"optional\" indicates that a GPU is optional. An object value can be used to configure more detailed requirements.",
+									"additionalProperties": false
+								}
+							]
 						}
 					},
 					"additionalProperties": false
@@ -2316,51 +2565,101 @@
 				"onCreateCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run when creating the container. This command is run after \"initializeCommand\" and before \"updateContentCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run when creating the container. This command is run after \"initializeCommand\" and before \"updateContentCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"updateContentCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run when creating the container and rerun when the workspace content was updated while creating the container. This command is run after \"onCreateCommand\" and before \"postCreateCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run when creating the container and rerun when the workspace content was updated while creating the container. This command is run after \"onCreateCommand\" and before \"postCreateCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"postCreateCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run after creating the container. This command is run after \"updateContentCommand\" and before \"postStartCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run after creating the container. This command is run after \"updateContentCommand\" and before \"postStartCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"postStartCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run after starting the container. This command is run after \"postCreateCommand\" and before \"postAttachCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run after starting the container. This command is run after \"postCreateCommand\" and before \"postAttachCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"postAttachCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run when attaching to the container. This command is run after \"postStartCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run when attaching to the container. This command is run after \"postStartCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"waitFor": {
@@ -2411,6 +2710,39 @@
 							"type": "string",
 							"pattern": "^\\d+([tgmk]b)?$",
 							"description": "Amount of required disk space in bytes. Supports units tb, gb, mb and kb."
+						},
+						"gpu": {
+							"oneOf": [
+								{
+									"type": [
+										"boolean",
+										"string"
+									],
+									"enum": [
+										true,
+										false,
+										"optional"
+									],
+									"description": "Indicates whether a GPU is required. The string \"optional\" indicates that a GPU is optional. An object value can be used to configure more detailed requirements."
+								},
+								{
+									"type": "object",
+									"properties": {
+										"cores": {
+											"type": "integer",
+											"minimum": 1,
+											"description": "Number of required cores."
+										},
+										"memory": {
+											"type": "string",
+											"pattern": "^\\d+([tgmk]b)?$",
+											"description": "Amount of required RAM in bytes. Supports units tb, gb, mb and kb."
+										}
+									},
+									"description": "Indicates whether a GPU is required. The string \"optional\" indicates that a GPU is optional. An object value can be used to configure more detailed requirements.",
+									"additionalProperties": false
+								}
+							]
 						}
 					},
 					"additionalProperties": false
@@ -2915,51 +3247,101 @@
 				"onCreateCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run when creating the container. This command is run after \"initializeCommand\" and before \"updateContentCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run when creating the container. This command is run after \"initializeCommand\" and before \"updateContentCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"updateContentCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run when creating the container and rerun when the workspace content was updated while creating the container. This command is run after \"onCreateCommand\" and before \"postCreateCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run when creating the container and rerun when the workspace content was updated while creating the container. This command is run after \"onCreateCommand\" and before \"postCreateCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"postCreateCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run after creating the container. This command is run after \"updateContentCommand\" and before \"postStartCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run after creating the container. This command is run after \"updateContentCommand\" and before \"postStartCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"postStartCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run after starting the container. This command is run after \"postCreateCommand\" and before \"postAttachCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run after starting the container. This command is run after \"postCreateCommand\" and before \"postAttachCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"postAttachCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run when attaching to the container. This command is run after \"postStartCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run when attaching to the container. This command is run after \"postStartCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"waitFor": {
@@ -3010,6 +3392,39 @@
 							"type": "string",
 							"pattern": "^\\d+([tgmk]b)?$",
 							"description": "Amount of required disk space in bytes. Supports units tb, gb, mb and kb."
+						},
+						"gpu": {
+							"oneOf": [
+								{
+									"type": [
+										"boolean",
+										"string"
+									],
+									"enum": [
+										true,
+										false,
+										"optional"
+									],
+									"description": "Indicates whether a GPU is required. The string \"optional\" indicates that a GPU is optional. An object value can be used to configure more detailed requirements."
+								},
+								{
+									"type": "object",
+									"properties": {
+										"cores": {
+											"type": "integer",
+											"minimum": 1,
+											"description": "Number of required cores."
+										},
+										"memory": {
+											"type": "string",
+											"pattern": "^\\d+([tgmk]b)?$",
+											"description": "Amount of required RAM in bytes. Supports units tb, gb, mb and kb."
+										}
+									},
+									"description": "Indicates whether a GPU is required. The string \"optional\" indicates that a GPU is optional. An object value can be used to configure more detailed requirements.",
+									"additionalProperties": false
+								}
+							]
 						}
 					},
 					"additionalProperties": false
@@ -3232,4 +3647,4 @@
 			"additionalProperties": false
 		}
 	]
-}
\ No newline at end of file
+}
diff --git a/extensions/configuration-editing/schemas/devContainer.schema.src.json b/extensions/configuration-editing/schemas/devContainer.schema.src.json
index f908f29ac59fe9..33fca2e2e8884b 100644
--- a/extensions/configuration-editing/schemas/devContainer.schema.src.json
+++ b/extensions/configuration-editing/schemas/devContainer.schema.src.json
@@ -253,51 +253,101 @@
 				"onCreateCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run when creating the container. This command is run after \"initializeCommand\" and before \"updateContentCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run when creating the container. This command is run after \"initializeCommand\" and before \"updateContentCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"updateContentCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run when creating the container and rerun when the workspace content was updated while creating the container. This command is run after \"onCreateCommand\" and before \"postCreateCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run when creating the container and rerun when the workspace content was updated while creating the container. This command is run after \"onCreateCommand\" and before \"postCreateCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"postCreateCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run after creating the container. This command is run after \"updateContentCommand\" and before \"postStartCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run after creating the container. This command is run after \"updateContentCommand\" and before \"postStartCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"postStartCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run after starting the container. This command is run after \"postCreateCommand\" and before \"postAttachCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run after starting the container. This command is run after \"postCreateCommand\" and before \"postAttachCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"postAttachCommand": {
 					"type": [
 						"string",
-						"array"
+						"array",
+						"object"
 					],
-					"description": "A command to run when attaching to the container. This command is run after \"postStartCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"description": "A command to run when attaching to the container. This command is run after \"postStartCommand\". If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell. Alternatively an object with the property keys as labels and the values as either strings or arrays of strings can be used to configure multiple commands.",
 					"items": {
 						"type": "string"
+					},
+					"additionalProperties": {
+						"type": [
+							"string",
+							"array"
+						],
+						"items": {
+							"type": "string"
+						}
 					}
 				},
 				"waitFor": {
@@ -351,6 +401,38 @@
 									"type": "string",
 									"pattern": "^\\d+([tgmk]b)?$",
 									"description": "Amount of required disk space in bytes. Supports units tb, gb, mb and kb."
+								},
+								"gpu": {
+									"oneOf": [
+										{
+											"type": [
+												"boolean",
+												"string"
+											],
+											"enum": [
+												true,
+												false,
+												"optional"
+											],
+											"description": "Indicates whether a GPU is required. The string \"optional\" indicates that a GPU is optional. An object value can be used to configure more detailed requirements."
+										},
+										{
+											"type": "object",
+											"properties": {
+												"cores": {
+													"type": "integer",
+													"minimum": 1,
+													"description": "Number of required cores."
+												},
+												"memory": {
+													"type": "string",
+													"pattern": "^\\d+([tgmk]b)?$",
+													"description": "Amount of required RAM in bytes. Supports units tb, gb, mb and kb."
+												}
+											},
+											"description": "Indicates whether a GPU is required. The string \"optional\" indicates that a GPU is optional. An object value can be used to configure more detailed requirements."
+										}
+									]
 								}
 							}
 						}
diff --git a/extensions/configuration-editing/src/settingsDocumentHelper.ts b/extensions/configuration-editing/src/settingsDocumentHelper.ts
index 5a267b6093e1b8..6c52bb5a511f69 100644
--- a/extensions/configuration-editing/src/settingsDocumentHelper.ts
+++ b/extensions/configuration-editing/src/settingsDocumentHelper.ts
@@ -111,7 +111,8 @@ export class SettingsDocument {
 		completions.push(this.newSimpleCompletionItem(getText('activeFolderShort'), range, vscode.l10n.t("the name of the folder the file is contained in (e.g. myFileFolder)")));
 		completions.push(this.newSimpleCompletionItem(getText('activeFolderMedium'), range, vscode.l10n.t("the path of the folder the file is contained in, relative to the workspace folder (e.g. myFolder/myFileFolder)")));
 		completions.push(this.newSimpleCompletionItem(getText('activeFolderLong'), range, vscode.l10n.t("the full path of the folder the file is contained in (e.g. /Users/Development/myFolder/myFileFolder)")));
-		completions.push(this.newSimpleCompletionItem(getText('rootName'), range, vscode.l10n.t("name of the workspace (e.g. myFolder or myWorkspace)")));
+		completions.push(this.newSimpleCompletionItem(getText('rootName'), range, vscode.l10n.t("name of the workspace with optional remote name and workspace indicator if applicable (e.g. myFolder, myRemoteFolder [SSH] or myWorkspace (Workspace))")));
+		completions.push(this.newSimpleCompletionItem(getText('rootNameShort'), range, vscode.l10n.t("shortened name of the workspace without suffixes (e.g. myFolder or myWorkspace)")));
 		completions.push(this.newSimpleCompletionItem(getText('rootPath'), range, vscode.l10n.t("file path of the workspace (e.g. /Users/Development/myWorkspace)")));
 		completions.push(this.newSimpleCompletionItem(getText('folderName'), range, vscode.l10n.t("name of the workspace folder the file is contained in (e.g. myFolder)")));
 		completions.push(this.newSimpleCompletionItem(getText('folderPath'), range, vscode.l10n.t("file path of the workspace folder the file is contained in (e.g. /Users/Development/myFolder)")));
diff --git a/extensions/configuration-editing/src/test/index.ts b/extensions/configuration-editing/src/test/index.ts
index beec606392863c..ee8aeb0c6eb04e 100644
--- a/extensions/configuration-editing/src/test/index.ts
+++ b/extensions/configuration-editing/src/test/index.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-const path = require('path');
-const testRunner = require('../../../../test/integration/electron/testrunner');
+import * as path from 'path';
+import * as testRunner from '../../../../test/integration/electron/testrunner';
 
-const options: any = {
+const options: import('mocha').MochaOptions = {
 	ui: 'tdd',
 	color: true,
 	timeout: 60000
diff --git a/extensions/css-language-features/client/src/browser/cssClientMain.ts b/extensions/css-language-features/client/src/browser/cssClientMain.ts
index 8fa2d81bd033a4..6522c78638988a 100644
--- a/extensions/css-language-features/client/src/browser/cssClientMain.ts
+++ b/extensions/css-language-features/client/src/browser/cssClientMain.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ExtensionContext, Uri } from 'vscode';
+import { ExtensionContext, Uri, l10n } from 'vscode';
 import { BaseLanguageClient, LanguageClientOptions } from 'vscode-languageclient';
 import { startClient, LanguageClientConstructor } from '../cssClient';
 import { LanguageClient } from 'vscode-languageclient/browser';
@@ -22,6 +22,8 @@ export async function activate(context: ExtensionContext) {
 	const serverMain = Uri.joinPath(context.extensionUri, 'server/dist/browser/cssServerMain.js');
 	try {
 		const worker = new Worker(serverMain.toString());
+		worker.postMessage({ i10lLocation: l10n.uri?.toString(false) ?? '' });
+
 		const newLanguageClient: LanguageClientConstructor = (id: string, name: string, clientOptions: LanguageClientOptions) => {
 			return new LanguageClient(id, name, clientOptions, worker);
 		};
diff --git a/extensions/css-language-features/client/src/node/cssClientMain.ts b/extensions/css-language-features/client/src/node/cssClientMain.ts
index dfbe121f822668..802b58ab28634c 100644
--- a/extensions/css-language-features/client/src/node/cssClientMain.ts
+++ b/extensions/css-language-features/client/src/node/cssClientMain.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { getNodeFSRequestService } from './nodeFs';
-import { ExtensionContext, extensions } from 'vscode';
+import { ExtensionContext, extensions, l10n } from 'vscode';
 import { startClient, LanguageClientConstructor } from '../cssClient';
 import { ServerOptions, TransportKind, LanguageClientOptions, LanguageClient, BaseLanguageClient } from 'vscode-languageclient/node';
 import { TextDecoder } from 'util';
@@ -33,6 +33,9 @@ export async function activate(context: ExtensionContext) {
 		return new LanguageClient(id, name, serverOptions, clientOptions);
 	};
 
+	// pass the location of the localization bundle to the server
+	process.env['VSCODE_L10N_BUNDLE_LOCATION'] = l10n.uri?.toString() ?? '';
+
 	client = await startClient(context, newLanguageClient, { fs: getNodeFSRequestService(), TextDecoder });
 }
 
diff --git a/extensions/css-language-features/package.json b/extensions/css-language-features/package.json
index 04d6b241c56a5e..f113922cf2ff6f 100644
--- a/extensions/css-language-features/package.json
+++ b/extensions/css-language-features/package.json
@@ -994,7 +994,7 @@
     ]
   },
   "dependencies": {
-    "vscode-languageclient": "^8.1.0-next.1",
+    "vscode-languageclient": "^8.1.0-next.2",
     "vscode-uri": "^3.0.6"
   },
   "devDependencies": {
diff --git a/extensions/css-language-features/server/extension-browser.webpack.config.js b/extensions/css-language-features/server/extension-browser.webpack.config.js
index aded41897a3f64..5378e6a031ee2c 100644
--- a/extensions/css-language-features/server/extension-browser.webpack.config.js
+++ b/extensions/css-language-features/server/extension-browser.webpack.config.js
@@ -13,7 +13,7 @@ const path = require('path');
 module.exports = withBrowserDefaults({
 	context: __dirname,
 	entry: {
-		extension: './src/browser/cssServerMain.ts',
+		extension: './src/browser/cssServerWorkerMain.ts',
 	},
 	output: {
 		filename: 'cssServerMain.js',
diff --git a/extensions/css-language-features/server/package.json b/extensions/css-language-features/server/package.json
index 2528682c661974..a0e98d19e19b77 100644
--- a/extensions/css-language-features/server/package.json
+++ b/extensions/css-language-features/server/package.json
@@ -10,9 +10,10 @@
   "main": "./out/node/cssServerMain",
   "browser": "./dist/browser/cssServerMain",
   "dependencies": {
-    "vscode-css-languageservice": "^6.1.1",
-    "vscode-languageserver": "^8.1.0-next.1",
-    "vscode-uri": "^3.0.6"
+    "vscode-css-languageservice": "^6.2.1",
+    "vscode-languageserver": "^8.1.0-next.2",
+    "vscode-uri": "^3.0.6",
+    "@vscode/l10n": "^0.0.10"
   },
   "devDependencies": {
     "@types/mocha": "^9.1.1",
diff --git a/extensions/css-language-features/server/src/browser/cssServerWorkerMain.ts b/extensions/css-language-features/server/src/browser/cssServerWorkerMain.ts
new file mode 100644
index 00000000000000..c3f3bc511d6013
--- /dev/null
+++ b/extensions/css-language-features/server/src/browser/cssServerWorkerMain.ts
@@ -0,0 +1,19 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+declare let self: any;
+
+import * as l10n from '@vscode/l10n';
+
+let initialized = false;
+self.onmessage = async (e: any) => {
+	if (!initialized) {
+		initialized = true;
+		const i10lLocation = e.data.i10lLocation;
+		if (i10lLocation) {
+			await l10n.config({ uri: i10lLocation });
+		}
+		await import('./cssServerMain');
+	}
+};
diff --git a/extensions/css-language-features/server/yarn.lock b/extensions/css-language-features/server/yarn.lock
index ec35ce87045205..1d57beb5c7b503 100644
--- a/extensions/css-language-features/server/yarn.lock
+++ b/extensions/css-language-features/server/yarn.lock
@@ -12,27 +12,32 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae"
   integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==
 
-vscode-css-languageservice@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-6.1.1.tgz#36daefd96e56b7453da16ff8c16f4ee693f32521"
-  integrity sha512-7d2NCq2plT0njAKmGZ11uof95y2fwbgq8QuToE3kX9uYQfVmejHX2/lFGKbK5AV5+Ja0L80UZoU0QspwqMKMHA==
+"@vscode/l10n@^0.0.10":
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/@vscode/l10n/-/l10n-0.0.10.tgz#9c513107c690c0dd16e3ec61e453743de15ebdb0"
+  integrity sha512-E1OCmDcDWa0Ya7vtSjp/XfHFGqYJfh+YPC1RkATU71fTac+j1JjCcB3qwSzmlKAighx2WxhLlfhS0RwAN++PFQ==
+
+vscode-css-languageservice@^6.2.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-6.2.1.tgz#0d86683ecac04d81cb973211a9e22c2d6c6eeba7"
+  integrity sha512-FMaMjB2LQdkHjTCP2CWh2S94xuGsxSc8xr0H9nAACVd/iUDyZLoKFjwoB+mA3v0rpCH2U5vVCVwxyULy61CgqA==
   dependencies:
+    "@vscode/l10n" "^0.0.10"
     vscode-languageserver-textdocument "^1.0.7"
     vscode-languageserver-types "^3.17.2"
-    vscode-nls "^5.2.0"
-    vscode-uri "^3.0.4"
-
-vscode-jsonrpc@8.1.0-next.1:
-  version "8.1.0-next.1"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0-next.1.tgz#7c38cb1cbd968c409522593004fdac845a55b155"
-  integrity sha512-FiPG+9TuMIga3t+kkalQytwqMtJu1djI+Pq+Ut2tvAJpcNHDJ0PYdjFv5mgEvTEJLujrYwjWHVkNe+XfHPBD/w==
-
-vscode-languageserver-protocol@3.17.3-next.1:
-  version "3.17.3-next.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3-next.1.tgz#804880c172b4c48d1a48a91c4c23250121effb19"
-  integrity sha512-vgjvPE0zox+1Fi4ljsSFJ+B3g8wGNbuAEEdulueVdv+R2VHtc06+dgxhWiG4LKPqXwjPDmiuxCnvd2xk3fzTTw==
+    vscode-uri "^3.0.6"
+
+vscode-jsonrpc@8.1.0-next.3:
+  version "8.1.0-next.3"
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0-next.3.tgz#964c91a3bfd1949b4c3da7136ba46b48b42991ad"
+  integrity sha512-4eDeAnkWFKFTmT7tUR2wDngNAuwGHvV7yPCzPWGudBWJOoXaPQnwmiQChoj+umH1y2NR+MdBtx49xlZA7FoLRQ==
+
+vscode-languageserver-protocol@3.17.3-next.2:
+  version "3.17.3-next.2"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3-next.2.tgz#e906471899b9ed2ae1139f95592e0e5c7580bf0f"
+  integrity sha512-T+vSRHgApc1xCsOUJ/M7UN/tN4aINvc3FYJ6P3vAhvv0i4jZZewFMEonZB76B94TiY6z4eScgaG6m73gTgnyyw==
   dependencies:
-    vscode-jsonrpc "8.1.0-next.1"
+    vscode-jsonrpc "8.1.0-next.3"
     vscode-languageserver-types "3.17.2"
 
 vscode-languageserver-textdocument@^1.0.7:
@@ -45,19 +50,14 @@ vscode-languageserver-types@3.17.2, vscode-languageserver-types@^3.17.2:
   resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz#b2c2e7de405ad3d73a883e91989b850170ffc4f2"
   integrity sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA==
 
-vscode-languageserver@^8.1.0-next.1:
-  version "8.1.0-next.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.1.0-next.1.tgz#1c173de554889bd18ca6e20eaf4bdc84164c86b4"
-  integrity sha512-u14Rk4JgXI+7iS6AEXI2pNc1dWh/5JEXtaqa4TeBECKJlN+5242mbGBBPaHMOE7sSI1Kh66XhEMZJhPYjUfjHw==
+vscode-languageserver@^8.1.0-next.2:
+  version "8.1.0-next.2"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.1.0-next.2.tgz#8423e0acbc33846c338875acc3c811637415a35e"
+  integrity sha512-natfwUx9lPXO3ki9NtRMPb7GcaKvEE7Sfvzaw3Gpa4GJr47FWYwX26YnWpasDBMAjg5ErpFihY1+j9Gh2W9VwA==
   dependencies:
-    vscode-languageserver-protocol "3.17.3-next.1"
-
-vscode-nls@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f"
-  integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==
+    vscode-languageserver-protocol "3.17.3-next.2"
 
-vscode-uri@^3.0.6, vscode-uri@^3.0.4:
+vscode-uri@^3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.6.tgz#5e6e2e1a4170543af30151b561a41f71db1d6f91"
   integrity sha512-fmL7V1eiDBFRRnu+gfRWTzyPpNIHJTc4mWnFkwBUmO9U3KPgJAmTx7oxi2bl/Rh6HLdU7+4C9wlj0k2E4AdKFQ==
diff --git a/extensions/css-language-features/yarn.lock b/extensions/css-language-features/yarn.lock
index baefd5224edc93..fe1c242bc3aef4 100644
--- a/extensions/css-language-features/yarn.lock
+++ b/extensions/css-language-features/yarn.lock
@@ -40,26 +40,26 @@ semver@^7.3.7:
   dependencies:
     lru-cache "^6.0.0"
 
-vscode-jsonrpc@8.1.0-next.1:
-  version "8.1.0-next.1"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0-next.1.tgz#7c38cb1cbd968c409522593004fdac845a55b155"
-  integrity sha512-FiPG+9TuMIga3t+kkalQytwqMtJu1djI+Pq+Ut2tvAJpcNHDJ0PYdjFv5mgEvTEJLujrYwjWHVkNe+XfHPBD/w==
+vscode-jsonrpc@8.1.0-next.3:
+  version "8.1.0-next.3"
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0-next.3.tgz#964c91a3bfd1949b4c3da7136ba46b48b42991ad"
+  integrity sha512-4eDeAnkWFKFTmT7tUR2wDngNAuwGHvV7yPCzPWGudBWJOoXaPQnwmiQChoj+umH1y2NR+MdBtx49xlZA7FoLRQ==
 
-vscode-languageclient@^8.1.0-next.1:
-  version "8.1.0-next.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.1.0-next.1.tgz#44b63bc2d215c13f1dea1dc54267a354ea5451cb"
-  integrity sha512-lJraJ8IrqXr83ZciAs4dN32f9kEPuOb/FqAeUTgnW5cAxo0Qux0/EMgKyU33Qf9LdEI0I9iwRVxQWtawbyUUfg==
+vscode-languageclient@^8.1.0-next.2:
+  version "8.1.0-next.2"
+  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.1.0-next.2.tgz#12a248299d23e48cb9d316129bf9ba0592caa533"
+  integrity sha512-ZGCQaqXyT7Y4H68zDQ/8XnNzo9tlUxuarJa0hT5EncAC0vmVAxLvhbsz2iSlWx3j6UZUgBM0b6UZtjpzkqr3tQ==
   dependencies:
     minimatch "^5.1.0"
     semver "^7.3.7"
-    vscode-languageserver-protocol "3.17.3-next.1"
+    vscode-languageserver-protocol "3.17.3-next.2"
 
-vscode-languageserver-protocol@3.17.3-next.1:
-  version "3.17.3-next.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3-next.1.tgz#804880c172b4c48d1a48a91c4c23250121effb19"
-  integrity sha512-vgjvPE0zox+1Fi4ljsSFJ+B3g8wGNbuAEEdulueVdv+R2VHtc06+dgxhWiG4LKPqXwjPDmiuxCnvd2xk3fzTTw==
+vscode-languageserver-protocol@3.17.3-next.2:
+  version "3.17.3-next.2"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3-next.2.tgz#e906471899b9ed2ae1139f95592e0e5c7580bf0f"
+  integrity sha512-T+vSRHgApc1xCsOUJ/M7UN/tN4aINvc3FYJ6P3vAhvv0i4jZZewFMEonZB76B94TiY6z4eScgaG6m73gTgnyyw==
   dependencies:
-    vscode-jsonrpc "8.1.0-next.1"
+    vscode-jsonrpc "8.1.0-next.3"
     vscode-languageserver-types "3.17.2"
 
 vscode-languageserver-types@3.17.2:
diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json
index 2ec3d79ce6f889..8c0f3459c46520 100644
--- a/extensions/emmet/package.json
+++ b/extensions/emmet/package.json
@@ -41,7 +41,7 @@
     "onCommand:editor.emmet.action.decrementNumberByTen",
     "onCommand:editor.emmet.action.reflectCSSValue",
     "onCommand:workbench.action.showEmmetCommands",
-    "onStartupFinished"
+    "onLanguage"
   ],
   "main": "./out/node/emmetNodeMain",
   "browser": "./dist/browser/emmetBrowserMain",
diff --git a/extensions/emmet/src/abbreviationActions.ts b/extensions/emmet/src/abbreviationActions.ts
index d38adff72e1903..3326722905c6bc 100644
--- a/extensions/emmet/src/abbreviationActions.ts
+++ b/extensions/emmet/src/abbreviationActions.ts
@@ -240,10 +240,10 @@ export async function wrapWithAbbreviation(args: any): Promise<boolean> {
 	}
 
 	let currentValue = '';
-	function inputChanged(value: string): string {
+	async function inputChanged(value: string): Promise<string> {
 		if (value !== currentValue) {
 			currentValue = value;
-			makeChanges(value, true);
+			await makeChanges(value, true);
 		}
 		return '';
 	}
@@ -289,7 +289,7 @@ export function expandEmmetAbbreviation(args: any): Thenable<boolean | undefined
 		args['language'] = vscode.window.activeTextEditor.document.languageId;
 	} else {
 		const excludedLanguages = vscode.workspace.getConfiguration('emmet')['excludeLanguages'] ? vscode.workspace.getConfiguration('emmet')['excludeLanguages'] : [];
-		if (excludedLanguages.indexOf(vscode.window.activeTextEditor.document.languageId) > -1) {
+		if (excludedLanguages.includes(vscode.window.activeTextEditor.document.languageId)) {
 			return fallbackTab();
 		}
 	}
@@ -468,13 +468,13 @@ export function isValidLocationForEmmetAbbreviation(document: vscode.TextDocumen
 				&& propertyNode.separator
 				&& offset >= propertyNode.separatorToken.end
 				&& offset <= propertyNode.terminatorToken.start
-				&& abbreviation.indexOf(':') === -1) {
+				&& !abbreviation.includes(':')) {
 				return hexColorRegex.test(abbreviation) || abbreviation === '!';
 			}
 			if (!propertyNode.terminatorToken
 				&& propertyNode.separator
 				&& offset >= propertyNode.separatorToken.end
-				&& abbreviation.indexOf(':') === -1) {
+				&& !abbreviation.includes(':')) {
 				return hexColorRegex.test(abbreviation) || abbreviation === '!';
 			}
 			if (hexColorRegex.test(abbreviation) || abbreviation === '!') {
@@ -527,7 +527,7 @@ export function isValidLocationForEmmetAbbreviation(document: vscode.TextDocumen
 			const typeAttribute = (currentHtmlNode.attributes || []).filter(x => x.name.toString() === 'type')[0];
 			const typeValue = typeAttribute ? typeAttribute.value.toString() : '';
 
-			if (allowedMimeTypesInScriptTag.indexOf(typeValue) > -1) {
+			if (allowedMimeTypesInScriptTag.includes(typeValue)) {
 				return true;
 			}
 
@@ -622,26 +622,25 @@ export function isValidLocationForEmmetAbbreviation(document: vscode.TextDocumen
  *
  * @returns false if no snippet can be inserted.
  */
-function expandAbbreviationInRange(editor: vscode.TextEditor, expandAbbrList: ExpandAbbreviationInput[], insertSameSnippet: boolean): Thenable<boolean> {
+async function expandAbbreviationInRange(editor: vscode.TextEditor, expandAbbrList: ExpandAbbreviationInput[], insertSameSnippet: boolean): Promise<boolean> {
 	if (!expandAbbrList || expandAbbrList.length === 0) {
-		return Promise.resolve(false);
+		return false;
 	}
 
 	// Snippet to replace at multiple cursors are not the same
 	// `editor.insertSnippet` will have to be called for each instance separately
 	// We will not be able to maintain multiple cursors after snippet insertion
-	const insertPromises: Thenable<boolean>[] = [];
+	let insertedSnippetsCount = 0;
 	if (!insertSameSnippet) {
-		expandAbbrList.sort((a: ExpandAbbreviationInput, b: ExpandAbbreviationInput) => { return b.rangeToReplace.start.compareTo(a.rangeToReplace.start); }).forEach((expandAbbrInput: ExpandAbbreviationInput) => {
+		expandAbbrList.sort((a: ExpandAbbreviationInput, b: ExpandAbbreviationInput) => { return b.rangeToReplace.start.compareTo(a.rangeToReplace.start); });
+		for (const expandAbbrInput of expandAbbrList) {
 			const expandedText = expandAbbr(expandAbbrInput);
 			if (expandedText) {
-				insertPromises.push(editor.insertSnippet(new vscode.SnippetString(expandedText), expandAbbrInput.rangeToReplace, { undoStopBefore: false, undoStopAfter: false }));
+				await editor.insertSnippet(new vscode.SnippetString(expandedText), expandAbbrInput.rangeToReplace, { undoStopBefore: false, undoStopAfter: false });
+				insertedSnippetsCount++;
 			}
-		});
-		if (insertPromises.length === 0) {
-			return Promise.resolve(false);
 		}
-		return Promise.all(insertPromises).then(() => Promise.resolve(true));
+		return insertedSnippetsCount > 0;
 	}
 
 	// Snippet to replace at all cursors are the same
@@ -653,7 +652,7 @@ function expandAbbreviationInRange(editor: vscode.TextEditor, expandAbbrList: Ex
 	if (expandedText) {
 		return editor.insertSnippet(new vscode.SnippetString(expandedText), allRanges);
 	}
-	return Promise.resolve(false);
+	return false;
 }
 
 /**
@@ -694,7 +693,7 @@ function expandAbbr(input: ExpandAbbreviationInput): string | undefined {
 	try {
 		expandedText = helper.expandAbbreviation(input.abbreviation, expandOptions);
 	} catch (e) {
-		vscode.window.showErrorMessage('Failed to expand abbreviation');
+		void vscode.window.showErrorMessage('Failed to expand abbreviation');
 	}
 
 	return expandedText;
diff --git a/extensions/emmet/src/defaultCompletionProvider.ts b/extensions/emmet/src/defaultCompletionProvider.ts
index c8a6f657d75b64..dfe6f7e6e438be 100644
--- a/extensions/emmet/src/defaultCompletionProvider.ts
+++ b/extensions/emmet/src/defaultCompletionProvider.ts
@@ -43,7 +43,7 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi
 	private provideCompletionItemsInternal(document: vscode.TextDocument, position: vscode.Position, context: vscode.CompletionContext): Thenable<vscode.CompletionList | undefined> | undefined {
 		const emmetConfig = vscode.workspace.getConfiguration('emmet');
 		const excludedLanguages = emmetConfig['excludeLanguages'] ? emmetConfig['excludeLanguages'] : [];
-		if (excludedLanguages.indexOf(document.languageId) > -1) {
+		if (excludedLanguages.includes(document.languageId)) {
 			return;
 		}
 
@@ -214,7 +214,7 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi
 				});
 			}
 
-			return new vscode.CompletionList(newItems, true);
+			return new vscode.CompletionList(newItems);
 		});
 	}
 }
diff --git a/extensions/emmet/src/selectItemHTML.ts b/extensions/emmet/src/selectItemHTML.ts
index 6400913396ca27..2465d3da652090 100644
--- a/extensions/emmet/src/selectItemHTML.ts
+++ b/extensions/emmet/src/selectItemHTML.ts
@@ -140,7 +140,7 @@ function getNextAttribute(document: vscode.TextDocument, selectionStart: number,
 		}
 
 		// Fetch the next word in the attr value
-		if (attr.value.toString().indexOf(' ') === -1) {
+		if (!attr.value.toString().includes(' ')) {
 			// attr value does not have space, so no next word to find
 			continue;
 		}
diff --git a/extensions/emmet/src/test/index.ts b/extensions/emmet/src/test/index.ts
index 4f09c798c31eb1..e36bb6f7c77fbf 100644
--- a/extensions/emmet/src/test/index.ts
+++ b/extensions/emmet/src/test/index.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-const path = require('path');
-const testRunner = require('../../../../test/integration/electron/testrunner');
+import * as path from 'path';
+import * as testRunner from '../../../../test/integration/electron/testrunner';
 
-const options: any = {
+const options: import('mocha').MochaOptions = {
 	ui: 'tdd',
 	color: true,
 	timeout: 60000
diff --git a/extensions/fsharp/package.json b/extensions/fsharp/package.json
index b6c07d40b1b37f..c88c1a7f194887 100644
--- a/extensions/fsharp/package.json
+++ b/extensions/fsharp/package.json
@@ -41,7 +41,12 @@
         "language": "fsharp",
         "path": "./snippets/fsharp.code-snippets"
       }
-    ]
+    ],
+    "configurationDefaults": {
+      "[fsharp]": {
+        "diffEditor.ignoreTrimWhitespace": false
+      }
+    }
   },
   "repository": {
     "type": "git",
diff --git a/extensions/git/package.json b/extensions/git/package.json
index a5c261ba3ed2a2..560623ee3b28d2 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -53,34 +53,40 @@
       {
         "command": "git.clone",
         "title": "%command.clone%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.cloneRecursive",
         "title": "%command.cloneRecursive%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.init",
         "title": "%command.init%",
         "category": "Git",
-        "icon": "$(add)"
+        "icon": "$(add)",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.openRepository",
         "title": "%command.openRepository%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.close",
         "title": "%command.close%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.refresh",
         "title": "%command.refresh%",
         "category": "Git",
-        "icon": "$(refresh)"
+        "icon": "$(refresh)",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.openChange",
@@ -114,198 +120,215 @@
         "command": "git.stage",
         "title": "%command.stage%",
         "category": "Git",
-        "icon": "$(add)"
+        "icon": "$(add)",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.stageAll",
         "title": "%command.stageAll%",
         "category": "Git",
-        "icon": "$(add)"
+        "icon": "$(add)",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.stageAllTracked",
         "title": "%command.stageAllTracked%",
         "category": "Git",
-        "icon": "$(add)"
+        "icon": "$(add)",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.stageAllUntracked",
         "title": "%command.stageAllUntracked%",
         "category": "Git",
-        "icon": "$(add)"
+        "icon": "$(add)",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.stageAllMerge",
         "title": "%command.stageAllMerge%",
         "category": "Git",
-        "icon": "$(add)"
+        "icon": "$(add)",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.stageSelectedRanges",
         "title": "%command.stageSelectedRanges%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.revertSelectedRanges",
         "title": "%command.revertSelectedRanges%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.stageChange",
         "title": "%command.stageChange%",
         "category": "Git",
-        "icon": "$(add)"
+        "icon": "$(add)",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.revertChange",
         "title": "%command.revertChange%",
         "category": "Git",
-        "icon": "$(discard)"
+        "icon": "$(discard)",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.unstage",
         "title": "%command.unstage%",
         "category": "Git",
-        "icon": "$(remove)"
+        "icon": "$(remove)",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.unstageAll",
         "title": "%command.unstageAll%",
         "category": "Git",
-        "icon": "$(remove)"
+        "icon": "$(remove)",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.unstageSelectedRanges",
         "title": "%command.unstageSelectedRanges%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.clean",
         "title": "%command.clean%",
         "category": "Git",
-        "icon": "$(discard)"
+        "icon": "$(discard)",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.cleanAll",
         "title": "%command.cleanAll%",
         "category": "Git",
-        "icon": "$(discard)"
+        "icon": "$(discard)",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.cleanAllTracked",
         "title": "%command.cleanAllTracked%",
         "category": "Git",
-        "icon": "$(discard)"
+        "icon": "$(discard)",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.cleanAllUntracked",
         "title": "%command.cleanAllUntracked%",
         "category": "Git",
-        "icon": "$(discard)"
+        "icon": "$(discard)",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.rename",
         "title": "%command.rename%",
         "category": "Git",
-        "icon": "$(discard)"
+        "icon": "$(discard)",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.commit",
         "title": "%command.commit%",
         "category": "Git",
         "icon": "$(check)",
-        "enablement": "!commitInProgress"
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.commitStaged",
         "title": "%command.commitStaged%",
         "category": "Git",
-        "enablement": "!commitInProgress"
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.commitEmpty",
         "title": "%command.commitEmpty%",
         "category": "Git",
-        "enablement": "!commitInProgress"
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.commitStagedSigned",
         "title": "%command.commitStagedSigned%",
         "category": "Git",
-        "enablement": "!commitInProgress"
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.commitStagedAmend",
         "title": "%command.commitStagedAmend%",
         "category": "Git",
-        "enablement": "!commitInProgress"
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.commitAll",
         "title": "%command.commitAll%",
         "category": "Git",
-        "enablement": "!commitInProgress"
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.commitAllSigned",
         "title": "%command.commitAllSigned%",
         "category": "Git",
-        "enablement": "!commitInProgress"
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.commitAllAmend",
         "title": "%command.commitAllAmend%",
         "category": "Git",
-        "enablement": "!commitInProgress"
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.commitNoVerify",
         "title": "%command.commitNoVerify%",
         "category": "Git",
         "icon": "$(check)",
-        "enablement": "!commitInProgress"
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.commitStagedNoVerify",
         "title": "%command.commitStagedNoVerify%",
         "category": "Git",
-        "enablement": "!commitInProgress"
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.commitEmptyNoVerify",
         "title": "%command.commitEmptyNoVerify%",
         "category": "Git",
-        "enablement": "!commitInProgress"
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.commitStagedSignedNoVerify",
         "title": "%command.commitStagedSignedNoVerify%",
         "category": "Git",
-        "enablement": "!commitInProgress"
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.commitStagedAmendNoVerify",
         "title": "%command.commitStagedAmendNoVerify%",
         "category": "Git",
-        "enablement": "!commitInProgress"
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.commitAllNoVerify",
         "title": "%command.commitAllNoVerify%",
         "category": "Git",
-        "enablement": "!commitInProgress"
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.commitAllSignedNoVerify",
         "title": "%command.commitAllSignedNoVerify%",
         "category": "Git",
-        "enablement": "!commitInProgress"
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.commitAllAmendNoVerify",
         "title": "%command.commitAllAmendNoVerify%",
         "category": "Git",
-        "enablement": "!commitInProgress"
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.commitMessageAccept",
@@ -322,163 +345,194 @@
       {
         "command": "git.restoreCommitTemplate",
         "title": "%command.restoreCommitTemplate%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.undoCommit",
         "title": "%command.undoCommit%",
         "category": "Git",
-        "enablement": "!commitInProgress"
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.checkout",
         "title": "%command.checkout%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.checkoutDetached",
         "title": "%command.checkoutDetached%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.branch",
         "title": "%command.branch%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.branchFrom",
         "title": "%command.branchFrom%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.deleteBranch",
         "title": "%command.deleteBranch%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.renameBranch",
         "title": "%command.renameBranch%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.merge",
         "title": "%command.merge%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.mergeAbort",
         "title": "%command.mergeAbort%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "gitMergeInProgress"
       },
       {
         "command": "git.rebase",
         "title": "%command.rebase%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.createTag",
         "title": "%command.createTag%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.deleteTag",
         "title": "%command.deleteTag%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.fetch",
         "title": "%command.fetch%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.fetchPrune",
         "title": "%command.fetchPrune%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.fetchAll",
         "title": "%command.fetchAll%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.pull",
         "title": "%command.pull%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.pullRebase",
         "title": "%command.pullRebase%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.pullFrom",
         "title": "%command.pullFrom%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.push",
         "title": "%command.push%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.pushForce",
         "title": "%command.pushForce%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.pushTo",
         "title": "%command.pushTo%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.pushToForce",
         "title": "%command.pushToForce%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.pushTags",
         "title": "%command.pushTags%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.pushWithTags",
         "title": "%command.pushFollowTags%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.pushWithTagsForce",
         "title": "%command.pushFollowTagsForce%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.cherryPick",
         "title": "%command.cherryPick%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.addRemote",
         "title": "%command.addRemote%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.removeRemote",
         "title": "%command.removeRemote%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.sync",
         "title": "%command.sync%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.syncRebase",
         "title": "%command.syncRebase%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.publish",
         "title": "%command.publish%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.showOutput",
@@ -488,7 +542,8 @@
       {
         "command": "git.ignore",
         "title": "%command.ignore%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.revealInExplorer",
@@ -513,42 +568,56 @@
       {
         "command": "git.stashIncludeUntracked",
         "title": "%command.stashIncludeUntracked%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.stash",
         "title": "%command.stash%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
+      },
+      {
+        "command": "git.stashStaged",
+        "title": "%command.stashStaged%",
+        "category": "Git",
+        "enablement": "!operationInProgress && gitVersion2.35"
       },
       {
         "command": "git.stashPop",
         "title": "%command.stashPop%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.stashPopLatest",
         "title": "%command.stashPopLatest%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.stashApply",
         "title": "%command.stashApply%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.stashApplyLatest",
         "title": "%command.stashApplyLatest%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.stashDrop",
         "title": "%command.stashDrop%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.stashDropAll",
         "title": "%command.stashDropAll%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!operationInProgress"
       },
       {
         "command": "git.timeline.openDiff",
@@ -579,7 +648,8 @@
       {
         "command": "git.rebaseAbort",
         "title": "%command.rebaseAbort%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "gitRebaseInProgress"
       },
       {
         "command": "git.closeAllDiffEditors",
@@ -625,13 +695,8 @@
         "enablement": "isMergeEditor"
       },
       {
-        "command": "git.addSafeDirectoryAndOpenRepository",
-        "title": "%command.addSafeDirectoryAndOpenRepository%",
-        "category": "Git"
-      },
-      {
-        "command": "git.api.getUnsafeRepositories",
-        "title": "%command.api.getUnsafeRepositories%",
+        "command": "git.manageUnsafeRepositories",
+        "title": "%command.manageUnsafeRepositories%",
         "category": "Git"
       }
     ],
@@ -997,6 +1062,10 @@
           "command": "git.stash",
           "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"
         },
+        {
+          "command": "git.stashStaged",
+          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && gitVersion2.35"
+        },
         {
           "command": "git.stashPop",
           "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"
@@ -1057,16 +1126,12 @@
           "command": "git.api.getRemoteSources",
           "when": "false"
         },
-        {
-          "command": "git.api.getUnsafeRepositories",
-          "when": "false"
-        },
         {
           "command": "git.openMergeEditor",
           "when": "false"
         },
         {
-          "command": "git.addSafeDirectoryAndOpenRepository",
+          "command": "git.manageUnsafeRepositories",
           "when": "config.git.enabled && !git.missing && git.unsafeRepositoryCount != 0"
         }
       ],
@@ -1827,28 +1892,33 @@
           "group": "stash@2"
         },
         {
-          "command": "git.stashApplyLatest",
+          "command": "git.stashStaged",
+          "when": "gitVersion2.35",
           "group": "stash@3"
         },
         {
-          "command": "git.stashApply",
+          "command": "git.stashApplyLatest",
           "group": "stash@4"
         },
         {
-          "command": "git.stashPopLatest",
+          "command": "git.stashApply",
           "group": "stash@5"
         },
         {
-          "command": "git.stashPop",
+          "command": "git.stashPopLatest",
           "group": "stash@6"
         },
         {
-          "command": "git.stashDrop",
+          "command": "git.stashPop",
           "group": "stash@7"
         },
         {
-          "command": "git.stashDropAll",
+          "command": "git.stashDrop",
           "group": "stash@8"
+        },
+        {
+          "command": "git.stashDropAll",
+          "group": "stash@9"
         }
       ],
       "git.tags": [
@@ -2776,7 +2846,7 @@
   },
   "dependencies": {
     "@joaomoreno/unique-names-generator": "^5.1.0",
-    "@vscode/extension-telemetry": "0.7.1-preview",
+    "@vscode/extension-telemetry": "0.7.3-preview",
     "@vscode/iconv-lite-umd": "0.7.0",
     "byline": "^5.0.0",
     "file-type": "16.5.4",
diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
index 4aef845715c635..a50c35800c1fb9 100644
--- a/extensions/git/package.nls.json
+++ b/extensions/git/package.nls.json
@@ -88,6 +88,7 @@
 	"command.rebaseAbort": "Abort Rebase",
 	"command.stashIncludeUntracked": "Stash (Include Untracked)",
 	"command.stash": "Stash",
+	"command.stashStaged": "Stash (Staged)",
 	"command.stashPop": "Pop Stash...",
 	"command.stashPopLatest": "Pop Latest Stash",
 	"command.stashApply": "Apply Stash...",
@@ -99,11 +100,10 @@
 	"command.timelineCopyCommitMessage": "Copy Commit Message",
 	"command.timelineSelectForCompare": "Select for Compare",
 	"command.timelineCompareWithSelected": "Compare with Selected",
-	"command.addSafeDirectoryAndOpenRepository": "Mark Repository as Safe and Open",
+	"command.manageUnsafeRepositories": "Manage Unsafe Repositories",
 	"command.api.getRepositories": "Get Repositories",
 	"command.api.getRepositoryState": "Get Repository State",
 	"command.api.getRemoteSources": "Get Remote Sources",
-	"command.api.getUnsafeRepositories": "Get Unsafe Repositories",
 	"command.git.acceptMerge": "Complete Merge",
 	"command.git.openMergeEditor": "Resolve in Merge Editor",
 	"command.git.runGitMerge": "Compute Conflicts With Git",
@@ -158,7 +158,7 @@
 	"config.discardAllScope": "Controls what changes are discarded by the `Discard all changes` command. `all` discards all changes. `tracked` discards only tracked files. `prompt` shows a prompt dialog every time the action is run.",
 	"config.decorations.enabled": "Controls whether Git contributes colors and badges to the Explorer and the Open Editors view.",
 	"config.enableStatusBarSync": "Controls whether the Git Sync command appears in the status bar.",
-	"config.followTagsWhenSync": "Follow push all tags when running the sync command.",
+	"config.followTagsWhenSync": "Push all annotated tags when running the sync command.",
 	"config.promptToSaveFilesBeforeStash": "Controls whether Git should check for unsaved files before stashing changes.",
 	"config.promptToSaveFilesBeforeStash.always": "Check for any unsaved files.",
 	"config.promptToSaveFilesBeforeStash.staged": "Check only for unsaved staged files.",
@@ -331,19 +331,17 @@
 		"message": "Scanning workspace for git repositories..."
 	},
 	"view.workbench.scm.unsafeRepository": {
-		"message": "The git repository in the following folder has been detected as potentially unsafe as the folder is owned by someone else other than the current user: ${command:git.api.getUnsafeRepositories}.\nDo you want to open the repository?\n[Open Repository](command:git.addSafeDirectoryAndOpenRepository)\n[Learn More](https://aka.ms/vscode-scm)",
+		"message": "The detected git repository is potentially unsafe as the folder is owned by someone other than the current user.\n[Manage Unsafe Repositories](command:git.manageUnsafeRepositories)\nTo learn more about unsafe repositories [read our docs](https://aka.ms/vscode-git-unsafe-repository).",
 		"comment": [
-			"{Locked='](command:git.api.getUnsafeRepositories'}",
-			"{Locked='](command:git.addSafeDirectoryAndOpenRepository'}",
+			"{Locked='](command:git.manageUnsafeRepositories'}",
 			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
 		]
 	},
 	"view.workbench.scm.unsafeRepositories": {
-		"message": "The git repositories in the following folders have been detected as potentially unsafe as the folder is owned by someone else other than the current user: ${command:git.api.getUnsafeRepositories}.\nDo you want to open the repositories?\n[Open Repositories](command:git.addSafeDirectoryAndOpenRepository)\n[Learn More](https://aka.ms/vscode-scm)",
+		"message": "The detected git repositories are potentially unsafe as the folders are owned by someone other than the current user.\n[Manage Unsafe Repositories](command:git.manageUnsafeRepositories)\nTo learn more about unsafe repositories [read our docs](https://aka.ms/vscode-git-unsafe-repository).",
 		"comment": [
-			"{Locked='](command:git.api.getUnsafeRepositories'}",
-			"{Locked='](command:git.addSafeDirectoryAndOpenRepository'}",
+			"{Locked='](command:git.manageUnsafeRepositories'}",
 			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
 		]
diff --git a/extensions/git/src/actionButton.ts b/extensions/git/src/actionButton.ts
index aa49d179c8a4ba..261d637fd0eee3 100644
--- a/extensions/git/src/actionButton.ts
+++ b/extensions/git/src/actionButton.ts
@@ -5,8 +5,9 @@
 
 import { Command, Disposable, Event, EventEmitter, SourceControlActionButton, Uri, workspace, l10n } from 'vscode';
 import { Branch, Status } from './api/git';
+import { OperationKind } from './operation';
 import { CommitCommandsCenter } from './postCommitCommands';
-import { Repository, Operation } from './repository';
+import { Repository } from './repository';
 import { dispose } from './util';
 
 interface ActionButtonState {
@@ -181,14 +182,14 @@ export class ActionButtonCommand {
 
 	private onDidChangeOperations(): void {
 		const isCommitInProgress =
-			this.repository.operations.isRunning(Operation.Commit) ||
-			this.repository.operations.isRunning(Operation.PostCommitCommand) ||
-			this.repository.operations.isRunning(Operation.RebaseContinue);
+			this.repository.operations.isRunning(OperationKind.Commit) ||
+			this.repository.operations.isRunning(OperationKind.PostCommitCommand) ||
+			this.repository.operations.isRunning(OperationKind.RebaseContinue);
 
 		const isSyncInProgress =
-			this.repository.operations.isRunning(Operation.Sync) ||
-			this.repository.operations.isRunning(Operation.Push) ||
-			this.repository.operations.isRunning(Operation.Pull);
+			this.repository.operations.isRunning(OperationKind.Sync) ||
+			this.repository.operations.isRunning(OperationKind.Push) ||
+			this.repository.operations.isRunning(OperationKind.Pull);
 
 		this.state = { ...this.state, isCommitInProgress, isSyncInProgress };
 	}
diff --git a/extensions/git/src/api/git.d.ts b/extensions/git/src/api/git.d.ts
index a079ee1f8f8294..dc9a1c8d99e109 100644
--- a/extensions/git/src/api/git.d.ts
+++ b/extensions/git/src/api/git.d.ts
@@ -352,5 +352,6 @@ export const enum GitErrorCodes {
 	UnknownPath = 'UnknownPath',
 	EmptyCommitMessage = 'EmptyCommitMessage',
 	BranchFastForwardRejected = 'BranchFastForwardRejected',
+	BranchNotYetBorn = 'BranchNotYetBorn',
 	TagConflict = 'TagConflict'
 }
diff --git a/extensions/git/src/autofetch.ts b/extensions/git/src/autofetch.ts
index 6c1271f24b90a4..fbd0c821113aae 100644
--- a/extensions/git/src/autofetch.ts
+++ b/extensions/git/src/autofetch.ts
@@ -3,15 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { workspace, Disposable, EventEmitter, Memento, window, MessageItem, ConfigurationTarget, Uri, ConfigurationChangeEvent, l10n } from 'vscode';
-import { Repository, Operation } from './repository';
+import { workspace, Disposable, EventEmitter, Memento, window, MessageItem, ConfigurationTarget, Uri, ConfigurationChangeEvent, l10n, env } from 'vscode';
+import { Repository } from './repository';
 import { eventToPromise, filterEvent, onceEvent } from './util';
 import { GitErrorCodes } from './api/git';
 
-function isRemoteOperation(operation: Operation): boolean {
-	return operation === Operation.Pull || operation === Operation.Push || operation === Operation.Sync || operation === Operation.Fetch;
-}
-
 export class AutoFetcher {
 
 	private static DidInformUser = 'autofetch.didInformUser';
@@ -30,7 +26,7 @@ export class AutoFetcher {
 		workspace.onDidChangeConfiguration(this.onConfiguration, this, this.disposables);
 		this.onConfiguration();
 
-		const onGoodRemoteOperation = filterEvent(repository.onDidRunOperation, ({ operation, error }) => !error && isRemoteOperation(operation));
+		const onGoodRemoteOperation = filterEvent(repository.onDidRunOperation, ({ operation, error }) => !error && operation.remote);
 		const onFirstGoodRemoteOperation = onceEvent(onGoodRemoteOperation);
 		onFirstGoodRemoteOperation(this.onFirstGoodRemoteOperation, this, this.disposables);
 	}
@@ -51,7 +47,7 @@ export class AutoFetcher {
 		const yes: MessageItem = { title: l10n.t('Yes') };
 		const no: MessageItem = { isCloseAffordance: true, title: l10n.t('No') };
 		const askLater: MessageItem = { title: l10n.t('Ask Me Later') };
-		const result = await window.showInformationMessage(l10n.t('Would you like Code to [periodically run "git fetch"]({0})?', 'https://go.microsoft.com/fwlink/?linkid=865294'), yes, no, askLater);
+		const result = await window.showInformationMessage(l10n.t('Would you like {0} to [periodically run "git fetch"]({1})?', env.appName, 'https://go.microsoft.com/fwlink/?linkid=865294'), yes, no, askLater);
 
 		if (result === askLater) {
 			return;
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index 4aa0431a986189..06bc8e31b4e2ec 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -36,16 +36,7 @@ class CheckoutItem implements QuickPickItem {
 		const config = workspace.getConfiguration('git', Uri.file(this.repository.root));
 		const pullBeforeCheckout = config.get<boolean>('pullBeforeCheckout', false) === true;
 
-		if (pullBeforeCheckout) {
-			try {
-				await this.repository.fastForwardBranch(this.ref.name!);
-			}
-			catch (err) {
-				// noop
-			}
-		}
-
-		await this.repository.checkout(this.ref.name, opts);
+		await this.repository.checkout(this.ref.name, { ...opts, pullBeforeCheckout });
 	}
 }
 
@@ -77,6 +68,11 @@ class CheckoutRemoteHeadItem extends CheckoutItem {
 			return;
 		}
 
+		if (opts?.detached) {
+			await this.repository.checkout(this.ref.name, opts);
+			return;
+		}
+
 		const branches = await this.repository.findTrackingBranches(this.ref.name);
 
 		if (branches.length > 0) {
@@ -194,6 +190,14 @@ class FetchAllRemotesItem implements QuickPickItem {
 	}
 }
 
+class UnsafeRepositoryItem implements QuickPickItem {
+	get label(): string {
+		return `$(repo) ${this.path}`;
+	}
+
+	constructor(public readonly path: string) { }
+}
+
 interface ScmCommandOptions {
 	repository?: boolean;
 	diff?: boolean;
@@ -1123,7 +1127,7 @@ export class CommandCenter {
 
 		await this._stageChanges(textEditor, [changes[index]]);
 
-		const firstStagedLine = changes[index].modifiedStartLineNumber - 1;
+		const firstStagedLine = changes[index].modifiedStartLineNumber;
 		textEditor.selections = [new Selection(firstStagedLine, 0, firstStagedLine, 0)];
 	}
 
@@ -1142,6 +1146,7 @@ export class CommandCenter {
 			.filter(d => !!d) as LineChange[];
 
 		if (!selectedChanges.length) {
+			window.showInformationMessage(l10n.t('The selection range does not contain any changes.'));
 			return;
 		}
 
@@ -1280,7 +1285,7 @@ export class CommandCenter {
 
 		await this._revertChanges(textEditor, [...changes.slice(0, index), ...changes.slice(index + 1)]);
 
-		const firstStagedLine = changes[index].modifiedStartLineNumber - 1;
+		const firstStagedLine = changes[index].modifiedStartLineNumber;
 		textEditor.selections = [new Selection(firstStagedLine, 0, firstStagedLine, 0)];
 	}
 
@@ -1300,6 +1305,7 @@ export class CommandCenter {
 		});
 
 		if (selectedChanges.length === changes.length) {
+			window.showInformationMessage(l10n.t('The selection range does not contain any changes.'));
 			return;
 		}
 
@@ -1389,6 +1395,7 @@ export class CommandCenter {
 			.filter(d => !!d) as LineChange[];
 
 		if (!selectedDiffs.length) {
+			window.showInformationMessage(l10n.t('The selection range does not contain any changes.'));
 			return;
 		}
 
@@ -1400,7 +1407,20 @@ export class CommandCenter {
 
 	@command('git.clean')
 	async clean(...resourceStates: SourceControlResourceState[]): Promise<void> {
-		resourceStates = resourceStates.filter(s => !!s);
+		// Remove duplicate resources
+		const resourceUris = new Set<string>();
+		resourceStates = resourceStates.filter(s => {
+			if (s === undefined) {
+				return false;
+			}
+
+			if (resourceUris.has(s.resourceUri.toString())) {
+				return false;
+			}
+
+			resourceUris.add(s.resourceUri.toString());
+			return true;
+		});
 
 		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
 			const resource = this.getSCMResource();
@@ -1828,7 +1848,8 @@ export class CommandCenter {
 
 	@command('git.commitMessageAccept')
 	async commitMessageAccept(arg?: Uri): Promise<void> {
-		if (!arg) { return; }
+		if (!arg && !window.activeTextEditor) { return; }
+		arg ??= window.activeTextEditor!.document.uri;
 
 		// Close the tab
 		this._closeEditorTab(arg);
@@ -1836,11 +1857,12 @@ export class CommandCenter {
 
 	@command('git.commitMessageDiscard')
 	async commitMessageDiscard(arg?: Uri): Promise<void> {
-		if (!arg) { return; }
+		if (!arg && !window.activeTextEditor) { return; }
+		arg ??= window.activeTextEditor!.document.uri;
 
 		// Clear the contents of the editor
 		const editors = window.visibleTextEditors
-			.filter(e => e.document.languageId === 'git-commit' && e.document.uri.toString() === arg.toString());
+			.filter(e => e.document.languageId === 'git-commit' && e.document.uri.toString() === arg!.toString());
 
 		if (editors.length !== 1) { return; }
 
@@ -2030,17 +2052,21 @@ export class CommandCenter {
 					throw err;
 				}
 
-				const force = l10n.t('Force Checkout');
 				const stash = l10n.t('Stash & Checkout');
-				const choice = await window.showWarningMessage(l10n.t('Your local changes would be overwritten by checkout.'), { modal: true }, force, stash);
+				const migrate = l10n.t('Migrate Changes');
+				const force = l10n.t('Force Checkout');
+				const choice = await window.showWarningMessage(l10n.t('Your local changes would be overwritten by checkout.'), { modal: true }, stash, migrate, force);
 
 				if (choice === force) {
 					await this.cleanAll(repository);
 					await item.run(opts);
-				} else if (choice === stash) {
+				} else if (choice === stash || choice === migrate) {
 					await this.stash(repository);
 					await item.run(opts);
-					await this.stashPopLatest(repository);
+
+					if (choice === migrate) {
+						await this.stashPopLatest(repository);
+					}
 				}
 			}
 		}
@@ -2679,16 +2705,16 @@ export class CommandCenter {
 			return;
 		}
 
-		const picks = remotes.map(r => r.name);
+		const picks: RemoteItem[] = repository.remotes.map(r => new RemoteItem(repository, r));
 		const placeHolder = l10n.t('Pick a remote to remove');
 
-		const remoteName = await window.showQuickPick(picks, { placeHolder });
+		const remote = await window.showQuickPick(picks, { placeHolder });
 
-		if (!remoteName) {
+		if (!remote) {
 			return;
 		}
 
-		await repository.removeRemote(remoteName);
+		await repository.removeRemote(remote.remoteName);
 	}
 
 	private async _sync(repository: Repository, rebase: boolean): Promise<void> {
@@ -2889,14 +2915,21 @@ export class CommandCenter {
 		await commands.executeCommand('revealFileInOS', resourceState.resourceUri);
 	}
 
-	private async _stash(repository: Repository, includeUntracked = false): Promise<void> {
+	private async _stash(repository: Repository, includeUntracked = false, staged = false): Promise<void> {
 		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0
 			&& (!includeUntracked || repository.untrackedGroup.resourceStates.length === 0);
 		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
 
-		if (noUnstagedChanges && noStagedChanges) {
-			window.showInformationMessage(l10n.t('There are no changes to stash.'));
-			return;
+		if (staged) {
+			if (noStagedChanges) {
+				window.showInformationMessage(l10n.t('There are no staged changes to stash.'));
+				return;
+			}
+		} else {
+			if (noUnstagedChanges && noStagedChanges) {
+				window.showInformationMessage(l10n.t('There are no changes to stash.'));
+				return;
+			}
 		}
 
 		const config = workspace.getConfiguration('git', Uri.file(repository.root));
@@ -2943,7 +2976,16 @@ export class CommandCenter {
 			return;
 		}
 
-		await repository.createStash(message, includeUntracked);
+		try {
+			await repository.createStash(message, includeUntracked, staged);
+		} catch (err) {
+			if (/You do not have the initial commit yet/.test(err.stderr || '')) {
+				window.showInformationMessage(l10n.t('The repository does not have any commits. Please make an initial commit before creating a stash.'));
+				return;
+			}
+
+			throw err;
+		}
 	}
 
 	@command('git.stash', { repository: true })
@@ -2951,6 +2993,11 @@ export class CommandCenter {
 		return this._stash(repository);
 	}
 
+	@command('git.stashStaged', { repository: true })
+	stashStaged(repository: Repository): Promise<void> {
+		return this._stash(repository, false, true);
+	}
+
 	@command('git.stashIncludeUntracked', { repository: true })
 	stashIncludeUntracked(repository: Repository): Promise<void> {
 		return this._stash(repository, true);
@@ -3182,15 +3229,49 @@ export class CommandCenter {
 		repository.closeDiffEditors(undefined, undefined, true);
 	}
 
-	@command('git.api.getUnsafeRepositories')
-	getUnsafeRepositories(): string {
-		const repositories = Array.from(this.model.unsafeRepositories.values());
-		return repositories.sort().map(m => `"${m}"`).join(', ');
-	}
+	@command('git.manageUnsafeRepositories')
+	async manageUnsafeRepositories(): Promise<void> {
+		const unsafeRepositories: string[] = [];
+
+		const quickpick = window.createQuickPick();
+		quickpick.title = l10n.t('Manage Unsafe Repositories');
+		quickpick.placeholder = l10n.t('Pick a repository to mark as safe and open');
 
-	@command('git.addSafeDirectoryAndOpenRepository')
-	async addSafeDirectoryAndOpenRepository(): Promise<void> {
-		await this.model.addSafeDirectoryAndOpenRepository();
+		const allRepositoriesLabel = l10n.t('All Repositories');
+		const allRepositoriesQuickPickItem: QuickPickItem = { label: allRepositoriesLabel };
+		const repositoriesQuickPickItems: QuickPickItem[] = Array.from(this.model.unsafeRepositories.keys()).sort().map(r => new UnsafeRepositoryItem(r));
+
+		quickpick.items = this.model.unsafeRepositories.size === 1 ? [...repositoriesQuickPickItems] :
+			[...repositoriesQuickPickItems, { label: '', kind: QuickPickItemKind.Separator }, allRepositoriesQuickPickItem];
+
+		quickpick.show();
+		const repositoryItem = await new Promise<UnsafeRepositoryItem | QuickPickItem | undefined>(
+			resolve => {
+				quickpick.onDidAccept(() => resolve(quickpick.activeItems[0]));
+				quickpick.onDidHide(() => resolve(undefined));
+			});
+		quickpick.hide();
+
+		if (!repositoryItem) {
+			return;
+		}
+
+		if (repositoryItem.label === allRepositoriesLabel) {
+			// All Repositories
+			unsafeRepositories.push(...this.model.unsafeRepositories.keys());
+		} else {
+			// One Repository
+			unsafeRepositories.push((repositoryItem as UnsafeRepositoryItem).path);
+		}
+
+		for (const unsafeRepository of unsafeRepositories) {
+			// Mark as Safe
+			await this.git.addSafeDirectory(this.model.unsafeRepositories.get(unsafeRepository)!);
+
+			// Open Repository
+			await this.model.openRepository(unsafeRepository);
+			this.model.unsafeRepositories.delete(unsafeRepository);
+		}
 	}
 
 	private createCommand(id: string, key: string, method: Function, options: ScmCommandOptions): (...args: any[]) => any {
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index 4262600197e3c4..f0c4887f104490 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -709,9 +709,9 @@ interface GitConfigSection {
 }
 
 class GitConfigParser {
-	private static readonly _lineSeparator = /\r?\n/g;
+	private static readonly _lineSeparator = /\r?\n/;
 
-	private static readonly _propertyRegex = /^\s*(\w+)\s*=\s*(.*)$/;
+	private static readonly _propertyRegex = /^\s*(\w+)\s*=\s*"?([^"]+)"?$/;
 	private static readonly _sectionRegex = /^\s*\[\s*([^\]]+?)\s*(\"[^"]+\")*\]\s*$/;
 
 	static parse(raw: string): GitConfigSection[] {
@@ -723,13 +723,8 @@ class GitConfigParser {
 			config.sections.push(section);
 		};
 
-		let position = 0;
-		let match: RegExpExecArray | null = null;
-
-		while (match = GitConfigParser._lineSeparator.exec(raw)) {
-			const line = raw.substring(position, match.index);
-			position = match.index + match[0].length;
-
+		for (const line of raw.split(GitConfigParser._lineSeparator)) {
+			// Section
 			const sectionMatch = line.match(GitConfigParser._sectionRegex);
 			if (sectionMatch?.length === 3) {
 				addSection(section);
@@ -738,7 +733,7 @@ class GitConfigParser {
 				continue;
 			}
 
-			// Properties
+			// Property
 			const propertyMatch = line.match(GitConfigParser._propertyRegex);
 			if (propertyMatch?.length === 3 && !Object.keys(section.properties).includes(propertyMatch[1])) {
 				section.properties[propertyMatch[1]] = propertyMatch[2];
@@ -1460,6 +1455,8 @@ export class Repository {
 			if (/Please,? commit your changes or stash them/.test(err.stderr || '')) {
 				err.gitErrorCode = GitErrorCodes.DirtyWorkTree;
 				err.gitTreeish = treeish;
+			} else if (/You are on a branch yet to be born/.test(err.stderr || '')) {
+				err.gitErrorCode = GitErrorCodes.BranchNotYetBorn;
 			}
 
 			throw err;
@@ -1913,7 +1910,7 @@ export class Repository {
 		}
 	}
 
-	async createStash(message?: string, includeUntracked?: boolean): Promise<void> {
+	async createStash(message?: string, includeUntracked?: boolean, staged?: boolean): Promise<void> {
 		try {
 			const args = ['stash', 'push'];
 
@@ -1921,6 +1918,10 @@ export class Repository {
 				args.push('-u');
 			}
 
+			if (staged) {
+				args.push('-S');
+			}
+
 			if (message) {
 				args.push('-m', message);
 			}
diff --git a/extensions/git/src/main.ts b/extensions/git/src/main.ts
index 59870d402d4270..54b86c843dc321 100644
--- a/extensions/git/src/main.ts
+++ b/extensions/git/src/main.ts
@@ -119,6 +119,7 @@ async function createModel(context: ExtensionContext, logger: LogOutputChannel,
 	model.registerPostCommitCommandsProvider(postCommitCommandsProvider);
 
 	checkGitVersion(info);
+	commands.executeCommand('setContext', 'gitVersion2.35', git.compareGitVersionTo('2.35') >= 0);
 
 	return model;
 }
diff --git a/extensions/git/src/model.ts b/extensions/git/src/model.ts
index 501f2fc29473e5..ede813ca36d643 100644
--- a/extensions/git/src/model.ts
+++ b/extensions/git/src/model.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { workspace, WorkspaceFoldersChangeEvent, Uri, window, Event, EventEmitter, QuickPickItem, Disposable, SourceControl, SourceControlResourceGroup, TextEditor, Memento, commands, LogOutputChannel, l10n, ProgressLocation, QuickPickItemKind } from 'vscode';
+import { workspace, WorkspaceFoldersChangeEvent, Uri, window, Event, EventEmitter, QuickPickItem, Disposable, SourceControl, SourceControlResourceGroup, TextEditor, Memento, commands, LogOutputChannel, l10n, ProgressLocation } from 'vscode';
 import TelemetryReporter from '@vscode/extension-telemetry';
-import { Operation, Repository, RepositoryState } from './repository';
+import { Repository, RepositoryState } from './repository';
 import { memoize, sequentialize, debounce } from './decorators';
 import { dispose, anyEvent, filterEvent, isDescendant, pathEquals, toDisposable, eventToPromise } from './util';
 import { Git } from './git';
@@ -18,6 +18,7 @@ import { IPushErrorHandlerRegistry } from './pushError';
 import { ApiRepository } from './api/api1';
 import { IRemoteSourcePublisherRegistry } from './remotePublisher';
 import { IPostCommitCommandsProviderRegistry } from './postCommitCommands';
+import { OperationKind } from './operation';
 
 class RepositoryPick implements QuickPickItem {
 	@memoize get label(): string {
@@ -33,21 +34,26 @@ class RepositoryPick implements QuickPickItem {
 	constructor(public readonly repository: Repository, public readonly index: number) { }
 }
 
-class UnsafeRepositorySet extends Set<string> {
+/**
+ * Key   - normalized path used in user interface
+ * Value - path extracted from the output of the `git status` command
+ *         used when calling `git config --global --add safe.directory`
+ */
+class UnsafeRepositoryMap extends Map<string, string> {
 	constructor() {
 		super();
 		this.updateContextKey();
 	}
 
-	override add(value: string): this {
-		const result = super.add(value);
+	override set(key: string, value: string): this {
+		const result = super.set(key, value);
 		this.updateContextKey();
 
 		return result;
 	}
 
-	override delete(value: string): boolean {
-		const result = super.delete(value);
+	override delete(key: string): boolean {
+		const result = super.delete(key);
 		this.updateContextKey();
 
 		return result;
@@ -135,8 +141,8 @@ export class Model implements IRemoteSourcePublisherRegistry, IPostCommitCommand
 	private showRepoOnHomeDriveRootWarning = true;
 	private pushErrorHandlers = new Set<PushErrorHandler>();
 
-	private _unsafeRepositories = new UnsafeRepositorySet();
-	get unsafeRepositories(): Set<string> {
+	private _unsafeRepositories = new UnsafeRepositoryMap();
+	get unsafeRepositories(): Map<string, string> {
 		return this._unsafeRepositories;
 	}
 
@@ -175,9 +181,9 @@ export class Model implements IRemoteSourcePublisherRegistry, IPostCommitCommand
 			await initialScanFn();
 		}
 
-		// Show unsafe repositories notification if we cannot use a welcome view
-		if (this.repositories.length > 0 && this._unsafeRepositories.size > 0) {
-			await this.showUnsafeRepositoryNotification();
+		// Unsafe repositories notification
+		if (this._unsafeRepositories.size !== 0) {
+			this.showUnsafeRepositoryNotification();
 		}
 
 		/* __GDPR__
@@ -430,18 +436,17 @@ export class Model implements IRemoteSourcePublisherRegistry, IPostCommitCommand
 			repository.status(); // do not await this, we want SCM to know about the repo asap
 		} catch (ex) {
 			// Handle unsafe repository
-			const match = /^fatal: detected dubious ownership in repository at \'([^']+)\'$/m.exec(ex.stderr);
-			if (match && match.length === 2) {
-				const unsafeRepositoryPath = match[1];
+			const match = /^fatal: detected dubious ownership in repository at \'([^']+)\'[\s\S]*git config --global --add safe\.directory '?([^'\n]+)'?$/m.exec(ex.stderr);
+			if (match && match.length === 3) {
+				const unsafeRepositoryPath = path.normalize(match[1]);
 				this.logger.trace(`Unsafe repository: ${unsafeRepositoryPath}`);
 
-				// If the unsafe repository is opened after the initial repository scan, and we cannot use the welcome view
-				// as there is already at least one opened repository, we will be showing a notification for the repository.
-				if (this._state === 'initialized' && this.openRepositories.length > 0 && !this._unsafeRepositories.has(unsafeRepositoryPath)) {
-					this.showUnsafeRepositoryNotification(unsafeRepositoryPath);
+				// Show a notification if the unsafe repository is opened after the initial repository scan
+				if (this._state === 'initialized' && !this._unsafeRepositories.has(unsafeRepositoryPath)) {
+					this.showUnsafeRepositoryNotification();
 				}
 
-				this._unsafeRepositories.add(unsafeRepositoryPath);
+				this._unsafeRepositories.set(unsafeRepositoryPath, match[2]);
 
 				return;
 			}
@@ -525,21 +530,26 @@ export class Model implements IRemoteSourcePublisherRegistry, IPostCommitCommand
 		});
 		checkForSubmodules();
 
-		const updateCommitInProgressContext = () => {
+		const updateOperationInProgressContext = () => {
 			let commitInProgress = false;
+			let operationInProgress = false;
 			for (const { repository } of this.openRepositories.values()) {
-				if (repository.operations.isRunning(Operation.Commit)) {
+				if (repository.operations.isRunning(OperationKind.Commit)) {
 					commitInProgress = true;
-					break;
+				}
+
+				if (repository.operations.shouldDisableCommands()) {
+					operationInProgress = true;
 				}
 			}
 
 			commands.executeCommand('setContext', 'commitInProgress', commitInProgress);
+			commands.executeCommand('setContext', 'operationInProgress', operationInProgress);
 		};
 
 		const operationEvent = anyEvent(repository.onDidRunOperation as Event<any>, repository.onRunOperation as Event<any>);
-		const operationListener = operationEvent(() => updateCommitInProgressContext());
-		updateCommitInProgressContext();
+		const operationListener = operationEvent(() => updateOperationInProgressContext());
+		updateOperationInProgressContext();
 
 		const dispose = () => {
 			disappearListener.dispose();
@@ -664,7 +674,7 @@ export class Model implements IRemoteSourcePublisherRegistry, IPostCommitCommand
 				return liveRepository;
 			}
 
-			if (hint === repository.mergeGroup || hint === repository.indexGroup || hint === repository.workingTreeGroup) {
+			if (hint === repository.mergeGroup || hint === repository.indexGroup || hint === repository.workingTreeGroup || hint === repository.untrackedGroup) {
 				return liveRepository;
 			}
 		}
@@ -727,72 +737,21 @@ export class Model implements IRemoteSourcePublisherRegistry, IPostCommitCommand
 		return [...this.pushErrorHandlers];
 	}
 
-	async addSafeDirectoryAndOpenRepository() {
-		const unsafeRepositories: string[] = [];
-
-		if (this._unsafeRepositories.size === 1) {
-			// One unsafe repository
-			unsafeRepositories.push(this._unsafeRepositories.values().next().value);
-		} else {
-			// Multiple unsafe repositories
-			const allRepositoriesLabel = l10n.t('All Repositories');
-			const allRepositoriesQuickPickItem: QuickPickItem = { label: allRepositoriesLabel };
-			const repositoriesQuickPickItems: QuickPickItem[] = Array.from(this._unsafeRepositories.values()).sort().map(r => ({ label: `$(repo) ${r}` }));
-
-			const quickpick = window.createQuickPick();
-			quickpick.title = l10n.t('Mark Repository as Safe and Open');
-			quickpick.placeholder = l10n.t('Pick a repository to mark as safe and open');
-			quickpick.items = [...repositoriesQuickPickItems, { label: '', kind: QuickPickItemKind.Separator }, allRepositoriesQuickPickItem];
-
-			quickpick.show();
-			const repositoryItem = await new Promise<string | undefined>(
-				resolve => {
-					quickpick.onDidAccept(() => resolve(quickpick.activeItems[0].label));
-					quickpick.onDidHide(() => resolve(undefined));
-				});
-			quickpick.hide();
-
-			if (!repositoryItem) {
-				return;
-			}
-
-			if (repositoryItem === allRepositoriesLabel) {
-				// All Repositories
-				unsafeRepositories.push(...this._unsafeRepositories.values());
-			} else {
-				// One Repository
-				unsafeRepositories.push(repositoryItem);
-			}
-		}
-
-		for (const unsafeRepository of unsafeRepositories) {
-			// Mark as Safe
-			await this.git.addSafeDirectory(unsafeRepository);
-
-			// Open Repository
-			await this.openRepository(unsafeRepository);
-			this._unsafeRepositories.delete(unsafeRepository);
-		}
-	}
-
-	private async showUnsafeRepositoryNotification(path?: string): Promise<void> {
-		const unsafeRepositoryPaths: string[] = path ? [path] : Array.from(this._unsafeRepositories.values());
-		const unsafeRepositoryPathLabels = unsafeRepositoryPaths.sort().map(m => `"${m}"`).join(', ');
-
-		const message = unsafeRepositoryPaths.length === 1 ?
-			l10n.t('The git repository in the following folder has been detected as potentially unsafe as the folder is owned by someone else other than the current user: {0}. Do you want to open the repository?', unsafeRepositoryPathLabels) :
-			l10n.t('The git repositories in the following folders have been detected as potentially unsafe as the folder is owned by someone else other than the current user: {0}. Do you want to open the repositories?', unsafeRepositoryPathLabels);
+	private async showUnsafeRepositoryNotification(): Promise<void> {
+		const message = this._unsafeRepositories.size === 1 ?
+			l10n.t('The git repository in the current folder is potentially unsafe as the folder is owned by someone other than the current user.') :
+			l10n.t('The git repositories in the current folder are potentially unsafe as the folders are owned by someone other than the current user.');
 
-		const openRepository = unsafeRepositoryPaths.length === 1 ? l10n.t('Open Repository') : l10n.t('Open Repositories');
+		const manageUnsafeRepositories = l10n.t('Manage Unsafe Repositories');
 		const learnMore = l10n.t('Learn More');
 
-		const choice = await window.showErrorMessage(message, openRepository, learnMore);
-		if (choice === openRepository) {
-			// Open Repository
-			await this.addSafeDirectoryAndOpenRepository();
+		const choice = await window.showErrorMessage(message, manageUnsafeRepositories, learnMore);
+		if (choice === manageUnsafeRepositories) {
+			// Manage Unsafe Repositories
+			commands.executeCommand('git.manageUnsafeRepositories');
 		} else if (choice === learnMore) {
 			// Learn More
-			commands.executeCommand('vscode.open', Uri.parse('https://aka.ms/vscode-scm'));
+			commands.executeCommand('vscode.open', Uri.parse('https://aka.ms/vscode-git-unsafe-repository'));
 		}
 	}
 
diff --git a/extensions/git/src/operation.ts b/extensions/git/src/operation.ts
new file mode 100644
index 00000000000000..e36e1bb3abda16
--- /dev/null
+++ b/extensions/git/src/operation.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 { LogOutputChannel } from 'vscode';
+
+export const enum OperationKind {
+	Add = 'Add',
+	AddNoProgress = 'AddNoProgress',
+	Apply = 'Apply',
+	Blame = 'Blame',
+	Branch = 'Branch',
+	CheckIgnore = 'CheckIgnore',
+	Checkout = 'Checkout',
+	CheckoutTracking = 'CheckoutTracking',
+	CherryPick = 'CherryPick',
+	Clean = 'Clean',
+	CleanNoProgress = 'CleanNoProgress',
+	Commit = 'Commit',
+	Config = 'Config',
+	DeleteBranch = 'DeleteBranch',
+	DeleteRef = 'DeleteRef',
+	DeleteTag = 'DeleteTag',
+	Diff = 'Diff',
+	Fetch = 'Fetch',
+	FetchNoProgress = 'FetchNoProgress',
+	FindTrackingBranches = 'GetTracking',
+	GetBranch = 'GetBranch',
+	GetBranches = 'GetBranches',
+	GetCommitTemplate = 'GetCommitTemplate',
+	GetObjectDetails = 'GetObjectDetails',
+	HashObject = 'HashObject',
+	Ignore = 'Ignore',
+	Log = 'Log',
+	LogFile = 'LogFile',
+	Merge = 'Merge',
+	MergeAbort = 'MergeAbort',
+	MergeBase = 'MergeBase',
+	Move = 'Move',
+	PostCommitCommand = 'PostCommitCommand',
+	Pull = 'Pull',
+	Push = 'Push',
+	Remote = 'Remote',
+	RenameBranch = 'RenameBranch',
+	Remove = 'Remove',
+	Reset = 'Reset',
+	Rebase = 'Rebase',
+	RebaseAbort = 'RebaseAbort',
+	RebaseContinue = 'RebaseContinue',
+	RevertFiles = 'RevertFiles',
+	RevertFilesNoProgress = 'RevertFilesNoProgress',
+	SetBranchUpstream = 'SetBranchUpstream',
+	Show = 'Show',
+	Stage = 'Stage',
+	Status = 'Status',
+	Stash = 'Stash',
+	SubmoduleUpdate = 'SubmoduleUpdate',
+	Sync = 'Sync',
+	Tag = 'Tag',
+}
+
+export type Operation = AddOperation | ApplyOperation | BlameOperation | BranchOperation | CheckIgnoreOperation | CherryPickOperation |
+	CheckoutOperation | CheckoutTrackingOperation | CleanOperation | CommitOperation | ConfigOperation | DeleteBranchOperation |
+	DeleteRefOperation | DeleteTagOperation | DiffOperation | FetchOperation | FindTrackingBranchesOperation | GetBranchOperation |
+	GetBranchesOperation | GetCommitTemplateOperation | GetObjectDetailsOperation | HashObjectOperation | IgnoreOperation | LogOperation |
+	LogFileOperation | MergeOperation | MergeAbortOperation | MergeBaseOperation | MoveOperation | PostCommitCommandOperation |
+	PullOperation | PushOperation | RemoteOperation | RenameBranchOperation | RemoveOperation | ResetOperation | RebaseOperation |
+	RebaseAbortOperation | RebaseContinueOperation | RevertFilesOperation | SetBranchUpstreamOperation | ShowOperation | StageOperation |
+	StatusOperation | StashOperation | SubmoduleUpdateOperation | SyncOperation | TagOperation;
+
+type BaseOperation = { kind: OperationKind; blocking: boolean; readOnly: boolean; remote: boolean; retry: boolean; showProgress: boolean };
+export type AddOperation = BaseOperation & { kind: OperationKind.Add };
+export type ApplyOperation = BaseOperation & { kind: OperationKind.Apply };
+export type BlameOperation = BaseOperation & { kind: OperationKind.Blame };
+export type BranchOperation = BaseOperation & { kind: OperationKind.Branch };
+export type CheckIgnoreOperation = BaseOperation & { kind: OperationKind.CheckIgnore };
+export type CherryPickOperation = BaseOperation & { kind: OperationKind.CherryPick };
+export type CheckoutOperation = BaseOperation & { kind: OperationKind.Checkout; refLabel: string };
+export type CheckoutTrackingOperation = BaseOperation & { kind: OperationKind.CheckoutTracking; refLabel: string };
+export type CleanOperation = BaseOperation & { kind: OperationKind.Clean };
+export type CommitOperation = BaseOperation & { kind: OperationKind.Commit };
+export type ConfigOperation = BaseOperation & { kind: OperationKind.Config };
+export type DeleteBranchOperation = BaseOperation & { kind: OperationKind.DeleteBranch };
+export type DeleteRefOperation = BaseOperation & { kind: OperationKind.DeleteRef };
+export type DeleteTagOperation = BaseOperation & { kind: OperationKind.DeleteTag };
+export type DiffOperation = BaseOperation & { kind: OperationKind.Diff };
+export type FetchOperation = BaseOperation & { kind: OperationKind.Fetch };
+export type FindTrackingBranchesOperation = BaseOperation & { kind: OperationKind.FindTrackingBranches };
+export type GetBranchOperation = BaseOperation & { kind: OperationKind.GetBranch };
+export type GetBranchesOperation = BaseOperation & { kind: OperationKind.GetBranches };
+export type GetCommitTemplateOperation = BaseOperation & { kind: OperationKind.GetCommitTemplate };
+export type GetObjectDetailsOperation = BaseOperation & { kind: OperationKind.GetObjectDetails };
+export type HashObjectOperation = BaseOperation & { kind: OperationKind.HashObject };
+export type IgnoreOperation = BaseOperation & { kind: OperationKind.Ignore };
+export type LogOperation = BaseOperation & { kind: OperationKind.Log };
+export type LogFileOperation = BaseOperation & { kind: OperationKind.LogFile };
+export type MergeOperation = BaseOperation & { kind: OperationKind.Merge };
+export type MergeAbortOperation = BaseOperation & { kind: OperationKind.MergeAbort };
+export type MergeBaseOperation = BaseOperation & { kind: OperationKind.MergeBase };
+export type MoveOperation = BaseOperation & { kind: OperationKind.Move };
+export type PostCommitCommandOperation = BaseOperation & { kind: OperationKind.PostCommitCommand };
+export type PullOperation = BaseOperation & { kind: OperationKind.Pull };
+export type PushOperation = BaseOperation & { kind: OperationKind.Push };
+export type RemoteOperation = BaseOperation & { kind: OperationKind.Remote };
+export type RenameBranchOperation = BaseOperation & { kind: OperationKind.RenameBranch };
+export type RemoveOperation = BaseOperation & { kind: OperationKind.Remove };
+export type ResetOperation = BaseOperation & { kind: OperationKind.Reset };
+export type RebaseOperation = BaseOperation & { kind: OperationKind.Rebase };
+export type RebaseAbortOperation = BaseOperation & { kind: OperationKind.RebaseAbort };
+export type RebaseContinueOperation = BaseOperation & { kind: OperationKind.RebaseContinue };
+export type RevertFilesOperation = BaseOperation & { kind: OperationKind.RevertFiles };
+export type SetBranchUpstreamOperation = BaseOperation & { kind: OperationKind.SetBranchUpstream };
+export type ShowOperation = BaseOperation & { kind: OperationKind.Show };
+export type StageOperation = BaseOperation & { kind: OperationKind.Stage };
+export type StatusOperation = BaseOperation & { kind: OperationKind.Status };
+export type StashOperation = BaseOperation & { kind: OperationKind.Stash };
+export type SubmoduleUpdateOperation = BaseOperation & { kind: OperationKind.SubmoduleUpdate };
+export type SyncOperation = BaseOperation & { kind: OperationKind.Sync };
+export type TagOperation = BaseOperation & { kind: OperationKind.Tag };
+
+export const Operation = {
+	Add: (showProgress: boolean) => ({ kind: OperationKind.Add, blocking: false, readOnly: false, remote: false, retry: false, showProgress } as AddOperation),
+	Apply: { kind: OperationKind.Apply, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as ApplyOperation,
+	Blame: { kind: OperationKind.Blame, blocking: false, readOnly: true, remote: false, retry: false, showProgress: true } as BlameOperation,
+	Branch: { kind: OperationKind.Branch, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as BranchOperation,
+	CheckIgnore: { kind: OperationKind.CheckIgnore, blocking: false, readOnly: true, remote: false, retry: false, showProgress: false } as CheckIgnoreOperation,
+	CherryPick: { kind: OperationKind.CherryPick, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as CherryPickOperation,
+	Checkout: (refLabel: string) => ({ kind: OperationKind.Checkout, blocking: true, readOnly: false, remote: false, retry: false, showProgress: true, refLabel } as CheckoutOperation),
+	CheckoutTracking: (refLabel: string) => ({ kind: OperationKind.CheckoutTracking, blocking: true, readOnly: false, remote: false, retry: false, showProgress: true, refLabel } as CheckoutTrackingOperation),
+	Clean: (showProgress: boolean) => ({ kind: OperationKind.Clean, blocking: false, readOnly: false, remote: false, retry: false, showProgress } as CleanOperation),
+	Commit: { kind: OperationKind.Commit, blocking: true, readOnly: false, remote: false, retry: false, showProgress: true } as CommitOperation,
+	Config: { kind: OperationKind.Config, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as ConfigOperation,
+	DeleteBranch: { kind: OperationKind.DeleteBranch, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as DeleteBranchOperation,
+	DeleteRef: { kind: OperationKind.DeleteRef, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as DeleteRefOperation,
+	DeleteTag: { kind: OperationKind.DeleteTag, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as DeleteTagOperation,
+	Diff: { kind: OperationKind.Diff, blocking: false, readOnly: true, remote: false, retry: false, showProgress: true } as DiffOperation,
+	Fetch: (showProgress: boolean) => ({ kind: OperationKind.Fetch, blocking: false, readOnly: false, remote: true, retry: true, showProgress } as FetchOperation),
+	FindTrackingBranches: { kind: OperationKind.FindTrackingBranches, blocking: false, readOnly: true, remote: false, retry: false, showProgress: true } as FindTrackingBranchesOperation,
+	GetBranch: { kind: OperationKind.GetBranch, blocking: false, readOnly: true, remote: false, retry: false, showProgress: true } as GetBranchOperation,
+	GetBranches: { kind: OperationKind.GetBranches, blocking: false, readOnly: true, remote: false, retry: false, showProgress: true } as GetBranchesOperation,
+	GetCommitTemplate: { kind: OperationKind.GetCommitTemplate, blocking: false, readOnly: true, remote: false, retry: false, showProgress: true } as GetCommitTemplateOperation,
+	GetObjectDetails: { kind: OperationKind.GetObjectDetails, blocking: false, readOnly: true, remote: false, retry: false, showProgress: false } as GetObjectDetailsOperation,
+	HashObject: { kind: OperationKind.HashObject, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as HashObjectOperation,
+	Ignore: { kind: OperationKind.Ignore, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as IgnoreOperation,
+	Log: { kind: OperationKind.Log, blocking: false, readOnly: true, remote: false, retry: false, showProgress: true } as LogOperation,
+	LogFile: { kind: OperationKind.LogFile, blocking: false, readOnly: true, remote: false, retry: false, showProgress: true } as LogFileOperation,
+	Merge: { kind: OperationKind.Merge, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as MergeOperation,
+	MergeAbort: { kind: OperationKind.MergeAbort, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as MergeAbortOperation,
+	MergeBase: { kind: OperationKind.MergeBase, blocking: false, readOnly: true, remote: false, retry: false, showProgress: true } as MergeBaseOperation,
+	Move: { kind: OperationKind.Move, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as MoveOperation,
+	PostCommitCommand: { kind: OperationKind.PostCommitCommand, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as PostCommitCommandOperation,
+	Pull: { kind: OperationKind.Pull, blocking: true, readOnly: false, remote: true, retry: true, showProgress: true } as PullOperation,
+	Push: { kind: OperationKind.Push, blocking: true, readOnly: false, remote: true, retry: false, showProgress: true } as PushOperation,
+	Remote: { kind: OperationKind.Remote, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as RemoteOperation,
+	RenameBranch: { kind: OperationKind.RenameBranch, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as RenameBranchOperation,
+	Remove: { kind: OperationKind.Remove, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as RemoveOperation,
+	Reset: { kind: OperationKind.Reset, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as ResetOperation,
+	Rebase: { kind: OperationKind.Rebase, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as RebaseOperation,
+	RebaseAbort: { kind: OperationKind.RebaseAbort, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as RebaseAbortOperation,
+	RebaseContinue: { kind: OperationKind.RebaseContinue, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as RebaseContinueOperation,
+	RevertFiles: (showProgress: boolean) => ({ kind: OperationKind.RevertFiles, blocking: false, readOnly: false, remote: false, retry: false, showProgress } as RevertFilesOperation),
+	SetBranchUpstream: { kind: OperationKind.SetBranchUpstream, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as SetBranchUpstreamOperation,
+	Show: { kind: OperationKind.Show, blocking: false, readOnly: true, remote: false, retry: false, showProgress: false } as ShowOperation,
+	Stage: { kind: OperationKind.Stage, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as StageOperation,
+	Status: { kind: OperationKind.Status, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as StatusOperation,
+	Stash: { kind: OperationKind.Stash, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as StashOperation,
+	SubmoduleUpdate: { kind: OperationKind.SubmoduleUpdate, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as SubmoduleUpdateOperation,
+	Sync: { kind: OperationKind.Sync, blocking: true, readOnly: false, remote: true, retry: true, showProgress: true } as SyncOperation,
+	Tag: { kind: OperationKind.Tag, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as TagOperation
+};
+
+export interface OperationResult {
+	operation: Operation;
+	error: any;
+}
+
+interface IOperationManager {
+	getOperations(operationKind: OperationKind): Operation[];
+	isIdle(): boolean;
+	isRunning(operationKind: OperationKind): boolean;
+	shouldDisableCommands(): boolean;
+	shouldShowProgress(): boolean;
+}
+
+export class OperationManager implements IOperationManager {
+
+	private operations = new Map<OperationKind, Set<Operation>>();
+
+	constructor(private readonly logger: LogOutputChannel) { }
+
+	start(operation: Operation): void {
+		if (this.operations.has(operation.kind)) {
+			this.operations.get(operation.kind)!.add(operation);
+		} else {
+			this.operations.set(operation.kind, new Set([operation]));
+		}
+
+		this.logger.trace(`Operation start: ${operation.kind} (blocking: ${operation.blocking}, readOnly: ${operation.readOnly}; retry: ${operation.retry}; showProgress: ${operation.showProgress})`);
+	}
+
+	end(operation: Operation): void {
+		const operationSet = this.operations.get(operation.kind);
+		if (operationSet) {
+			operationSet.delete(operation);
+			if (operationSet.size === 0) {
+				this.operations.delete(operation.kind);
+			}
+		}
+
+		this.logger.trace(`Operation end: ${operation.kind} (blocking: ${operation.blocking}, readOnly: ${operation.readOnly}; retry: ${operation.retry}; showProgress: ${operation.showProgress})`);
+	}
+
+	getOperations(operationKind: OperationKind): Operation[] {
+		const operationSet = this.operations.get(operationKind);
+		return operationSet ? Array.from(operationSet) : [];
+	}
+
+	isIdle(): boolean {
+		const operationSets = this.operations.values();
+
+		for (const operationSet of operationSets) {
+			for (const operation of operationSet) {
+				if (!operation.readOnly) {
+					return false;
+				}
+			}
+		}
+
+		return true;
+	}
+
+	isRunning(operationKind: OperationKind): boolean {
+		return this.operations.has(operationKind);
+	}
+
+	shouldDisableCommands(): boolean {
+		const operationSets = this.operations.values();
+
+		for (const operationSet of operationSets) {
+			for (const operation of operationSet) {
+				if (operation.blocking) {
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	shouldShowProgress(): boolean {
+		const operationSets = this.operations.values();
+
+		for (const operationSet of operationSets) {
+			for (const operation of operationSet) {
+				if (operation.showProgress) {
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+}
diff --git a/extensions/git/src/postCommitCommands.ts b/extensions/git/src/postCommitCommands.ts
index a335040e94c0f2..b7af453eaa4b01 100644
--- a/extensions/git/src/postCommitCommands.ts
+++ b/extensions/git/src/postCommitCommands.ts
@@ -5,9 +5,10 @@
 
 import { Command, commands, Disposable, Event, EventEmitter, Memento, Uri, workspace, l10n } from 'vscode';
 import { PostCommitCommandsProvider } from './api/git';
-import { Operation, Repository } from './repository';
+import { Repository } from './repository';
 import { ApiRepository } from './api/api1';
 import { dispose } from './util';
+import { OperationKind } from './operation';
 
 export interface IPostCommitCommandsProviderRegistry {
 	readonly onDidChangePostCommitCommandsProviders: Event<void>;
@@ -28,7 +29,7 @@ export class GitPostCommitCommandsProvider implements PostCommitCommandsProvider
 
 		// Icon
 		const repository = apiRepository.repository;
-		const isCommitInProgress = repository.operations.isRunning(Operation.Commit) || repository.operations.isRunning(Operation.PostCommitCommand);
+		const isCommitInProgress = repository.operations.isRunning(OperationKind.Commit) || repository.operations.isRunning(OperationKind.PostCommitCommand);
 		const icon = isCommitInProgress ? '$(sync~spin)' : alwaysPrompt ? '$(lock)' : alwaysCommitToNewBranch ? '$(git-branch)' : undefined;
 
 		// Tooltip (default)
@@ -178,7 +179,7 @@ export class CommitCommandsCenter {
 			l10n.t('Commit Changes to New Branch');
 
 		// Tooltip (in progress)
-		if (this.repository.operations.isRunning(Operation.Commit)) {
+		if (this.repository.operations.isRunning(OperationKind.Commit)) {
 			tooltip = !alwaysCommitToNewBranch ?
 				l10n.t('Committing Changes...') :
 				l10n.t('Committing Changes to New Branch...');
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index 3af93d30f17b1e..e939c2ade2dfe7 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -21,6 +21,7 @@ import { ApiRepository } from './api/api1';
 import { IRemoteSourcePublisherRegistry } from './remotePublisher';
 import { ActionButtonCommand } from './actionButton';
 import { IPostCommitCommandsProviderRegistry, CommitCommandsCenter } from './postCommitCommands';
+import { Operation, OperationKind, OperationManager, OperationResult } from './operation';
 
 const timeout = (millis: number) => new Promise(c => setTimeout(c, millis));
 
@@ -297,155 +298,8 @@ export class Resource implements SourceControlResourceState {
 		await commands.executeCommand<void>(command.command, ...(command.arguments || []));
 	}
 
-	clone() {
-		return new Resource(this._commandResolver, this._resourceGroupType, this._resourceUri, this._type, this._useIcons, this._renameResourceUri);
-	}
-}
-
-export const enum Operation {
-	Status = 'Status',
-	Config = 'Config',
-	Diff = 'Diff',
-	MergeBase = 'MergeBase',
-	Add = 'Add',
-	AddNoProgress = 'AddNoProgress',
-	Remove = 'Remove',
-	RevertFiles = 'RevertFiles',
-	RevertFilesNoProgress = 'RevertFilesNoProgress',
-	Commit = 'Commit',
-	PostCommitCommand = 'PostCommitCommand',
-	Clean = 'Clean',
-	CleanNoProgress = 'CleanNoProgress',
-	Branch = 'Branch',
-	GetBranch = 'GetBranch',
-	GetBranches = 'GetBranches',
-	SetBranchUpstream = 'SetBranchUpstream',
-	HashObject = 'HashObject',
-	Checkout = 'Checkout',
-	CheckoutTracking = 'CheckoutTracking',
-	Reset = 'Reset',
-	Remote = 'Remote',
-	Fetch = 'Fetch',
-	FetchNoProgress = 'FetchNoProgress',
-	Pull = 'Pull',
-	Push = 'Push',
-	CherryPick = 'CherryPick',
-	Sync = 'Sync',
-	Show = 'Show',
-	Stage = 'Stage',
-	GetCommitTemplate = 'GetCommitTemplate',
-	DeleteBranch = 'DeleteBranch',
-	RenameBranch = 'RenameBranch',
-	DeleteRef = 'DeleteRef',
-	Merge = 'Merge',
-	MergeAbort = 'MergeAbort',
-	Rebase = 'Rebase',
-	Ignore = 'Ignore',
-	Tag = 'Tag',
-	DeleteTag = 'DeleteTag',
-	Stash = 'Stash',
-	CheckIgnore = 'CheckIgnore',
-	GetObjectDetails = 'GetObjectDetails',
-	SubmoduleUpdate = 'SubmoduleUpdate',
-	RebaseAbort = 'RebaseAbort',
-	RebaseContinue = 'RebaseContinue',
-	FindTrackingBranches = 'GetTracking',
-	Apply = 'Apply',
-	Blame = 'Blame',
-	Log = 'Log',
-	LogFile = 'LogFile',
-
-	Move = 'Move'
-}
-
-function isReadOnly(operation: Operation): boolean {
-	switch (operation) {
-		case Operation.Blame:
-		case Operation.CheckIgnore:
-		case Operation.Diff:
-		case Operation.FindTrackingBranches:
-		case Operation.GetBranch:
-		case Operation.GetCommitTemplate:
-		case Operation.GetObjectDetails:
-		case Operation.Log:
-		case Operation.LogFile:
-		case Operation.MergeBase:
-		case Operation.Show:
-			return true;
-		default:
-			return false;
-	}
-}
-
-function shouldShowProgress(operation: Operation): boolean {
-	switch (operation) {
-		case Operation.AddNoProgress:
-		case Operation.CleanNoProgress:
-		case Operation.FetchNoProgress:
-		case Operation.RevertFilesNoProgress:
-		case Operation.CheckIgnore:
-		case Operation.GetObjectDetails:
-		case Operation.Show:
-			return false;
-		default:
-			return true;
-	}
-}
-
-export interface Operations {
-	isIdle(): boolean;
-	shouldShowProgress(): boolean;
-	isRunning(operation: Operation): boolean;
-}
-
-class OperationsImpl implements Operations {
-
-	private operations = new Map<Operation, number>();
-
-	constructor(private readonly logger: LogOutputChannel) { }
-
-	start(operation: Operation): void {
-		this.logger.trace(`Operation start: ${operation}`);
-		this.operations.set(operation, (this.operations.get(operation) || 0) + 1);
-	}
-
-	end(operation: Operation): void {
-		this.logger.trace(`Operation end: ${operation}`);
-		const count = (this.operations.get(operation) || 0) - 1;
-
-		if (count <= 0) {
-			this.operations.delete(operation);
-		} else {
-			this.operations.set(operation, count);
-		}
-	}
-
-	isRunning(operation: Operation): boolean {
-		return this.operations.has(operation);
-	}
-
-	isIdle(): boolean {
-		const operations = this.operations.keys();
-
-		for (const operation of operations) {
-			if (!isReadOnly(operation)) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	shouldShowProgress(): boolean {
-		const operations = this.operations.keys();
-
-		for (const operation of operations) {
-			if (shouldShowProgress(operation)) {
-				return true;
-			}
-		}
-
-		return false;
+	clone(resourceGroupType?: ResourceGroupType) {
+		return new Resource(this._commandResolver, resourceGroupType ?? this._resourceGroupType, this._resourceUri, this._type, this._useIcons, this._renameResourceUri);
 	}
 }
 
@@ -460,11 +314,6 @@ interface GitResourceGroups {
 	workingTreeGroup?: Resource[];
 }
 
-export interface OperationResult {
-	operation: Operation;
-	error: any;
-}
-
 class ProgressManager {
 
 	private enabled = false;
@@ -477,7 +326,7 @@ class ProgressManager {
 
 		this.repository.onDidChangeOperations(() => {
 			// Disable input box when the commit operation is running
-			this.repository.sourceControl.inputBox.enabled = !this.repository.operations.isRunning(Operation.Commit);
+			this.repository.sourceControl.inputBox.enabled = !this.repository.operations.isRunning(OperationKind.Commit);
 		});
 	}
 
@@ -769,8 +618,8 @@ export class Repository implements Disposable {
 	private _onDidChangeOriginalResource = new EventEmitter<Uri>();
 	readonly onDidChangeOriginalResource: Event<Uri> = this._onDidChangeOriginalResource.event;
 
-	private _onRunOperation = new EventEmitter<Operation>();
-	readonly onRunOperation: Event<Operation> = this._onRunOperation.event;
+	private _onRunOperation = new EventEmitter<OperationKind>();
+	readonly onRunOperation: Event<OperationKind> = this._onRunOperation.event;
 
 	private _onDidRunOperation = new EventEmitter<OperationResult>();
 	readonly onDidRunOperation: Event<OperationResult> = this._onDidRunOperation.event;
@@ -874,8 +723,8 @@ export class Repository implements Disposable {
 		return this._mergeInProgress;
 	}
 
-	private _operations = new OperationsImpl(this.logger);
-	get operations(): Operations { return this._operations; }
+	private _operations = new OperationManager(this.logger);
+	get operations(): OperationManager { return this._operations; }
 
 	private _state = RepositoryState.Idle;
 	get state(): RepositoryState { return this._state; }
@@ -1017,7 +866,7 @@ export class Repository implements Disposable {
 		}
 
 		// https://github.com/microsoft/vscode/issues/39039
-		const onSuccessfulPush = filterEvent(this.onDidRunOperation, e => e.operation === Operation.Push && !e.error);
+		const onSuccessfulPush = filterEvent(this.onDidRunOperation, e => e.operation.kind === OperationKind.Push && !e.error);
 		onSuccessfulPush(() => {
 			const gitConfig = workspace.getConfiguration('git');
 
@@ -1231,7 +1080,7 @@ export class Repository implements Disposable {
 
 	async add(resources: Uri[], opts?: { update?: boolean }): Promise<void> {
 		await this.run(
-			this.optimisticUpdateEnabled() ? Operation.AddNoProgress : Operation.Add,
+			Operation.Add(!this.optimisticUpdateEnabled()),
 			async () => {
 				await this.repository.add(resources.map(r => r.fsPath), opts);
 				this.closeDiffEditors([], [...resources.map(r => r.fsPath)]);
@@ -1244,7 +1093,7 @@ export class Repository implements Disposable {
 				const addedResourceStates: Resource[] = [];
 				for (const resource of [...this.mergeGroup.resourceStates, ...this.untrackedGroup.resourceStates, ...this.workingTreeGroup.resourceStates]) {
 					if (resourcePaths.includes(resource.resourceUri.fsPath) && !indexGroupResourcePaths.includes(resource.resourceUri.fsPath)) {
-						addedResourceStates.push(resource);
+						addedResourceStates.push(resource.clone(ResourceGroupType.Index));
 					}
 				}
 
@@ -1282,7 +1131,7 @@ export class Repository implements Disposable {
 
 	async revert(resources: Uri[]): Promise<void> {
 		await this.run(
-			this.optimisticUpdateEnabled() ? Operation.RevertFilesNoProgress : Operation.RevertFiles,
+			Operation.RevertFiles(!this.optimisticUpdateEnabled()),
 			async () => {
 				await this.repository.revert('HEAD', resources.map(r => r.fsPath));
 				this.closeDiffEditors([...resources.length !== 0 ?
@@ -1292,6 +1141,7 @@ export class Repository implements Disposable {
 			() => {
 				const config = workspace.getConfiguration('git', Uri.file(this.repository.root));
 				const untrackedChanges = config.get<'mixed' | 'separate' | 'hidden'>('untrackedChanges');
+				const untrackedChangesResourceGroupType = untrackedChanges === 'mixed' ? ResourceGroupType.WorkingTree : ResourceGroupType.Untracked;
 
 				const resourcePaths = resources.length === 0 ?
 					this.indexGroup.resourceStates.map(r => r.resourceUri.fsPath) : resources.map(r => r.fsPath);
@@ -1302,9 +1152,9 @@ export class Repository implements Disposable {
 				for (const resource of this.indexGroup.resourceStates) {
 					if (resourcePaths.includes(resource.resourceUri.fsPath)) {
 						if (resource.type === Status.INDEX_ADDED) {
-							untrackedResources.push(resource);
+							untrackedResources.push(resource.clone(untrackedChangesResourceGroupType));
 						} else {
-							trackedResources.push(resource);
+							trackedResources.push(resource.clone(ResourceGroupType.WorkingTree));
 						}
 					}
 				}
@@ -1399,7 +1249,7 @@ export class Repository implements Disposable {
 
 	async clean(resources: Uri[]): Promise<void> {
 		await this.run(
-			this.optimisticUpdateEnabled() ? Operation.CleanNoProgress : Operation.Clean,
+			Operation.Clean(!this.optimisticUpdateEnabled()),
 			async () => {
 				const toClean: string[] = [];
 				const toCheckout: string[] = [];
@@ -1436,7 +1286,13 @@ export class Repository implements Disposable {
 				});
 
 				await this.repository.clean(toClean);
-				await this.repository.checkout('', toCheckout);
+				try {
+					await this.repository.checkout('', toCheckout);
+				} catch (err) {
+					if (err.gitErrorCode !== GitErrorCodes.BranchNotYetBorn) {
+						throw err;
+					}
+				}
 				await this.repository.updateSubmodules(submodulesToUpdate);
 
 				this.closeDiffEditors([], [...toClean, ...toCheckout]);
@@ -1456,7 +1312,7 @@ export class Repository implements Disposable {
 			});
 	}
 
-	closeDiffEditors(indexResources: string[] | undefined, workingTreeResources: string[] | undefined, ignoreSetting: boolean = false): void {
+	closeDiffEditors(indexResources: string[] | undefined, workingTreeResources: string[] | undefined, ignoreSetting = false): void {
 		const config = workspace.getConfiguration('git', Uri.file(this.root));
 		if (!config.get<boolean>('closeDiffOnOperation', false) && !ignoreSetting) { return; }
 
@@ -1503,7 +1359,7 @@ export class Repository implements Disposable {
 		try {
 			// Fast-forward the branch if possible
 			const options = { remote: branch.upstream.remote, ref: `${branch.upstream.name}:${branch.name}` };
-			await this.run(Operation.Fetch, async () => this.repository.fetch(options));
+			await this.run(Operation.Fetch(true), async () => this.repository.fetch(options));
 		} catch (err) {
 			if (err.gitErrorCode === GitErrorCodes.BranchFastForwardRejected) {
 				return;
@@ -1553,12 +1409,27 @@ export class Repository implements Disposable {
 		await this.run(Operation.DeleteTag, () => this.repository.deleteTag(name));
 	}
 
-	async checkout(treeish: string, opts?: { detached?: boolean }): Promise<void> {
-		await this.run(Operation.Checkout, () => this.repository.checkout(treeish, [], opts));
+	async checkout(treeish: string, opts?: { detached?: boolean; pullBeforeCheckout?: boolean }): Promise<void> {
+		const refLabel = this.checkoutRefLabel(treeish, opts?.detached);
+
+		await this.run(Operation.Checkout(refLabel),
+			async () => {
+				if (opts?.pullBeforeCheckout && !opts?.detached) {
+					try {
+						await this.fastForwardBranch(treeish);
+					}
+					catch (err) {
+						// noop
+					}
+				}
+
+				await this.repository.checkout(treeish, [], opts);
+			});
 	}
 
 	async checkoutTracking(treeish: string, opts: { detached?: boolean } = {}): Promise<void> {
-		await this.run(Operation.CheckoutTracking, () => this.repository.checkout(treeish, [], { ...opts, track: true }));
+		const refLabel = this.checkoutRefLabel(treeish, opts?.detached);
+		await this.run(Operation.CheckoutTracking(refLabel), () => this.repository.checkout(treeish, [], { ...opts, track: true }));
 	}
 
 	async findTrackingBranches(upstreamRef: string): Promise<Branch[]> {
@@ -1615,8 +1486,7 @@ export class Repository implements Disposable {
 			options.prune = prune;
 		}
 
-		const operation = options.silent === true ? Operation.FetchNoProgress : Operation.Fetch;
-		await this.run(operation, async () => this.repository.fetch(options));
+		await this.run(Operation.Fetch(options.silent !== true), async () => this.repository.fetch(options));
 	}
 
 	@throttle
@@ -1658,7 +1528,7 @@ export class Repository implements Disposable {
 				}
 
 				if (await this.checkIfMaybeRebased(this.HEAD?.name)) {
-					this._pullAndHandleTagConflict(rebase, remote, branch, { unshallow, tags });
+					await this._pullAndHandleTagConflict(rebase, remote, branch, { unshallow, tags });
 				}
 			});
 		});
@@ -1693,7 +1563,7 @@ export class Repository implements Disposable {
 		await this.run(Operation.Push, () => this._push(remote, branch, undefined, undefined, forcePushMode));
 	}
 
-	async pushTo(remote?: string, name?: string, setUpstream: boolean = false, forcePushMode?: ForcePushMode): Promise<void> {
+	async pushTo(remote?: string, name?: string, setUpstream = false, forcePushMode?: ForcePushMode): Promise<void> {
 		await this.run(Operation.Push, () => this._push(remote, name, setUpstream, undefined, forcePushMode));
 	}
 
@@ -1740,7 +1610,7 @@ export class Repository implements Disposable {
 					}
 
 					if (await this.checkIfMaybeRebased(this.HEAD?.name)) {
-						this._pullAndHandleTagConflict(rebase, remoteName, pullBranch, { tags, cancellationToken });
+						await this._pullAndHandleTagConflict(rebase, remoteName, pullBranch, { tags, cancellationToken });
 					}
 				};
 
@@ -1862,14 +1732,14 @@ export class Repository implements Disposable {
 		return await this.repository.getStashes();
 	}
 
-	async createStash(message?: string, includeUntracked?: boolean): Promise<void> {
+	async createStash(message?: string, includeUntracked?: boolean, staged?: boolean): Promise<void> {
 		const indexResources = [...this.indexGroup.resourceStates.map(r => r.resourceUri.fsPath)];
 		const workingGroupResources = [
-			...this.workingTreeGroup.resourceStates.map(r => r.resourceUri.fsPath),
+			...!staged ? this.workingTreeGroup.resourceStates.map(r => r.resourceUri.fsPath) : [],
 			...includeUntracked ? this.untrackedGroup.resourceStates.map(r => r.resourceUri.fsPath) : []];
 
 		return await this.run(Operation.Stash, async () => {
-			this.repository.createStash(message, includeUntracked);
+			await this.repository.createStash(message, includeUntracked, staged);
 			this.closeDiffEditors(indexResources, workingGroupResources);
 		});
 	}
@@ -1983,7 +1853,7 @@ export class Repository implements Disposable {
 		return ignored;
 	}
 
-	private async _push(remote?: string, refspec?: string, setUpstream: boolean = false, followTags = false, forcePushMode?: ForcePushMode, tags = false): Promise<void> {
+	private async _push(remote?: string, refspec?: string, setUpstream = false, followTags = false, forcePushMode?: ForcePushMode, tags = false): Promise<void> {
 		try {
 			await this.repository.push(remote, refspec, setUpstream, followTags, forcePushMode, tags);
 		} catch (err) {
@@ -2012,6 +1882,7 @@ export class Repository implements Disposable {
 		operation: Operation,
 		runOperation: () => Promise<T> = () => Promise.resolve<any>(null),
 		getOptimisticResourceGroups: () => GitResourceGroups | undefined = () => undefined): Promise<T> {
+
 		if (this.state !== RepositoryState.Idle) {
 			throw new Error('Repository not initialized');
 		}
@@ -2019,12 +1890,12 @@ export class Repository implements Disposable {
 		let error: any = null;
 
 		this._operations.start(operation);
-		this._onRunOperation.fire(operation);
+		this._onRunOperation.fire(operation.kind);
 
 		try {
 			const result = await this.retryRun(operation, runOperation);
 
-			if (!isReadOnly(operation)) {
+			if (!operation.readOnly) {
 				await this.updateModelState(this.optimisticUpdateEnabled() ? getOptimisticResourceGroups() : undefined);
 			}
 
@@ -2039,7 +1910,7 @@ export class Repository implements Disposable {
 			throw err;
 		} finally {
 			this._operations.end(operation);
-			this._onDidRunOperation.fire({ operation, error });
+			this._onDidRunOperation.fire({ operation: operation, error });
 		}
 	}
 
@@ -2053,7 +1924,7 @@ export class Repository implements Disposable {
 			} catch (err) {
 				const shouldRetry = attempt <= 10 && (
 					(err.gitErrorCode === GitErrorCodes.RepositoryIsLocked)
-					|| ((operation === Operation.Pull || operation === Operation.Sync || operation === Operation.Fetch) && (err.gitErrorCode === GitErrorCodes.CantLockRef || err.gitErrorCode === GitErrorCodes.CantRebaseMultipleBranches))
+					|| (operation.retry && (err.gitErrorCode === GitErrorCodes.CantLockRef || err.gitErrorCode === GitErrorCodes.CantRebaseMultipleBranches))
 				);
 
 				if (shouldRetry) {
@@ -2524,7 +2395,14 @@ export class Repository implements Disposable {
 		return true;
 	}
 
-	public isBranchProtected(name: string = this.HEAD?.name ?? ''): boolean {
+	private checkoutRefLabel(treeish: string, detached?: boolean): string {
+		if (!detached) { return treeish; }
+
+		const ref = this.refs.filter(r => r.name === treeish);
+		return ref[0]?.commit?.substring(0, 8) ?? treeish;
+	}
+
+	public isBranchProtected(name = this.HEAD?.name ?? ''): boolean {
 		return this.isBranchProtectedMatcher ? this.isBranchProtectedMatcher(name) : false;
 	}
 
diff --git a/extensions/git/src/statusbar.ts b/extensions/git/src/statusbar.ts
index 7a21b78a28ae3b..0a8690b87e05eb 100644
--- a/extensions/git/src/statusbar.ts
+++ b/extensions/git/src/statusbar.ts
@@ -4,10 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Disposable, Command, EventEmitter, Event, workspace, Uri, l10n } from 'vscode';
-import { Repository, Operation } from './repository';
+import { Repository } from './repository';
 import { anyEvent, dispose, filterEvent } from './util';
-import { Branch, RemoteSourcePublisher } from './api/git';
+import { Branch, RefType, RemoteSourcePublisher } from './api/git';
 import { IRemoteSourcePublisherRegistry } from './remotePublisher';
+import { CheckoutOperation, CheckoutTrackingOperation, OperationKind } from './operation';
+
+interface CheckoutStatusBarState {
+	readonly isCheckoutRunning: boolean;
+	readonly isCommitRunning: boolean;
+	readonly isSyncRunning: boolean;
+}
 
 class CheckoutStatusBar {
 
@@ -15,23 +22,94 @@ class CheckoutStatusBar {
 	get onDidChange(): Event<void> { return this._onDidChange.event; }
 	private disposables: Disposable[] = [];
 
+	private _state: CheckoutStatusBarState;
+	private get state() { return this._state; }
+	private set state(state: CheckoutStatusBarState) {
+		this._state = state;
+		this._onDidChange.fire();
+	}
+
 	constructor(private repository: Repository) {
+		this._state = {
+			isCheckoutRunning: false,
+			isCommitRunning: false,
+			isSyncRunning: false
+		};
+
+		repository.onDidChangeOperations(this.onDidChangeOperations, this, this.disposables);
 		repository.onDidRunGitStatus(this._onDidChange.fire, this._onDidChange, this.disposables);
 	}
 
 	get command(): Command | undefined {
+		const operationData = [
+			...this.repository.operations.getOperations(OperationKind.Checkout) as CheckoutOperation[],
+			...this.repository.operations.getOperations(OperationKind.CheckoutTracking) as CheckoutTrackingOperation[]
+		];
+
 		const rebasing = !!this.repository.rebaseCommit;
-		const isBranchProtected = this.repository.isBranchProtected();
-		const label = `${this.repository.headLabel}${rebasing ? ` (${l10n.t('Rebasing')})` : ''}`;
+		const label = operationData[0]?.refLabel ?? `${this.repository.headLabel}${rebasing ? ` (${l10n.t('Rebasing')})` : ''}`;
+		const command = (this.state.isCheckoutRunning || this.state.isCommitRunning || this.state.isSyncRunning) ? '' : 'git.checkout';
 
 		return {
-			command: 'git.checkout',
-			tooltip: l10n.t('{0}, Checkout branch/tag...', label),
-			title: `${isBranchProtected ? '$(lock)' : '$(git-branch)'} ${label}`,
+			command,
+			tooltip: `${label}, ${this.getTooltip()}`,
+			title: `${this.getIcon()} ${label}`,
 			arguments: [this.repository.sourceControl]
 		};
 	}
 
+	private getIcon(): string {
+		if (!this.repository.HEAD) {
+			return '';
+		}
+
+		// Checkout
+		if (this.state.isCheckoutRunning) {
+			return '$(loading~spin)';
+		}
+
+		// Branch
+		if (this.repository.HEAD?.name) {
+			return this.repository.isBranchProtected() ? '$(lock)' : '$(git-branch)';
+		}
+
+		// Tag
+		if (this.repository.HEAD?.commit && this.repository.refs.filter(iref => iref.type === RefType.Tag && iref.commit === this.repository.HEAD!.commit).length) {
+			return '$(tag)';
+		}
+
+		// Commit
+		return '$(git-commit)';
+	}
+
+	private getTooltip(): string {
+		if (this.state.isCheckoutRunning) {
+			return l10n.t('Checking Out Branch/Tag...');
+		}
+
+		if (this.state.isCommitRunning) {
+			return l10n.t('Committing Changes...');
+
+		}
+
+		if (this.state.isSyncRunning) {
+			return l10n.t('Synchronizing Changes...');
+		}
+
+		return l10n.t('Checkout Branch/Tag...');
+	}
+
+	private onDidChangeOperations(): void {
+		const isCommitRunning = this.repository.operations.isRunning(OperationKind.Commit);
+		const isCheckoutRunning = this.repository.operations.isRunning(OperationKind.Checkout) ||
+			this.repository.operations.isRunning(OperationKind.CheckoutTracking);
+		const isSyncRunning = this.repository.operations.isRunning(OperationKind.Sync) ||
+			this.repository.operations.isRunning(OperationKind.Push) ||
+			this.repository.operations.isRunning(OperationKind.Pull);
+
+		this.state = { ...this.state, isCheckoutRunning, isCommitRunning, isSyncRunning };
+	}
+
 	dispose(): void {
 		this.disposables.forEach(d => d.dispose());
 	}
@@ -39,6 +117,8 @@ class CheckoutStatusBar {
 
 interface SyncStatusBarState {
 	readonly enabled: boolean;
+	readonly isCheckoutRunning: boolean;
+	readonly isCommitRunning: boolean;
 	readonly isSyncRunning: boolean;
 	readonly hasRemotes: boolean;
 	readonly HEAD: Branch | undefined;
@@ -61,6 +141,8 @@ class SyncStatusBar {
 	constructor(private repository: Repository, private remoteSourcePublisherRegistry: IRemoteSourcePublisherRegistry) {
 		this._state = {
 			enabled: true,
+			isCheckoutRunning: false,
+			isCommitRunning: false,
 			isSyncRunning: false,
 			hasRemotes: false,
 			HEAD: undefined,
@@ -86,11 +168,14 @@ class SyncStatusBar {
 	}
 
 	private onDidChangeOperations(): void {
-		const isSyncRunning = this.repository.operations.isRunning(Operation.Sync) ||
-			this.repository.operations.isRunning(Operation.Push) ||
-			this.repository.operations.isRunning(Operation.Pull);
-
-		this.state = { ...this.state, isSyncRunning };
+		const isCommitRunning = this.repository.operations.isRunning(OperationKind.Commit);
+		const isCheckoutRunning = this.repository.operations.isRunning(OperationKind.Checkout) ||
+			this.repository.operations.isRunning(OperationKind.CheckoutTracking);
+		const isSyncRunning = this.repository.operations.isRunning(OperationKind.Sync) ||
+			this.repository.operations.isRunning(OperationKind.Push) ||
+			this.repository.operations.isRunning(OperationKind.Pull);
+
+		this.state = { ...this.state, isCheckoutRunning, isCommitRunning, isSyncRunning };
 	}
 
 	private onDidRunGitStatus(): void {
@@ -118,12 +203,16 @@ class SyncStatusBar {
 				return;
 			}
 
-			const tooltip = this.state.remoteSourcePublishers.length === 1
-				? l10n.t('Publish to {0}', this.state.remoteSourcePublishers[0].name)
-				: l10n.t('Publish to...');
+			const command = (this.state.isCheckoutRunning || this.state.isCommitRunning) ? '' : 'git.publish';
+			const tooltip =
+				this.state.isCheckoutRunning ? l10n.t('Checking Out Changes...') :
+					this.state.isCommitRunning ? l10n.t('Committing Changes...') :
+						this.state.remoteSourcePublishers.length === 1
+							? l10n.t('Publish to {0}', this.state.remoteSourcePublishers[0].name)
+							: l10n.t('Publish to...');
 
 			return {
-				command: 'git.publish',
+				command,
 				title: `$(cloud-upload)`,
 				tooltip,
 				arguments: [this.repository.sourceControl]
@@ -154,6 +243,16 @@ class SyncStatusBar {
 			tooltip = '';
 		}
 
+		if (this.state.isCheckoutRunning) {
+			command = '';
+			tooltip = l10n.t('Checking Out Changes...');
+		}
+
+		if (this.state.isCommitRunning) {
+			command = '';
+			tooltip = l10n.t('Committing Changes...');
+		}
+
 		if (this.state.isSyncRunning) {
 			icon = '$(sync~spin)';
 			command = '';
diff --git a/extensions/git/src/test/index.ts b/extensions/git/src/test/index.ts
index bed72035cde55d..c18561aaa66e0d 100644
--- a/extensions/git/src/test/index.ts
+++ b/extensions/git/src/test/index.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-const path = require('path');
-const testRunner = require('../../../../test/integration/electron/testrunner');
+import * as path from 'path';
+import * as testRunner from '../../../../test/integration/electron/testrunner';
 
-const options: any = {
+const options: import('mocha').MochaOptions = {
 	ui: 'tdd',
 	color: true,
 	timeout: 60000
diff --git a/extensions/git/yarn.lock b/extensions/git/yarn.lock
index 624265baa2ba0b..bbd19fc7ffaee6 100644
--- a/extensions/git/yarn.lock
+++ b/extensions/git/yarn.lock
@@ -223,10 +223,10 @@
   resolved "https://registry.yarnpkg.com/@types/which/-/which-1.0.28.tgz#016e387629b8817bed653fe32eab5d11279c8df6"
   integrity sha1-AW44dim4gXvtZT/jLqtdESecjfY=
 
-"@vscode/extension-telemetry@0.7.1-preview":
-  version "0.7.1-preview"
-  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.7.1-preview.tgz#1b954b8932b7f27a3993abda25299b8ba7f97233"
-  integrity sha512-7GdA8lMrcMhRfFxVpk7KBNbx+Bh/OpG702C1uPcyOQqp5lH1txJ/8SZAacFqFMKLRnBdGlJRKBREQe/Fs1X/eQ==
+"@vscode/extension-telemetry@0.7.3-preview":
+  version "0.7.3-preview"
+  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.7.3-preview.tgz#3e45609c862022e7eec52e47fe45176149d82b6c"
+  integrity sha512-V+TanZXj8jhCX8mwGHbRDOTJ5YSWCmngHKs7ZrRoR7sXc4vZYQX+1syp07hDX2BVnPpuBHJiovZ8GZ4zbmQvYw==
   dependencies:
     "@microsoft/1ds-core-js" "^3.2.8"
     "@microsoft/1ds-post-js" "^3.2.8"
diff --git a/extensions/github-authentication/package.json b/extensions/github-authentication/package.json
index cfe97094b49555..8acb9bf3c1a5b4 100644
--- a/extensions/github-authentication/package.json
+++ b/extensions/github-authentication/package.json
@@ -63,7 +63,7 @@
   },
   "dependencies": {
     "node-fetch": "2.6.7",
-    "@vscode/extension-telemetry": "0.7.1-preview",
+    "@vscode/extension-telemetry": "0.7.3-preview",
     "vscode-tas-client": "^0.1.47"
   },
   "devDependencies": {
diff --git a/extensions/github-authentication/src/github.ts b/extensions/github-authentication/src/github.ts
index 055e3f1627652f..6dc6aceaae9ef4 100644
--- a/extensions/github-authentication/src/github.ts
+++ b/extensions/github-authentication/src/github.ts
@@ -68,8 +68,7 @@ export class GitHubAuthenticationProvider implements vscode.AuthenticationProvid
 			this._logger,
 			this._telemetryReporter,
 			uriHandler,
-			// We only can use the Device Code flow when we have a full node environment because of CORS.
-			context.extension.extensionKind === vscode.ExtensionKind.Workspace || vscode.env.uiKind === vscode.UIKind.Desktop,
+			context.extension.extensionKind,
 			ghesUri);
 
 		// Contains the current state of the sessions we have available.
diff --git a/extensions/github-authentication/src/githubServer.ts b/extensions/github-authentication/src/githubServer.ts
index e1f766d5dc490e..f292b3a42dde21 100644
--- a/extensions/github-authentication/src/githubServer.ts
+++ b/extensions/github-authentication/src/githubServer.ts
@@ -71,7 +71,7 @@ export class GitHubServer implements IGitHubServer {
 		private readonly _logger: Log,
 		private readonly _telemetryReporter: ExperimentationTelemetry,
 		private readonly _uriHandler: UriEventHandler,
-		private readonly _supportDeviceCodeFlow: boolean,
+		private readonly _extensionKind: vscode.ExtensionKind,
 		private readonly _ghesUri?: vscode.Uri
 	) {
 		this._type = _ghesUri ? AuthProviderType.githubEnterprise : AuthProviderType.github;
@@ -164,8 +164,13 @@ export class GitHubServer implements IGitHubServer {
 			}
 		}
 
-		// Starting a local server isn't supported in web
-		if (vscode.env.uiKind === vscode.UIKind.Desktop) {
+		// Starting a local server is only supported if:
+		// 1. We are in a UI extension because we need to open a port on the machine that has the browser
+		// 2. We are in a node runtime because we need to open a port on the machine
+		if (
+			this._extensionKind === vscode.ExtensionKind.UI &&
+			typeof navigator === 'undefined'
+		) {
 			try {
 				await promptToContinue();
 				return await this.doLoginWithLocalServer(scopes);
@@ -175,7 +180,8 @@ export class GitHubServer implements IGitHubServer {
 			}
 		}
 
-		if (this._supportDeviceCodeFlow) {
+		// We only can use the Device Code flow when we have a full node environment because of CORS.
+		if (typeof navigator === 'undefined') {
 			try {
 				await promptToContinue();
 				return await this.doLoginDeviceCodeFlow(scopes);
diff --git a/extensions/github-authentication/yarn.lock b/extensions/github-authentication/yarn.lock
index 1fbeb9115447b4..d2047c07bf62dc 100644
--- a/extensions/github-authentication/yarn.lock
+++ b/extensions/github-authentication/yarn.lock
@@ -199,10 +199,10 @@
   dependencies:
     "@types/node" "*"
 
-"@vscode/extension-telemetry@0.7.1-preview":
-  version "0.7.1-preview"
-  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.7.1-preview.tgz#1b954b8932b7f27a3993abda25299b8ba7f97233"
-  integrity sha512-7GdA8lMrcMhRfFxVpk7KBNbx+Bh/OpG702C1uPcyOQqp5lH1txJ/8SZAacFqFMKLRnBdGlJRKBREQe/Fs1X/eQ==
+"@vscode/extension-telemetry@0.7.3-preview":
+  version "0.7.3-preview"
+  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.7.3-preview.tgz#3e45609c862022e7eec52e47fe45176149d82b6c"
+  integrity sha512-V+TanZXj8jhCX8mwGHbRDOTJ5YSWCmngHKs7ZrRoR7sXc4vZYQX+1syp07hDX2BVnPpuBHJiovZ8GZ4zbmQvYw==
   dependencies:
     "@microsoft/1ds-core-js" "^3.2.8"
     "@microsoft/1ds-post-js" "^3.2.8"
diff --git a/extensions/github/package.json b/extensions/github/package.json
index 3ab3d6895a300e..91d49c77e8a5e8 100644
--- a/extensions/github/package.json
+++ b/extensions/github/package.json
@@ -55,7 +55,8 @@
     "continueEditSession": [
       {
         "command": "github.openOnVscodeDev",
-        "when": "github.hasGitHubRepo"
+        "when": "github.hasGitHubRepo",
+        "qualifiedName": "Continue Working in VS Code for the Web"
       }
     ],
     "menus": {
diff --git a/extensions/github/src/importExportProfiles.ts b/extensions/github/src/importExportProfiles.ts
index dd73f1061f71c5..8200d546c7901a 100644
--- a/extensions/github/src/importExportProfiles.ts
+++ b/extensions/github/src/importExportProfiles.ts
@@ -61,9 +61,20 @@ class GitHubGistProfileContentHandler implements vscode.ProfileContentHandler {
 		return result.data.html_url ? vscode.Uri.parse(result.data.html_url) : null;
 	}
 
+	private _public_octokit: Promise<Octokit> | undefined;
+	private getPublicOctokit(): Promise<Octokit> {
+		if (!this._public_octokit) {
+			this._public_octokit = (async () => {
+				const { Octokit } = await import('@octokit/rest');
+				return new Octokit({ request: { agent: this.getAgent() }, userAgent: 'GitHub VSCode' });
+			})();
+		}
+		return this._public_octokit;
+	}
+
 	async readProfile(uri: vscode.Uri): Promise<string | null> {
 		const gist_id = basename(uri.path);
-		const octokit = await this.getOctokit();
+		const octokit = await this.getPublicOctokit();
 		try {
 			const gist = await octokit.gists.get({ gist_id });
 			if (gist.data.files) {
diff --git a/extensions/github/src/pushErrorHandler.ts b/extensions/github/src/pushErrorHandler.ts
index 7c3da24e8e0478..6d4b4112811eca 100644
--- a/extensions/github/src/pushErrorHandler.ts
+++ b/extensions/github/src/pushErrorHandler.ts
@@ -7,7 +7,7 @@ import { TextDecoder } from 'util';
 import { commands, env, ProgressLocation, Uri, window, workspace, QuickPickOptions, FileType, l10n } from 'vscode';
 import { getOctokit } from './auth';
 import { GitErrorCodes, PushErrorHandler, Remote, Repository } from './typings/git';
-import path = require('path');
+import * as path from 'path';
 
 type Awaited<T> = T extends PromiseLike<infer U> ? Awaited<U> : T;
 
diff --git a/extensions/github/src/test/index.ts b/extensions/github/src/test/index.ts
index 23d36033480a14..52c5acf885fe78 100644
--- a/extensions/github/src/test/index.ts
+++ b/extensions/github/src/test/index.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-const path = require('path');
-const testRunner = require('../../../../test/integration/electron/testrunner');
+import * as path from 'path';
+import * as testRunner from '../../../../test/integration/electron/testrunner';
 
 const suite = 'Github Tests';
 
-const options: any = {
+const options: import('mocha').MochaOptions = {
 	ui: 'tdd',
 	color: true,
 	timeout: 60000
diff --git a/extensions/handlebars/package.json b/extensions/handlebars/package.json
index 88976cf36ff614..8e70493f3ca0a1 100644
--- a/extensions/handlebars/package.json
+++ b/extensions/handlebars/package.json
@@ -11,6 +11,10 @@
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin daaain/Handlebars grammars/Handlebars.json ./syntaxes/Handlebars.tmLanguage.json"
   },
+  "extensionKind": [
+    "ui",
+    "workspace"
+  ],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/html-language-features/client/src/browser/htmlClientMain.ts b/extensions/html-language-features/client/src/browser/htmlClientMain.ts
index fb8cc9071a8dcf..3f10e6d131fa7e 100644
--- a/extensions/html-language-features/client/src/browser/htmlClientMain.ts
+++ b/extensions/html-language-features/client/src/browser/htmlClientMain.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, ExtensionContext, Uri } from 'vscode';
+import { Disposable, ExtensionContext, Uri, l10n } from 'vscode';
 import { LanguageClientOptions } from 'vscode-languageclient';
 import { startClient, LanguageClientConstructor, AsyncDisposable } from '../htmlClient';
 import { LanguageClient } from 'vscode-languageclient/browser';
@@ -22,6 +22,8 @@ export async function activate(context: ExtensionContext) {
 	const serverMain = Uri.joinPath(context.extensionUri, 'server/dist/browser/htmlServerMain.js');
 	try {
 		const worker = new Worker(serverMain.toString());
+		worker.postMessage({ i10lLocation: l10n.uri?.toString(false) ?? '' });
+
 		const newLanguageClient: LanguageClientConstructor = (id: string, name: string, clientOptions: LanguageClientOptions) => {
 			return new LanguageClient(id, name, clientOptions, worker);
 		};
diff --git a/extensions/html-language-features/client/src/node/htmlClientMain.ts b/extensions/html-language-features/client/src/node/htmlClientMain.ts
index c72906341dd5aa..cdb995b3286db3 100644
--- a/extensions/html-language-features/client/src/node/htmlClientMain.ts
+++ b/extensions/html-language-features/client/src/node/htmlClientMain.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { getNodeFileFS } from './nodeFs';
-import { Disposable, ExtensionContext } from 'vscode';
+import { Disposable, ExtensionContext, l10n } from 'vscode';
 import { startClient, LanguageClientConstructor, AsyncDisposable } from '../htmlClient';
 import { ServerOptions, TransportKind, LanguageClientOptions, LanguageClient } from 'vscode-languageclient/node';
 import { TextDecoder } from 'util';
@@ -45,6 +45,10 @@ export async function activate(context: ExtensionContext) {
 		}
 	};
 
+
+	// pass the location of the localization bundle to the server
+	process.env['VSCODE_L10N_BUNDLE_LOCATION'] = l10n.uri?.toString() ?? '';
+
 	client = await startClient(context, newLanguageClient, { fileFs: getNodeFileFS(), TextDecoder, telemetry, timer });
 }
 
diff --git a/extensions/html-language-features/package.json b/extensions/html-language-features/package.json
index 351f0a38b6bb48..8aed56c43c300f 100644
--- a/extensions/html-language-features/package.json
+++ b/extensions/html-language-features/package.json
@@ -259,8 +259,8 @@
     ]
   },
   "dependencies": {
-    "@vscode/extension-telemetry": "0.7.1-preview",
-    "vscode-languageclient": "^8.1.0-next.1",
+    "@vscode/extension-telemetry": "0.7.2-preview",
+    "vscode-languageclient": "^8.1.0-next.2",
     "vscode-uri": "^3.0.6"
   },
   "devDependencies": {
diff --git a/extensions/html-language-features/server/build/javaScriptLibraryLoader.js b/extensions/html-language-features/server/build/javaScriptLibraryLoader.js
index 51e74618042edb..b8b0f8c4eb64a8 100644
--- a/extensions/html-language-features/server/build/javaScriptLibraryLoader.js
+++ b/extensions/html-language-features/server/build/javaScriptLibraryLoader.js
@@ -61,7 +61,7 @@ module.exports = function () {
 		output: `"${escapeText(lines.join('\n'))}"`
 	});
 
-	strResult = `\nconst libs : { [name:string]: string; } = {\n`
+	let strResult = `\nconst libs : { [name:string]: string; } = {\n`
 	for (let i = result.length - 1; i >= 0; i--) {
 		strResult += `"${result[i].name}": ${result[i].output},\n`;
 	}
diff --git a/extensions/html-language-features/server/extension-browser.webpack.config.js b/extensions/html-language-features/server/extension-browser.webpack.config.js
index 7275f7c8b77376..7e6256b4a45f8e 100644
--- a/extensions/html-language-features/server/extension-browser.webpack.config.js
+++ b/extensions/html-language-features/server/extension-browser.webpack.config.js
@@ -13,7 +13,7 @@ const path = require('path');
 const serverConfig = withBrowserDefaults({
 	context: __dirname,
 	entry: {
-		extension: './src/browser/htmlServerMain.ts',
+		extension: './src/browser/htmlServerWorkerMain.ts',
 	},
 	output: {
 		filename: 'htmlServerMain.js',
diff --git a/extensions/html-language-features/server/package.json b/extensions/html-language-features/server/package.json
index d6e3cff224cddb..cc01e29ca0399f 100644
--- a/extensions/html-language-features/server/package.json
+++ b/extensions/html-language-features/server/package.json
@@ -9,11 +9,12 @@
   },
   "main": "./out/node/htmlServerMain",
   "dependencies": {
-    "vscode-css-languageservice": "^6.1.1",
-    "vscode-html-languageservice": "^5.0.2",
-    "vscode-languageserver": "^8.1.0-next.1",
+    "vscode-css-languageservice": "^6.2.1",
+    "vscode-html-languageservice": "^5.0.3",
+    "vscode-languageserver": "^8.1.0-next.2",
     "vscode-languageserver-textdocument": "^1.0.7",
-    "vscode-uri": "^3.0.6"
+    "vscode-uri": "^3.0.6",
+    "@vscode/l10n": "^0.0.10"
   },
   "devDependencies": {
     "@types/mocha": "^9.1.1",
diff --git a/extensions/html-language-features/server/src/browser/htmlServerWorkerMain.ts b/extensions/html-language-features/server/src/browser/htmlServerWorkerMain.ts
new file mode 100644
index 00000000000000..3986b9b6e91f01
--- /dev/null
+++ b/extensions/html-language-features/server/src/browser/htmlServerWorkerMain.ts
@@ -0,0 +1,19 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+declare let self: any;
+
+import * as l10n from '@vscode/l10n';
+
+let initialized = false;
+self.onmessage = async (e: any) => {
+	if (!initialized) {
+		initialized = true;
+		const i10lLocation = e.data.i10lLocation;
+		if (i10lLocation) {
+			await l10n.config({ uri: i10lLocation });
+		}
+		await import('./htmlServerMain');
+	}
+};
diff --git a/extensions/html-language-features/server/yarn.lock b/extensions/html-language-features/server/yarn.lock
index 20858a0f33f034..9b73ce5a763f65 100644
--- a/extensions/html-language-features/server/yarn.lock
+++ b/extensions/html-language-features/server/yarn.lock
@@ -12,37 +12,42 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae"
   integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==
 
-vscode-css-languageservice@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-6.1.1.tgz#36daefd96e56b7453da16ff8c16f4ee693f32521"
-  integrity sha512-7d2NCq2plT0njAKmGZ11uof95y2fwbgq8QuToE3kX9uYQfVmejHX2/lFGKbK5AV5+Ja0L80UZoU0QspwqMKMHA==
+"@vscode/l10n@^0.0.10":
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/@vscode/l10n/-/l10n-0.0.10.tgz#9c513107c690c0dd16e3ec61e453743de15ebdb0"
+  integrity sha512-E1OCmDcDWa0Ya7vtSjp/XfHFGqYJfh+YPC1RkATU71fTac+j1JjCcB3qwSzmlKAighx2WxhLlfhS0RwAN++PFQ==
+
+vscode-css-languageservice@^6.2.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-6.2.1.tgz#0d86683ecac04d81cb973211a9e22c2d6c6eeba7"
+  integrity sha512-FMaMjB2LQdkHjTCP2CWh2S94xuGsxSc8xr0H9nAACVd/iUDyZLoKFjwoB+mA3v0rpCH2U5vVCVwxyULy61CgqA==
   dependencies:
+    "@vscode/l10n" "^0.0.10"
     vscode-languageserver-textdocument "^1.0.7"
     vscode-languageserver-types "^3.17.2"
-    vscode-nls "^5.2.0"
-    vscode-uri "^3.0.4"
+    vscode-uri "^3.0.6"
 
-vscode-html-languageservice@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-5.0.2.tgz#a66cb9d779f3094a8d14dd3a8f7935748435fd2a"
-  integrity sha512-TQmeyE14Ure/w/S+RV2IItuRWmw/i1QaS+om6t70iHCpamuTTWnACQPMSltVGm/DlbdyMquUePJREjd/h3AVkQ==
+vscode-html-languageservice@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-5.0.3.tgz#2a10eb324a132e01af8e0340c2cc5af88f256955"
+  integrity sha512-6rfrtcHhXDMXmC5pR2WXrx02HiNCzQDynOBMn+53zLxr2hvZrDzoc0QgC0FaFGfcglf7GeOsfhkWvJBFC/a70g==
   dependencies:
+    "@vscode/l10n" "^0.0.10"
     vscode-languageserver-textdocument "^1.0.7"
     vscode-languageserver-types "^3.17.2"
-    vscode-nls "^5.2.0"
-    vscode-uri "^3.0.4"
+    vscode-uri "^3.0.6"
 
-vscode-jsonrpc@8.1.0-next.1:
-  version "8.1.0-next.1"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0-next.1.tgz#7c38cb1cbd968c409522593004fdac845a55b155"
-  integrity sha512-FiPG+9TuMIga3t+kkalQytwqMtJu1djI+Pq+Ut2tvAJpcNHDJ0PYdjFv5mgEvTEJLujrYwjWHVkNe+XfHPBD/w==
+vscode-jsonrpc@8.1.0-next.3:
+  version "8.1.0-next.3"
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0-next.3.tgz#964c91a3bfd1949b4c3da7136ba46b48b42991ad"
+  integrity sha512-4eDeAnkWFKFTmT7tUR2wDngNAuwGHvV7yPCzPWGudBWJOoXaPQnwmiQChoj+umH1y2NR+MdBtx49xlZA7FoLRQ==
 
-vscode-languageserver-protocol@3.17.3-next.1:
-  version "3.17.3-next.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3-next.1.tgz#804880c172b4c48d1a48a91c4c23250121effb19"
-  integrity sha512-vgjvPE0zox+1Fi4ljsSFJ+B3g8wGNbuAEEdulueVdv+R2VHtc06+dgxhWiG4LKPqXwjPDmiuxCnvd2xk3fzTTw==
+vscode-languageserver-protocol@3.17.3-next.2:
+  version "3.17.3-next.2"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3-next.2.tgz#e906471899b9ed2ae1139f95592e0e5c7580bf0f"
+  integrity sha512-T+vSRHgApc1xCsOUJ/M7UN/tN4aINvc3FYJ6P3vAhvv0i4jZZewFMEonZB76B94TiY6z4eScgaG6m73gTgnyyw==
   dependencies:
-    vscode-jsonrpc "8.1.0-next.1"
+    vscode-jsonrpc "8.1.0-next.3"
     vscode-languageserver-types "3.17.2"
 
 vscode-languageserver-textdocument@^1.0.7:
@@ -55,19 +60,14 @@ vscode-languageserver-types@3.17.2, vscode-languageserver-types@^3.17.2:
   resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz#b2c2e7de405ad3d73a883e91989b850170ffc4f2"
   integrity sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA==
 
-vscode-languageserver@^8.1.0-next.1:
-  version "8.1.0-next.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.1.0-next.1.tgz#1c173de554889bd18ca6e20eaf4bdc84164c86b4"
-  integrity sha512-u14Rk4JgXI+7iS6AEXI2pNc1dWh/5JEXtaqa4TeBECKJlN+5242mbGBBPaHMOE7sSI1Kh66XhEMZJhPYjUfjHw==
+vscode-languageserver@^8.1.0-next.2:
+  version "8.1.0-next.2"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.1.0-next.2.tgz#8423e0acbc33846c338875acc3c811637415a35e"
+  integrity sha512-natfwUx9lPXO3ki9NtRMPb7GcaKvEE7Sfvzaw3Gpa4GJr47FWYwX26YnWpasDBMAjg5ErpFihY1+j9Gh2W9VwA==
   dependencies:
-    vscode-languageserver-protocol "3.17.3-next.1"
-
-vscode-nls@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f"
-  integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==
+    vscode-languageserver-protocol "3.17.3-next.2"
 
-vscode-uri@^3.0.4, vscode-uri@^3.0.6:
+vscode-uri@^3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.6.tgz#5e6e2e1a4170543af30151b561a41f71db1d6f91"
   integrity sha512-fmL7V1eiDBFRRnu+gfRWTzyPpNIHJTc4mWnFkwBUmO9U3KPgJAmTx7oxi2bl/Rh6HLdU7+4C9wlj0k2E4AdKFQ==
diff --git a/extensions/html-language-features/yarn.lock b/extensions/html-language-features/yarn.lock
index f25b727ebcfc68..8a0e469ca466f8 100644
--- a/extensions/html-language-features/yarn.lock
+++ b/extensions/html-language-features/yarn.lock
@@ -191,10 +191,10 @@
   dependencies:
     "@types/node" "*"
 
-"@vscode/extension-telemetry@0.7.1-preview":
-  version "0.7.1-preview"
-  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.7.1-preview.tgz#1b954b8932b7f27a3993abda25299b8ba7f97233"
-  integrity sha512-7GdA8lMrcMhRfFxVpk7KBNbx+Bh/OpG702C1uPcyOQqp5lH1txJ/8SZAacFqFMKLRnBdGlJRKBREQe/Fs1X/eQ==
+"@vscode/extension-telemetry@0.7.2-preview":
+  version "0.7.2-preview"
+  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.7.2-preview.tgz#1db9c7117c3d82859e61d123786c8aebdf70f2fa"
+  integrity sha512-X9/kIknUt+5xNZzmiunY0yqcpwwIAxUhb4hADjUtgSbkJjp+SjjxeFbLx7u0cWBJPweGxrrcWe3RUiu6s5hETw==
   dependencies:
     "@microsoft/1ds-core-js" "^3.2.8"
     "@microsoft/1ds-post-js" "^3.2.8"
@@ -443,26 +443,26 @@ uuid@^8.3.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-vscode-jsonrpc@8.1.0-next.1:
-  version "8.1.0-next.1"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0-next.1.tgz#7c38cb1cbd968c409522593004fdac845a55b155"
-  integrity sha512-FiPG+9TuMIga3t+kkalQytwqMtJu1djI+Pq+Ut2tvAJpcNHDJ0PYdjFv5mgEvTEJLujrYwjWHVkNe+XfHPBD/w==
+vscode-jsonrpc@8.1.0-next.3:
+  version "8.1.0-next.3"
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0-next.3.tgz#964c91a3bfd1949b4c3da7136ba46b48b42991ad"
+  integrity sha512-4eDeAnkWFKFTmT7tUR2wDngNAuwGHvV7yPCzPWGudBWJOoXaPQnwmiQChoj+umH1y2NR+MdBtx49xlZA7FoLRQ==
 
-vscode-languageclient@^8.1.0-next.1:
-  version "8.1.0-next.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.1.0-next.1.tgz#44b63bc2d215c13f1dea1dc54267a354ea5451cb"
-  integrity sha512-lJraJ8IrqXr83ZciAs4dN32f9kEPuOb/FqAeUTgnW5cAxo0Qux0/EMgKyU33Qf9LdEI0I9iwRVxQWtawbyUUfg==
+vscode-languageclient@^8.1.0-next.2:
+  version "8.1.0-next.2"
+  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.1.0-next.2.tgz#12a248299d23e48cb9d316129bf9ba0592caa533"
+  integrity sha512-ZGCQaqXyT7Y4H68zDQ/8XnNzo9tlUxuarJa0hT5EncAC0vmVAxLvhbsz2iSlWx3j6UZUgBM0b6UZtjpzkqr3tQ==
   dependencies:
     minimatch "^5.1.0"
     semver "^7.3.7"
-    vscode-languageserver-protocol "3.17.3-next.1"
+    vscode-languageserver-protocol "3.17.3-next.2"
 
-vscode-languageserver-protocol@3.17.3-next.1:
-  version "3.17.3-next.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3-next.1.tgz#804880c172b4c48d1a48a91c4c23250121effb19"
-  integrity sha512-vgjvPE0zox+1Fi4ljsSFJ+B3g8wGNbuAEEdulueVdv+R2VHtc06+dgxhWiG4LKPqXwjPDmiuxCnvd2xk3fzTTw==
+vscode-languageserver-protocol@3.17.3-next.2:
+  version "3.17.3-next.2"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3-next.2.tgz#e906471899b9ed2ae1139f95592e0e5c7580bf0f"
+  integrity sha512-T+vSRHgApc1xCsOUJ/M7UN/tN4aINvc3FYJ6P3vAhvv0i4jZZewFMEonZB76B94TiY6z4eScgaG6m73gTgnyyw==
   dependencies:
-    vscode-jsonrpc "8.1.0-next.1"
+    vscode-jsonrpc "8.1.0-next.3"
     vscode-languageserver-types "3.17.2"
 
 vscode-languageserver-types@3.17.2:
diff --git a/extensions/html/build/update-grammar.mjs b/extensions/html/build/update-grammar.mjs
index 1fd330e028942c..64bfe548faa074 100644
--- a/extensions/html/build/update-grammar.mjs
+++ b/extensions/html/build/update-grammar.mjs
@@ -11,7 +11,7 @@ function patchGrammar(grammar) {
 
 	let visit = function (rule, parent) {
 		if (rule.name === 'source.js' || rule.name === 'source.css') {
-			if (parent.parent && parent.parent.property === 'endCaptures') {
+			if (parent.node[0].name !== 'punctuation.definition.string.end.html' && parent.parent && parent.parent.property === 'endCaptures') {
 				rule.name = rule.name + '-ignored-vscode';
 				patchCount++;
 			}
@@ -28,8 +28,8 @@ function patchGrammar(grammar) {
 	for (let key in repository) {
 		visit(repository[key], { node: repository, property: key, parent: undefined });
 	}
-	if (patchCount !== 6) {
-		console.warn(`Expected to patch 6 occurrences of source.js & source.css: Was ${patchCount}`);
+	if (patchCount !== 2) {
+		console.warn(`Expected to patch 2 occurrences of source.js & source.css: Was ${patchCount}`);
 	}
 
 
diff --git a/extensions/html/syntaxes/html.tmLanguage.json b/extensions/html/syntaxes/html.tmLanguage.json
index 1e1c85c899f056..982690de52df72 100644
--- a/extensions/html/syntaxes/html.tmLanguage.json
+++ b/extensions/html/syntaxes/html.tmLanguage.json
@@ -108,7 +108,7 @@
 													"name": "punctuation.definition.string.end.html"
 												},
 												"1": {
-													"name": "source.css-ignored-vscode"
+													"name": "source.css"
 												}
 											},
 											"name": "string.quoted.double.html",
@@ -132,7 +132,7 @@
 													"name": "punctuation.definition.string.end.html"
 												},
 												"1": {
-													"name": "source.css-ignored-vscode"
+													"name": "source.css"
 												}
 											},
 											"name": "string.quoted.single.html",
@@ -207,7 +207,7 @@
 													"name": "punctuation.definition.string.end.html"
 												},
 												"1": {
-													"name": "source.js-ignored-vscode"
+													"name": "source.js"
 												}
 											},
 											"name": "string.quoted.double.html",
@@ -265,7 +265,7 @@
 													"name": "punctuation.definition.string.end.html"
 												},
 												"1": {
-													"name": "source.js-ignored-vscode"
+													"name": "source.js"
 												}
 											},
 											"name": "string.quoted.single.html",
diff --git a/extensions/ipynb/src/test/index.ts b/extensions/ipynb/src/test/index.ts
index 0099ddd699fa9e..290194bfb2f5dd 100644
--- a/extensions/ipynb/src/test/index.ts
+++ b/extensions/ipynb/src/test/index.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-const path = require('path');
-const testRunner = require('../../../../test/integration/electron/testrunner');
+import * as path from 'path';
+import * as testRunner from '../../../../test/integration/electron/testrunner';
 
-const options: any = {
+const options: import('mocha').MochaOptions = {
 	ui: 'tdd',
 	color: true,
 	timeout: 60000
diff --git a/extensions/javascript/package.json b/extensions/javascript/package.json
index e3a087bfc9277e..26e71b46d646f1 100644
--- a/extensions/javascript/package.json
+++ b/extensions/javascript/package.json
@@ -18,6 +18,7 @@
       {
         "id": "javascriptreact",
         "aliases": [
+          "JavaScript JSX",
           "JavaScript React",
           "jsx"
         ],
diff --git a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
index ed2e78282ca4a8..231e333bf70de7 100644
--- a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
+++ b/extensions/javascript/syntaxes/JavaScript.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/TypeScript-TmLanguage/commit/c2744520e325330d0608fc1d1993d7fe98e66202",
+	"version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/359e091c0a83a45e20aefc13111ed4a19e201f97",
 	"name": "JavaScript (with React support)",
 	"scopeName": "source.js",
 	"patterns": [
@@ -1862,7 +1862,7 @@
 		},
 		"property-accessor": {
 			"name": "storage.type.property.js",
-			"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(get|set)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+			"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(accessor|get|set)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
 		},
 		"async-modifier": {
 			"name": "storage.modifier.async.js",
diff --git a/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json b/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json
index 88910529ee49ca..9d5204512e0225 100644
--- a/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json
+++ b/extensions/javascript/syntaxes/JavaScriptReact.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/TypeScript-TmLanguage/commit/c2744520e325330d0608fc1d1993d7fe98e66202",
+	"version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/359e091c0a83a45e20aefc13111ed4a19e201f97",
 	"name": "JavaScript (with React support)",
 	"scopeName": "source.js.jsx",
 	"patterns": [
@@ -1862,7 +1862,7 @@
 		},
 		"property-accessor": {
 			"name": "storage.type.property.js.jsx",
-			"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(get|set)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+			"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(accessor|get|set)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
 		},
 		"async-modifier": {
 			"name": "storage.modifier.async.js.jsx",
diff --git a/extensions/json-language-features/client/src/browser/jsonClientMain.ts b/extensions/json-language-features/client/src/browser/jsonClientMain.ts
index e1fae6ffeb4635..fb0da9c44fa617 100644
--- a/extensions/json-language-features/client/src/browser/jsonClientMain.ts
+++ b/extensions/json-language-features/client/src/browser/jsonClientMain.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ExtensionContext, Uri } from 'vscode';
+import { ExtensionContext, Uri, l10n } from 'vscode';
 import { BaseLanguageClient, LanguageClientOptions } from 'vscode-languageclient';
 import { startClient, LanguageClientConstructor, SchemaRequestService } from '../jsonClient';
 import { LanguageClient } from 'vscode-languageclient/browser';
@@ -21,6 +21,8 @@ export async function activate(context: ExtensionContext) {
 	const serverMain = Uri.joinPath(context.extensionUri, 'server/dist/browser/jsonServerMain.js');
 	try {
 		const worker = new Worker(serverMain.toString());
+		worker.postMessage({ i10lLocation: l10n.uri?.toString(false) ?? '' });
+
 		const newLanguageClient: LanguageClientConstructor = (id: string, name: string, clientOptions: LanguageClientOptions) => {
 			return new LanguageClient(id, name, clientOptions, worker);
 		};
diff --git a/extensions/json-language-features/client/src/node/jsonClientMain.ts b/extensions/json-language-features/client/src/node/jsonClientMain.ts
index e89ade0e472078..10895276e1ff61 100644
--- a/extensions/json-language-features/client/src/node/jsonClientMain.ts
+++ b/extensions/json-language-features/client/src/node/jsonClientMain.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ExtensionContext, OutputChannel, window, workspace } from 'vscode';
+import { ExtensionContext, OutputChannel, window, workspace, l10n } from 'vscode';
 import { startClient, LanguageClientConstructor, SchemaRequestService, languageServerDescription } from '../jsonClient';
 import { ServerOptions, TransportKind, LanguageClientOptions, LanguageClient, BaseLanguageClient } from 'vscode-languageclient/node';
 
@@ -44,6 +44,9 @@ export async function activate(context: ExtensionContext) {
 	const log = getLog(outputChannel);
 	context.subscriptions.push(log);
 
+	// pass the location of the localization bundle to the server
+	process.env['VSCODE_L10N_BUNDLE_LOCATION'] = l10n.uri?.toString() ?? '';
+
 	const schemaRequests = await getSchemaRequestService(context, log);
 
 	client = await startClient(context, newLanguageClient, { schemaRequests, telemetry });
diff --git a/extensions/json-language-features/package.json b/extensions/json-language-features/package.json
index f6879131c3e669..e5e45f7fc0c868 100644
--- a/extensions/json-language-features/package.json
+++ b/extensions/json-language-features/package.json
@@ -156,9 +156,9 @@
     ]
   },
   "dependencies": {
-    "@vscode/extension-telemetry": "0.7.1-preview",
-    "request-light": "^0.5.8",
-    "vscode-languageclient": "^8.1.0-next.1"
+    "@vscode/extension-telemetry": "0.7.2-preview",
+    "request-light": "^0.6.0",
+    "vscode-languageclient": "^8.1.0-next.2"
   },
   "devDependencies": {
     "@types/node": "16.x"
diff --git a/extensions/json-language-features/server/extension-browser.webpack.config.js b/extensions/json-language-features/server/extension-browser.webpack.config.js
index 0d270258a87b4a..31c3b9b4316dda 100644
--- a/extensions/json-language-features/server/extension-browser.webpack.config.js
+++ b/extensions/json-language-features/server/extension-browser.webpack.config.js
@@ -13,7 +13,7 @@ const path = require('path');
 module.exports = withBrowserDefaults({
 	context: __dirname,
 	entry: {
-		extension: './src/browser/jsonServerMain.ts',
+		extension: './src/browser/jsonServerWorkerMain.ts',
 	},
 	output: {
 		filename: 'jsonServerMain.js',
diff --git a/extensions/json-language-features/server/package.json b/extensions/json-language-features/server/package.json
index 04a3ec18dfdab1..6c7f5ce475b338 100644
--- a/extensions/json-language-features/server/package.json
+++ b/extensions/json-language-features/server/package.json
@@ -13,10 +13,11 @@
   "main": "./out/node/jsonServerMain",
   "dependencies": {
     "jsonc-parser": "^3.2.0",
-    "request-light": "^0.5.8",
-    "vscode-json-languageservice": "^5.1.1",
-    "vscode-languageserver": "^8.1.0-next.1",
-    "vscode-uri": "^3.0.6"
+    "request-light": "^0.6.0",
+    "vscode-json-languageservice": "^5.1.3",
+    "vscode-languageserver": "^8.1.0-next.2",
+    "vscode-uri": "^3.0.6",
+    "@vscode/l10n": "^0.0.10"
   },
   "devDependencies": {
     "@types/mocha": "^9.1.1",
diff --git a/extensions/json-language-features/server/src/browser/jsonServerWorkerMain.ts b/extensions/json-language-features/server/src/browser/jsonServerWorkerMain.ts
new file mode 100644
index 00000000000000..84f36d89ac83cc
--- /dev/null
+++ b/extensions/json-language-features/server/src/browser/jsonServerWorkerMain.ts
@@ -0,0 +1,19 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+declare let self: any;
+
+import * as l10n from '@vscode/l10n';
+
+let initialized = false;
+self.onmessage = async (e: any) => {
+	if (!initialized) {
+		initialized = true;
+		const i10lLocation = e.data.i10lLocation;
+		if (i10lLocation) {
+			await l10n.config({ uri: i10lLocation });
+		}
+		await import('./jsonServerMain');
+	}
+};
diff --git a/extensions/json-language-features/server/yarn.lock b/extensions/json-language-features/server/yarn.lock
index feb920a12d7233..78bfe200b9091a 100644
--- a/extensions/json-language-features/server/yarn.lock
+++ b/extensions/json-language-features/server/yarn.lock
@@ -12,38 +12,43 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae"
   integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==
 
+"@vscode/l10n@^0.0.10":
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/@vscode/l10n/-/l10n-0.0.10.tgz#9c513107c690c0dd16e3ec61e453743de15ebdb0"
+  integrity sha512-E1OCmDcDWa0Ya7vtSjp/XfHFGqYJfh+YPC1RkATU71fTac+j1JjCcB3qwSzmlKAighx2WxhLlfhS0RwAN++PFQ==
+
 jsonc-parser@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
   integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==
 
-request-light@^0.5.8:
-  version "0.5.8"
-  resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.5.8.tgz#8bf73a07242b9e7b601fac2fa5dc22a094abcc27"
-  integrity sha512-3Zjgh+8b5fhRJBQZoy+zbVKpAQGLyka0MPgW3zruTF4dFFJ8Fqcfu9YsAvi/rvdcaTeWG3MkbZv4WKxAn/84Lg==
+request-light@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.6.0.tgz#eeba010ca523e8833ceabc73e1aa6939515f6df0"
+  integrity sha512-D3TyWnzX4Kej7ZomWbD+ZqnmzKw/otLHU4tsuhsnF3CoIBo9y0JsxkQXGAqBC4FH/y1hm/ry0/hrsVaKMCkljA==
 
-vscode-json-languageservice@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-5.1.1.tgz#d7e36351cf54abc1a5456fe29ae04a6a5f801e88"
-  integrity sha512-EtAcTD6MOfyf8+MokDsAHNM7ttuZvCo077w9aMtJiyps41gkOcoBThAbXDk6Y0Oi6ki5aDs8lgY4KxYiVW/lxA==
+vscode-json-languageservice@^5.1.3:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-5.1.3.tgz#db724ff1832afcc3e2fc5b5d0fa01882476fcec1"
+  integrity sha512-p0O1Ql5+zyWFIBU4cSxnDcuq9OnbE0MmvNKDYYvz4EPsZ9EHBT3I6KJb5Gk3snkj+jQTFILEZ06cfY7WZxxqPw==
   dependencies:
+    "@vscode/l10n" "^0.0.10"
     jsonc-parser "^3.2.0"
     vscode-languageserver-textdocument "^1.0.7"
     vscode-languageserver-types "^3.17.2"
-    vscode-nls "^5.2.0"
     vscode-uri "^3.0.6"
 
-vscode-jsonrpc@8.1.0-next.1:
-  version "8.1.0-next.1"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0-next.1.tgz#7c38cb1cbd968c409522593004fdac845a55b155"
-  integrity sha512-FiPG+9TuMIga3t+kkalQytwqMtJu1djI+Pq+Ut2tvAJpcNHDJ0PYdjFv5mgEvTEJLujrYwjWHVkNe+XfHPBD/w==
+vscode-jsonrpc@8.1.0-next.3:
+  version "8.1.0-next.3"
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0-next.3.tgz#964c91a3bfd1949b4c3da7136ba46b48b42991ad"
+  integrity sha512-4eDeAnkWFKFTmT7tUR2wDngNAuwGHvV7yPCzPWGudBWJOoXaPQnwmiQChoj+umH1y2NR+MdBtx49xlZA7FoLRQ==
 
-vscode-languageserver-protocol@3.17.3-next.1:
-  version "3.17.3-next.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3-next.1.tgz#804880c172b4c48d1a48a91c4c23250121effb19"
-  integrity sha512-vgjvPE0zox+1Fi4ljsSFJ+B3g8wGNbuAEEdulueVdv+R2VHtc06+dgxhWiG4LKPqXwjPDmiuxCnvd2xk3fzTTw==
+vscode-languageserver-protocol@3.17.3-next.2:
+  version "3.17.3-next.2"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3-next.2.tgz#e906471899b9ed2ae1139f95592e0e5c7580bf0f"
+  integrity sha512-T+vSRHgApc1xCsOUJ/M7UN/tN4aINvc3FYJ6P3vAhvv0i4jZZewFMEonZB76B94TiY6z4eScgaG6m73gTgnyyw==
   dependencies:
-    vscode-jsonrpc "8.1.0-next.1"
+    vscode-jsonrpc "8.1.0-next.3"
     vscode-languageserver-types "3.17.2"
 
 vscode-languageserver-textdocument@^1.0.7:
@@ -56,17 +61,12 @@ vscode-languageserver-types@3.17.2, vscode-languageserver-types@^3.17.2:
   resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz#b2c2e7de405ad3d73a883e91989b850170ffc4f2"
   integrity sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA==
 
-vscode-languageserver@^8.1.0-next.1:
-  version "8.1.0-next.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.1.0-next.1.tgz#1c173de554889bd18ca6e20eaf4bdc84164c86b4"
-  integrity sha512-u14Rk4JgXI+7iS6AEXI2pNc1dWh/5JEXtaqa4TeBECKJlN+5242mbGBBPaHMOE7sSI1Kh66XhEMZJhPYjUfjHw==
+vscode-languageserver@^8.1.0-next.2:
+  version "8.1.0-next.2"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.1.0-next.2.tgz#8423e0acbc33846c338875acc3c811637415a35e"
+  integrity sha512-natfwUx9lPXO3ki9NtRMPb7GcaKvEE7Sfvzaw3Gpa4GJr47FWYwX26YnWpasDBMAjg5ErpFihY1+j9Gh2W9VwA==
   dependencies:
-    vscode-languageserver-protocol "3.17.3-next.1"
-
-vscode-nls@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f"
-  integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==
+    vscode-languageserver-protocol "3.17.3-next.2"
 
 vscode-uri@^3.0.6:
   version "3.0.6"
diff --git a/extensions/json-language-features/yarn.lock b/extensions/json-language-features/yarn.lock
index 3ce50dc03b4135..9d69b080a34bbd 100644
--- a/extensions/json-language-features/yarn.lock
+++ b/extensions/json-language-features/yarn.lock
@@ -191,10 +191,10 @@
   dependencies:
     "@types/node" "*"
 
-"@vscode/extension-telemetry@0.7.1-preview":
-  version "0.7.1-preview"
-  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.7.1-preview.tgz#1b954b8932b7f27a3993abda25299b8ba7f97233"
-  integrity sha512-7GdA8lMrcMhRfFxVpk7KBNbx+Bh/OpG702C1uPcyOQqp5lH1txJ/8SZAacFqFMKLRnBdGlJRKBREQe/Fs1X/eQ==
+"@vscode/extension-telemetry@0.7.2-preview":
+  version "0.7.2-preview"
+  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.7.2-preview.tgz#1db9c7117c3d82859e61d123786c8aebdf70f2fa"
+  integrity sha512-X9/kIknUt+5xNZzmiunY0yqcpwwIAxUhb4hADjUtgSbkJjp+SjjxeFbLx7u0cWBJPweGxrrcWe3RUiu6s5hETw==
   dependencies:
     "@microsoft/1ds-core-js" "^3.2.8"
     "@microsoft/1ds-post-js" "^3.2.8"
@@ -368,10 +368,10 @@ querystringify@^2.1.1:
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
   integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
 
-request-light@^0.5.8:
-  version "0.5.8"
-  resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.5.8.tgz#8bf73a07242b9e7b601fac2fa5dc22a094abcc27"
-  integrity sha512-3Zjgh+8b5fhRJBQZoy+zbVKpAQGLyka0MPgW3zruTF4dFFJ8Fqcfu9YsAvi/rvdcaTeWG3MkbZv4WKxAn/84Lg==
+request-light@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.6.0.tgz#eeba010ca523e8833ceabc73e1aa6939515f6df0"
+  integrity sha512-D3TyWnzX4Kej7ZomWbD+ZqnmzKw/otLHU4tsuhsnF3CoIBo9y0JsxkQXGAqBC4FH/y1hm/ry0/hrsVaKMCkljA==
 
 requires-port@^1.0.0:
   version "1.0.0"
@@ -448,26 +448,26 @@ uuid@^8.3.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-vscode-jsonrpc@8.1.0-next.1:
-  version "8.1.0-next.1"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0-next.1.tgz#7c38cb1cbd968c409522593004fdac845a55b155"
-  integrity sha512-FiPG+9TuMIga3t+kkalQytwqMtJu1djI+Pq+Ut2tvAJpcNHDJ0PYdjFv5mgEvTEJLujrYwjWHVkNe+XfHPBD/w==
+vscode-jsonrpc@8.1.0-next.3:
+  version "8.1.0-next.3"
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0-next.3.tgz#964c91a3bfd1949b4c3da7136ba46b48b42991ad"
+  integrity sha512-4eDeAnkWFKFTmT7tUR2wDngNAuwGHvV7yPCzPWGudBWJOoXaPQnwmiQChoj+umH1y2NR+MdBtx49xlZA7FoLRQ==
 
-vscode-languageclient@^8.1.0-next.1:
-  version "8.1.0-next.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.1.0-next.1.tgz#44b63bc2d215c13f1dea1dc54267a354ea5451cb"
-  integrity sha512-lJraJ8IrqXr83ZciAs4dN32f9kEPuOb/FqAeUTgnW5cAxo0Qux0/EMgKyU33Qf9LdEI0I9iwRVxQWtawbyUUfg==
+vscode-languageclient@^8.1.0-next.2:
+  version "8.1.0-next.2"
+  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.1.0-next.2.tgz#12a248299d23e48cb9d316129bf9ba0592caa533"
+  integrity sha512-ZGCQaqXyT7Y4H68zDQ/8XnNzo9tlUxuarJa0hT5EncAC0vmVAxLvhbsz2iSlWx3j6UZUgBM0b6UZtjpzkqr3tQ==
   dependencies:
     minimatch "^5.1.0"
     semver "^7.3.7"
-    vscode-languageserver-protocol "3.17.3-next.1"
+    vscode-languageserver-protocol "3.17.3-next.2"
 
-vscode-languageserver-protocol@3.17.3-next.1:
-  version "3.17.3-next.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3-next.1.tgz#804880c172b4c48d1a48a91c4c23250121effb19"
-  integrity sha512-vgjvPE0zox+1Fi4ljsSFJ+B3g8wGNbuAEEdulueVdv+R2VHtc06+dgxhWiG4LKPqXwjPDmiuxCnvd2xk3fzTTw==
+vscode-languageserver-protocol@3.17.3-next.2:
+  version "3.17.3-next.2"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3-next.2.tgz#e906471899b9ed2ae1139f95592e0e5c7580bf0f"
+  integrity sha512-T+vSRHgApc1xCsOUJ/M7UN/tN4aINvc3FYJ6P3vAhvv0i4jZZewFMEonZB76B94TiY6z4eScgaG6m73gTgnyyw==
   dependencies:
-    vscode-jsonrpc "8.1.0-next.1"
+    vscode-jsonrpc "8.1.0-next.3"
     vscode-languageserver-types "3.17.2"
 
 vscode-languageserver-types@3.17.2:
diff --git a/extensions/latex/cgmanifest.json b/extensions/latex/cgmanifest.json
index 7d36599bab8942..906052b03258fd 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": "e02a22742b3e6e0ee088e9c11109950abd7441d0"
+					"commitHash": "7497a8c9ae12324ac3df3bb5053a2a0c43f80315"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/latex/syntaxes/LaTeX.tmLanguage.json b/extensions/latex/syntaxes/LaTeX.tmLanguage.json
index c2a0f0529f713d..98999b1ffd8762 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/e02a22742b3e6e0ee088e9c11109950abd7441d0",
+	"version": "https://github.com/jlelong/vscode-latex-basics/commit/7497a8c9ae12324ac3df3bb5053a2a0c43f80315",
 	"name": "LaTeX",
 	"scopeName": "text.tex.latex",
 	"patterns": [
@@ -14,27 +14,16 @@
 			"name": "meta.space-after-command.latex"
 		},
 		{
-			"begin": "((\\\\)(?:usepackage|documentclass))((?:\\[[^\\[]*?\\])*)(\\{)",
+			"begin": "((\\\\)(?:usepackage|documentclass))\\b(?=\\[|\\{)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.preamble.latex"
 				},
 				"2": {
 					"name": "punctuation.definition.function.latex"
-				},
-				"3": {
-					"patterns": [
-						{
-							"include": "#optional-arg"
-						}
-					]
-				},
-				"4": {
-					"name": "punctuation.definition.arguments.begin.latex"
 				}
 			},
-			"contentName": "support.class.latex",
-			"end": "\\}",
+			"end": "(?<=\\})",
 			"endCaptures": {
 				"0": {
 					"name": "punctuation.definition.arguments.end.latex"
@@ -43,7 +32,27 @@
 			"name": "meta.preamble.latex",
 			"patterns": [
 				{
-					"include": "$self"
+					"include": "#multiline-optional-arg"
+				},
+				{
+					"begin": "((?:\\G|(?<=\\]))\\{)",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.arguments.begin.latex"
+						}
+					},
+					"end": "(\\})",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.arguments.end.latex"
+						}
+					},
+					"contentName": "support.class.latex",
+					"patterns": [
+						{
+							"include": "$self"
+						}
+					]
 				}
 			]
 		},
@@ -146,325 +155,360 @@
 			]
 		},
 		{
-			"begin": "(^\\s*)?(?=\\\\begin\\{(lstlisting|minted|pyglist)\\})",
-			"beginCaptures": {
-				"0": {
-					"name": "punctuation.whitespace.embedded.leading.latex"
-				}
-			},
-			"end": "(?!\\G)(\\s*$\\n?)?",
-			"endCaptures": {
+			"begin": "(^\\s*)?\\\\begin\\{(lstlisting|minted|pyglist)\\}(?=\\[|\\{)",
+			"end": "\\\\end\\{(?:minted|lstlisting|pyglist)\\}",
+			"captures": {
 				"0": {
-					"name": "punctuation.whitespace.embedded.trailing.latex"
+					"patterns": [
+						{
+							"include": "#begin-env-tokenizer"
+						}
+					]
 				}
 			},
 			"patterns": [
 				{
-					"begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:c|cpp)\\})",
-					"captures": {
+					"include": "#multiline-optional-arg-no-highlight"
+				},
+				{
+					"begin": "(?:\\G|(?<=\\]))(\\{)((?:c|cpp))(\\})",
+					"beginCaptures": {
 						"1": {
-							"patterns": [
-								{
-									"include": "#begin-env-tokenizer"
-								}
-							]
+							"name": "punctuation.definition.arguments.begin.latex"
+						},
+						"2": {
+							"name": "variable.parameter.function.latex"
+						},
+						"3": {
+							"name": "punctuation.definition.arguments.end.latex"
 						}
 					},
+					"end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
 					"contentName": "source.cpp.embedded.latex",
 					"patterns": [
 						{
 							"include": "source.cpp.embedded.latex"
 						}
-					],
-					"end": "(\\\\end\\{minted\\})"
+					]
 				},
 				{
-					"begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:asy|asymptote)\\})",
-					"captures": {
+					"begin": "(?:\\G|(?<=\\]))(\\{)((?:asy|asymptote))(\\})",
+					"beginCaptures": {
 						"1": {
-							"patterns": [
-								{
-									"include": "#begin-env-tokenizer"
-								}
-							]
+							"name": "punctuation.definition.arguments.begin.latex"
+						},
+						"2": {
+							"name": "variable.parameter.function.latex"
+						},
+						"3": {
+							"name": "punctuation.definition.arguments.end.latex"
 						}
 					},
+					"end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
 					"contentName": "source.asy",
 					"patterns": [
 						{
 							"include": "source.asy"
 						}
-					],
-					"end": "(\\\\end\\{minted\\})"
+					]
 				},
 				{
-					"begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:css)\\})",
-					"captures": {
+					"begin": "(?:\\G|(?<=\\]))(\\{)((?:css))(\\})",
+					"beginCaptures": {
 						"1": {
-							"patterns": [
-								{
-									"include": "#begin-env-tokenizer"
-								}
-							]
+							"name": "punctuation.definition.arguments.begin.latex"
+						},
+						"2": {
+							"name": "variable.parameter.function.latex"
+						},
+						"3": {
+							"name": "punctuation.definition.arguments.end.latex"
 						}
 					},
+					"end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
 					"contentName": "source.css",
 					"patterns": [
 						{
 							"include": "source.css"
 						}
-					],
-					"end": "(\\\\end\\{minted\\})"
+					]
 				},
 				{
-					"begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:hs|haskell)\\})",
-					"captures": {
+					"begin": "(?:\\G|(?<=\\]))(\\{)((?:hs|haskell))(\\})",
+					"beginCaptures": {
 						"1": {
-							"patterns": [
-								{
-									"include": "#begin-env-tokenizer"
-								}
-							]
+							"name": "punctuation.definition.arguments.begin.latex"
+						},
+						"2": {
+							"name": "variable.parameter.function.latex"
+						},
+						"3": {
+							"name": "punctuation.definition.arguments.end.latex"
 						}
 					},
+					"end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
 					"contentName": "source.haskell",
 					"patterns": [
 						{
 							"include": "source.haskell"
 						}
-					],
-					"end": "(\\\\end\\{minted\\})"
+					]
 				},
 				{
-					"begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:html)\\})",
-					"captures": {
+					"begin": "(?:\\G|(?<=\\]))(\\{)((?:html))(\\})",
+					"beginCaptures": {
 						"1": {
-							"patterns": [
-								{
-									"include": "#begin-env-tokenizer"
-								}
-							]
+							"name": "punctuation.definition.arguments.begin.latex"
+						},
+						"2": {
+							"name": "variable.parameter.function.latex"
+						},
+						"3": {
+							"name": "punctuation.definition.arguments.end.latex"
 						}
 					},
+					"end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
 					"contentName": "text.html",
 					"patterns": [
 						{
 							"include": "text.html.basic"
 						}
-					],
-					"end": "(\\\\end\\{minted\\})"
+					]
 				},
 				{
-					"begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:xml)\\})",
-					"captures": {
+					"begin": "(?:\\G|(?<=\\]))(\\{)((?:xml))(\\})",
+					"beginCaptures": {
 						"1": {
-							"patterns": [
-								{
-									"include": "#begin-env-tokenizer"
-								}
-							]
+							"name": "punctuation.definition.arguments.begin.latex"
+						},
+						"2": {
+							"name": "variable.parameter.function.latex"
+						},
+						"3": {
+							"name": "punctuation.definition.arguments.end.latex"
 						}
 					},
+					"end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
 					"contentName": "text.xml",
 					"patterns": [
 						{
 							"include": "text.xml"
 						}
-					],
-					"end": "(\\\\end\\{minted\\})"
+					]
 				},
 				{
-					"begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:java)\\})",
-					"captures": {
+					"begin": "(?:\\G|(?<=\\]))(\\{)((?:java))(\\})",
+					"beginCaptures": {
 						"1": {
-							"patterns": [
-								{
-									"include": "#begin-env-tokenizer"
-								}
-							]
+							"name": "punctuation.definition.arguments.begin.latex"
+						},
+						"2": {
+							"name": "variable.parameter.function.latex"
+						},
+						"3": {
+							"name": "punctuation.definition.arguments.end.latex"
 						}
 					},
+					"end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
 					"contentName": "source.java",
 					"patterns": [
 						{
 							"include": "source.java"
 						}
-					],
-					"end": "(\\\\end\\{minted\\})"
+					]
 				},
 				{
-					"begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:lua)\\})",
-					"captures": {
+					"begin": "(?:\\G|(?<=\\]))(\\{)((?:lua))(\\})",
+					"beginCaptures": {
 						"1": {
-							"patterns": [
-								{
-									"include": "#begin-env-tokenizer"
-								}
-							]
+							"name": "punctuation.definition.arguments.begin.latex"
+						},
+						"2": {
+							"name": "variable.parameter.function.latex"
+						},
+						"3": {
+							"name": "punctuation.definition.arguments.end.latex"
 						}
 					},
+					"end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
 					"contentName": "source.lua",
 					"patterns": [
 						{
 							"include": "source.lua"
 						}
-					],
-					"end": "(\\\\end\\{minted\\})"
+					]
 				},
 				{
-					"begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:jl|julia)\\})",
-					"captures": {
+					"begin": "(?:\\G|(?<=\\]))(\\{)((?:jl|julia))(\\})",
+					"beginCaptures": {
 						"1": {
-							"patterns": [
-								{
-									"include": "#begin-env-tokenizer"
-								}
-							]
+							"name": "punctuation.definition.arguments.begin.latex"
+						},
+						"2": {
+							"name": "variable.parameter.function.latex"
+						},
+						"3": {
+							"name": "punctuation.definition.arguments.end.latex"
 						}
 					},
+					"end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
 					"contentName": "source.julia",
 					"patterns": [
 						{
 							"include": "source.julia"
 						}
-					],
-					"end": "(\\\\end\\{minted\\})"
+					]
 				},
 				{
-					"begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:rb|ruby)\\})",
-					"captures": {
+					"begin": "(?:\\G|(?<=\\]))(\\{)((?:rb|ruby))(\\})",
+					"beginCaptures": {
 						"1": {
-							"patterns": [
-								{
-									"include": "#begin-env-tokenizer"
-								}
-							]
+							"name": "punctuation.definition.arguments.begin.latex"
+						},
+						"2": {
+							"name": "variable.parameter.function.latex"
+						},
+						"3": {
+							"name": "punctuation.definition.arguments.end.latex"
 						}
 					},
+					"end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
 					"contentName": "source.ruby",
 					"patterns": [
 						{
 							"include": "source.ruby"
 						}
-					],
-					"end": "(\\\\end\\{minted\\})"
+					]
 				},
 				{
-					"begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:js|javascript)\\})",
-					"captures": {
+					"begin": "(?:\\G|(?<=\\]))(\\{)((?:js|javascript))(\\})",
+					"beginCaptures": {
 						"1": {
-							"patterns": [
-								{
-									"include": "#begin-env-tokenizer"
-								}
-							]
+							"name": "punctuation.definition.arguments.begin.latex"
+						},
+						"2": {
+							"name": "variable.parameter.function.latex"
+						},
+						"3": {
+							"name": "punctuation.definition.arguments.end.latex"
 						}
 					},
+					"end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
 					"contentName": "source.js",
 					"patterns": [
 						{
 							"include": "source.js"
 						}
-					],
-					"end": "(\\\\end\\{minted\\})"
+					]
 				},
 				{
-					"begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:ts|typescript)\\})",
-					"captures": {
+					"begin": "(?:\\G|(?<=\\]))(\\{)((?:ts|typescript))(\\})",
+					"beginCaptures": {
 						"1": {
-							"patterns": [
-								{
-									"include": "#begin-env-tokenizer"
-								}
-							]
+							"name": "punctuation.definition.arguments.begin.latex"
+						},
+						"2": {
+							"name": "variable.parameter.function.latex"
+						},
+						"3": {
+							"name": "punctuation.definition.arguments.end.latex"
 						}
 					},
+					"end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
 					"contentName": "source.ts",
 					"patterns": [
 						{
 							"include": "source.ts"
 						}
-					],
-					"end": "(\\\\end\\{minted\\})"
+					]
 				},
 				{
-					"begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:py|python)\\})",
-					"captures": {
+					"begin": "(?:\\G|(?<=\\]))(\\{)((?:py|python))(\\})",
+					"beginCaptures": {
 						"1": {
-							"patterns": [
-								{
-									"include": "#begin-env-tokenizer"
-								}
-							]
+							"name": "punctuation.definition.arguments.begin.latex"
+						},
+						"2": {
+							"name": "variable.parameter.function.latex"
+						},
+						"3": {
+							"name": "punctuation.definition.arguments.end.latex"
 						}
 					},
+					"end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
 					"contentName": "source.python",
 					"patterns": [
 						{
 							"include": "source.python"
 						}
-					],
-					"end": "(\\\\end\\{minted\\})"
+					]
 				},
 				{
-					"begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:yaml)\\})",
-					"captures": {
+					"begin": "(?:\\G|(?<=\\]))(\\{)((?:yaml))(\\})",
+					"beginCaptures": {
 						"1": {
-							"patterns": [
-								{
-									"include": "#begin-env-tokenizer"
-								}
-							]
+							"name": "punctuation.definition.arguments.begin.latex"
+						},
+						"2": {
+							"name": "variable.parameter.function.latex"
+						},
+						"3": {
+							"name": "punctuation.definition.arguments.end.latex"
 						}
 					},
+					"end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
 					"contentName": "source.yaml",
 					"patterns": [
 						{
 							"include": "source.yaml"
 						}
-					],
-					"end": "(\\\\end\\{minted\\})"
+					]
 				},
 				{
-					"begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:rust)\\})",
-					"captures": {
+					"begin": "(?:\\G|(?<=\\]))(\\{)((?:rust))(\\})",
+					"beginCaptures": {
 						"1": {
-							"patterns": [
-								{
-									"include": "#begin-env-tokenizer"
-								}
-							]
+							"name": "punctuation.definition.arguments.begin.latex"
+						},
+						"2": {
+							"name": "variable.parameter.function.latex"
+						},
+						"3": {
+							"name": "punctuation.definition.arguments.end.latex"
 						}
 					},
+					"end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
 					"contentName": "source.rust",
 					"patterns": [
 						{
 							"include": "source.rust"
 						}
-					],
-					"end": "(\\\\end\\{minted\\})"
+					]
 				},
 				{
-					"begin": "(\\\\begin\\{(?:lstlisting|minted|pyglist)\\}(?:\\[.*\\])?)",
-					"captures": {
+					"begin": "(?:\\G|(?<=\\]))(\\{)([a-zA-Z]*)(\\})",
+					"beginCaptures": {
 						"1": {
-							"patterns": [
-								{
-									"include": "#begin-env-tokenizer"
-								}
-							]
+							"name": "punctuation.definition.arguments.begin.latex"
+						},
+						"2": {
+							"name": "variable.parameter.function.latex"
+						},
+						"3": {
+							"name": "punctuation.definition.arguments.end.latex"
 						}
 					},
 					"contentName": "meta.function.embedded.latex",
-					"end": "(\\\\end\\{(?:lstlisting|minted|pyglist)\\})",
+					"end": "^\\s*(?=\\\\end\\{(?:lstlisting|minted|pyglist)\\})",
 					"name": "meta.embedded.block.generic.latex"
 				}
 			]
 		},
 		{
-			"begin": "(\\s*\\\\begin\\{((?:cppcode)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)",
+			"begin": "\\s*\\\\begin\\{(?:cppcode)\\*?\\}(?:\\[[a-zA-Z0-9_-]*\\])?(?=\\[|\\{)",
+			"end": "\\s*\\\\end\\{(?:cppcode)\\*?\\}",
 			"captures": {
-				"1": {
+				"0": {
 					"patterns": [
 						{
 							"include": "#begin-env-tokenizer"
@@ -472,18 +516,42 @@
 					]
 				}
 			},
-			"contentName": "source.cpp.embedded.latex",
 			"patterns": [
 				{
-					"include": "source.cpp.embedded.latex"
+					"include": "#multiline-optional-arg-no-highlight"
+				},
+				{
+					"begin": "(?:\\G|(?<=\\]))(\\{)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.arguments.begin.latex"
+						}
+					},
+					"end": "(\\})",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.definition.arguments.end.latex"
+						}
+					},
+					"contentName": "variable.parameter.function.latex"
+				},
+				{
+					"begin": "^(?=\\s*)",
+					"end": "^\\s*(?=\\\\end\\{(?:cppcode)\\*?\\})",
+					"contentName": "source.cpp.embedded.latex",
+					"patterns": [
+						{
+							"include": "source.cpp.embedded.latex"
+						}
+					]
 				}
-			],
-			"end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)"
+			]
 		},
 		{
-			"begin": "(\\s*\\\\begin\\{((?:hscode)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)",
+			"begin": "\\s*\\\\begin\\{(?:hscode)\\*?\\}(?:\\[[a-zA-Z0-9_-]*\\])?(?=\\[|\\{)",
+			"end": "\\s*\\\\end\\{(?:hscode)\\*?\\}",
 			"captures": {
-				"1": {
+				"0": {
 					"patterns": [
 						{
 							"include": "#begin-env-tokenizer"
@@ -491,18 +559,42 @@
 					]
 				}
 			},
-			"contentName": "source.haskell",
 			"patterns": [
 				{
-					"include": "source.haskell"
+					"include": "#multiline-optional-arg-no-highlight"
+				},
+				{
+					"begin": "(?:\\G|(?<=\\]))(\\{)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.arguments.begin.latex"
+						}
+					},
+					"end": "(\\})",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.definition.arguments.end.latex"
+						}
+					},
+					"contentName": "variable.parameter.function.latex"
+				},
+				{
+					"begin": "^(?=\\s*)",
+					"end": "^\\s*(?=\\\\end\\{(?:hscode)\\*?\\})",
+					"contentName": "source.haskell",
+					"patterns": [
+						{
+							"include": "source.haskell"
+						}
+					]
 				}
-			],
-			"end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)"
+			]
 		},
 		{
-			"begin": "(\\s*\\\\begin\\{((?:luacode)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)",
+			"begin": "\\s*\\\\begin\\{(?:luacode)\\*?\\}(?:\\[[a-zA-Z0-9_-]*\\])?(?=\\[|\\{)",
+			"end": "\\s*\\\\end\\{(?:luacode)\\*?\\}",
 			"captures": {
-				"1": {
+				"0": {
 					"patterns": [
 						{
 							"include": "#begin-env-tokenizer"
@@ -510,37 +602,85 @@
 					]
 				}
 			},
-			"contentName": "source.lua",
 			"patterns": [
 				{
-					"include": "source.lua"
+					"include": "#multiline-optional-arg-no-highlight"
+				},
+				{
+					"begin": "(?:\\G|(?<=\\]))(\\{)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.arguments.begin.latex"
+						}
+					},
+					"end": "(\\})",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.definition.arguments.end.latex"
+						}
+					},
+					"contentName": "variable.parameter.function.latex"
+				},
+				{
+					"begin": "^(?=\\s*)",
+					"end": "^\\s*(?=\\\\end\\{(?:luacode)\\*?\\})",
+					"contentName": "source.lua",
+					"patterns": [
+						{
+							"include": "source.lua"
+						}
+					]
 				}
-			],
-			"end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)"
+			]
 		},
 		{
-			"begin": "(\\s*\\\\begin\\{((?:jlcode|jlverbatim|jlblock|jlconcode|jlconsole|jlconverbatim)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)",
+			"begin": "\\s*\\\\begin\\{(?:jlcode|jlverbatim|jlblock|jlconcode|jlconsole|jlconverbatim)\\*?\\}(?:\\[[a-zA-Z0-9_-]*\\])?(?=\\[|\\{)",
+			"end": "\\s*\\\\end\\{(?:jlcode|jlverbatim|jlblock|jlconcode|jlconsole|jlconverbatim)\\*?\\}",
 			"captures": {
-				"1": {
+				"0": {
+					"patterns": [
+						{
+							"include": "#begin-env-tokenizer"
+						}
+					]
+				}
+			},
+			"patterns": [
+				{
+					"include": "#multiline-optional-arg-no-highlight"
+				},
+				{
+					"begin": "(?:\\G|(?<=\\]))(\\{)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.arguments.begin.latex"
+						}
+					},
+					"end": "(\\})",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.definition.arguments.end.latex"
+						}
+					},
+					"contentName": "variable.parameter.function.latex"
+				},
+				{
+					"begin": "^(?=\\s*)",
+					"end": "^\\s*(?=\\\\end\\{(?:jlcode|jlverbatim|jlblock|jlconcode|jlconsole|jlconverbatim)\\*?\\})",
+					"contentName": "source.julia",
 					"patterns": [
 						{
-							"include": "#begin-env-tokenizer"
+							"include": "source.julia"
 						}
 					]
 				}
-			},
-			"contentName": "source.julia",
-			"patterns": [
-				{
-					"include": "source.julia"
-				}
-			],
-			"end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)"
+			]
 		},
 		{
-			"begin": "(\\s*\\\\begin\\{((?:juliacode|juliaverbatim|juliablock|juliaconcode|juliaconsole|juliaconverbatim)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)",
+			"begin": "\\s*\\\\begin\\{(?:juliacode|juliaverbatim|juliablock|juliaconcode|juliaconsole|juliaconverbatim)\\*?\\}(?:\\[[a-zA-Z0-9_-]*\\])?(?=\\[|\\{)",
+			"end": "\\s*\\\\end\\{(?:juliacode|juliaverbatim|juliablock|juliaconcode|juliaconsole|juliaconverbatim)\\*?\\}",
 			"captures": {
-				"1": {
+				"0": {
 					"patterns": [
 						{
 							"include": "#begin-env-tokenizer"
@@ -548,18 +688,42 @@
 					]
 				}
 			},
-			"contentName": "source.julia",
 			"patterns": [
 				{
-					"include": "source.julia"
+					"include": "#multiline-optional-arg-no-highlight"
+				},
+				{
+					"begin": "(?:\\G|(?<=\\]))(\\{)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.arguments.begin.latex"
+						}
+					},
+					"end": "(\\})",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.definition.arguments.end.latex"
+						}
+					},
+					"contentName": "variable.parameter.function.latex"
+				},
+				{
+					"begin": "^(?=\\s*)",
+					"end": "^\\s*(?=\\\\end\\{(?:juliacode|juliaverbatim|juliablock|juliaconcode|juliaconsole|juliaconverbatim)\\*?\\})",
+					"contentName": "source.julia",
+					"patterns": [
+						{
+							"include": "source.julia"
+						}
+					]
 				}
-			],
-			"end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)"
+			]
 		},
 		{
-			"begin": "(\\s*\\\\begin\\{((?:sageblock|sagesilent|sageverbatim|sageexample|sagecommandline|python|pythonq|pythonrepl)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)",
+			"begin": "\\s*\\\\begin\\{(?:sageblock|sagesilent|sageverbatim|sageexample|sagecommandline|python|pythonq|pythonrepl)\\*?\\}(?:\\[[a-zA-Z0-9_-]*\\])?(?=\\[|\\{)",
+			"end": "\\s*\\\\end\\{(?:sageblock|sagesilent|sageverbatim|sageexample|sagecommandline|python|pythonq|pythonrepl)\\*?\\}",
 			"captures": {
-				"1": {
+				"0": {
 					"patterns": [
 						{
 							"include": "#begin-env-tokenizer"
@@ -567,18 +731,42 @@
 					]
 				}
 			},
-			"contentName": "source.python",
 			"patterns": [
 				{
-					"include": "source.python"
+					"include": "#multiline-optional-arg-no-highlight"
+				},
+				{
+					"begin": "(?:\\G|(?<=\\]))(\\{)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.arguments.begin.latex"
+						}
+					},
+					"end": "(\\})",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.definition.arguments.end.latex"
+						}
+					},
+					"contentName": "variable.parameter.function.latex"
+				},
+				{
+					"begin": "^(?=\\s*)",
+					"end": "^\\s*(?=\\\\end\\{(?:sageblock|sagesilent|sageverbatim|sageexample|sagecommandline|python|pythonq|pythonrepl)\\*?\\})",
+					"contentName": "source.python",
+					"patterns": [
+						{
+							"include": "source.python"
+						}
+					]
 				}
-			],
-			"end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)"
+			]
 		},
 		{
-			"begin": "(\\s*\\\\begin\\{((?:pycode|pyverbatim|pyblock|pyconcode|pyconsole|pyconverbatim)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)",
+			"begin": "\\s*\\\\begin\\{(?:pycode|pyverbatim|pyblock|pyconcode|pyconsole|pyconverbatim)\\*?\\}(?:\\[[a-zA-Z0-9_-]*\\])?(?=\\[|\\{)",
+			"end": "\\s*\\\\end\\{(?:pycode|pyverbatim|pyblock|pyconcode|pyconsole|pyconverbatim)\\*?\\}",
 			"captures": {
-				"1": {
+				"0": {
 					"patterns": [
 						{
 							"include": "#begin-env-tokenizer"
@@ -586,18 +774,42 @@
 					]
 				}
 			},
-			"contentName": "source.python",
 			"patterns": [
 				{
-					"include": "source.python"
+					"include": "#multiline-optional-arg-no-highlight"
+				},
+				{
+					"begin": "(?:\\G|(?<=\\]))(\\{)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.arguments.begin.latex"
+						}
+					},
+					"end": "(\\})",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.definition.arguments.end.latex"
+						}
+					},
+					"contentName": "variable.parameter.function.latex"
+				},
+				{
+					"begin": "^(?=\\s*)",
+					"end": "^\\s*(?=\\\\end\\{(?:pycode|pyverbatim|pyblock|pyconcode|pyconsole|pyconverbatim)\\*?\\})",
+					"contentName": "source.python",
+					"patterns": [
+						{
+							"include": "source.python"
+						}
+					]
 				}
-			],
-			"end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)"
+			]
 		},
 		{
-			"begin": "(\\s*\\\\begin\\{((?:pylabcode|pylabverbatim|pylabblock|pylabconcode|pylabconsole|pylabconverbatim)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)",
+			"begin": "\\s*\\\\begin\\{(?:pylabcode|pylabverbatim|pylabblock|pylabconcode|pylabconsole|pylabconverbatim)\\*?\\}(?:\\[[a-zA-Z0-9_-]*\\])?(?=\\[|\\{)",
+			"end": "\\s*\\\\end\\{(?:pylabcode|pylabverbatim|pylabblock|pylabconcode|pylabconsole|pylabconverbatim)\\*?\\}",
 			"captures": {
-				"1": {
+				"0": {
 					"patterns": [
 						{
 							"include": "#begin-env-tokenizer"
@@ -605,18 +817,42 @@
 					]
 				}
 			},
-			"contentName": "source.python",
 			"patterns": [
 				{
-					"include": "source.python"
+					"include": "#multiline-optional-arg-no-highlight"
+				},
+				{
+					"begin": "(?:\\G|(?<=\\]))(\\{)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.arguments.begin.latex"
+						}
+					},
+					"end": "(\\})",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.definition.arguments.end.latex"
+						}
+					},
+					"contentName": "variable.parameter.function.latex"
+				},
+				{
+					"begin": "^(?=\\s*)",
+					"end": "^\\s*(?=\\\\end\\{(?:pylabcode|pylabverbatim|pylabblock|pylabconcode|pylabconsole|pylabconverbatim)\\*?\\})",
+					"contentName": "source.python",
+					"patterns": [
+						{
+							"include": "source.python"
+						}
+					]
 				}
-			],
-			"end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)"
+			]
 		},
 		{
-			"begin": "(\\s*\\\\begin\\{((?:sympycode|sympyverbatim|sympyblock|sympyconcode|sympyconsole|sympyconverbatim)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)",
+			"begin": "\\s*\\\\begin\\{(?:sympycode|sympyverbatim|sympyblock|sympyconcode|sympyconsole|sympyconverbatim)\\*?\\}(?:\\[[a-zA-Z0-9_-]*\\])?(?=\\[|\\{)",
+			"end": "\\s*\\\\end\\{(?:sympycode|sympyverbatim|sympyblock|sympyconcode|sympyconsole|sympyconverbatim)\\*?\\}",
 			"captures": {
-				"1": {
+				"0": {
 					"patterns": [
 						{
 							"include": "#begin-env-tokenizer"
@@ -624,18 +860,42 @@
 					]
 				}
 			},
-			"contentName": "source.python",
 			"patterns": [
 				{
-					"include": "source.python"
+					"include": "#multiline-optional-arg-no-highlight"
+				},
+				{
+					"begin": "(?:\\G|(?<=\\]))(\\{)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.arguments.begin.latex"
+						}
+					},
+					"end": "(\\})",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.definition.arguments.end.latex"
+						}
+					},
+					"contentName": "variable.parameter.function.latex"
+				},
+				{
+					"begin": "^(?=\\s*)",
+					"end": "^\\s*(?=\\\\end\\{(?:sympycode|sympyverbatim|sympyblock|sympyconcode|sympyconsole|sympyconverbatim)\\*?\\})",
+					"contentName": "source.python",
+					"patterns": [
+						{
+							"include": "source.python"
+						}
+					]
 				}
-			],
-			"end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)"
+			]
 		},
 		{
-			"begin": "(\\s*\\\\begin\\{((?:scalacode)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)",
+			"begin": "\\s*\\\\begin\\{(?:scalacode)\\*?\\}(?:\\[[a-zA-Z0-9_-]*\\])?(?=\\[|\\{)",
+			"end": "\\s*\\\\end\\{(?:scalacode)\\*?\\}",
 			"captures": {
-				"1": {
+				"0": {
 					"patterns": [
 						{
 							"include": "#begin-env-tokenizer"
@@ -643,18 +903,42 @@
 					]
 				}
 			},
-			"contentName": "source.scala",
 			"patterns": [
 				{
-					"include": "source.scala"
+					"include": "#multiline-optional-arg-no-highlight"
+				},
+				{
+					"begin": "(?:\\G|(?<=\\]))(\\{)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.arguments.begin.latex"
+						}
+					},
+					"end": "(\\})",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.definition.arguments.end.latex"
+						}
+					},
+					"contentName": "variable.parameter.function.latex"
+				},
+				{
+					"begin": "^(?=\\s*)",
+					"end": "^\\s*(?=\\\\end\\{(?:scalacode)\\*?\\})",
+					"contentName": "source.scala",
+					"patterns": [
+						{
+							"include": "source.scala"
+						}
+					]
 				}
-			],
-			"end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)"
+			]
 		},
 		{
-			"begin": "(\\s*\\\\begin\\{((?:asy|asycode)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)",
+			"begin": "\\s*\\\\begin\\{(?:asy|asycode)\\*?\\}(?:\\[[a-zA-Z0-9_-]*\\])?(?=\\[|\\{)",
+			"end": "\\s*\\\\end\\{(?:asy|asycode)\\*?\\}",
 			"captures": {
-				"1": {
+				"0": {
 					"patterns": [
 						{
 							"include": "#begin-env-tokenizer"
@@ -662,18 +946,42 @@
 					]
 				}
 			},
-			"contentName": "source.asymptote",
 			"patterns": [
 				{
-					"include": "source.asymptote"
+					"include": "#multiline-optional-arg-no-highlight"
+				},
+				{
+					"begin": "(?:\\G|(?<=\\]))(\\{)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.arguments.begin.latex"
+						}
+					},
+					"end": "(\\})",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.definition.arguments.end.latex"
+						}
+					},
+					"contentName": "variable.parameter.function.latex"
+				},
+				{
+					"begin": "^(?=\\s*)",
+					"end": "^\\s*(?=\\\\end\\{(?:asy|asycode)\\*?\\})",
+					"contentName": "source.asymptote",
+					"patterns": [
+						{
+							"include": "source.asymptote"
+						}
+					]
 				}
-			],
-			"end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)"
+			]
 		},
 		{
-			"begin": "(\\s*\\\\begin\\{((?:dot2tex|dotcode)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)",
+			"begin": "\\s*\\\\begin\\{(?:dot2tex|dotcode)\\*?\\}(?:\\[[a-zA-Z0-9_-]*\\])?(?=\\[|\\{)",
+			"end": "\\s*\\\\end\\{(?:dot2tex|dotcode)\\*?\\}",
 			"captures": {
-				"1": {
+				"0": {
 					"patterns": [
 						{
 							"include": "#begin-env-tokenizer"
@@ -681,18 +989,42 @@
 					]
 				}
 			},
-			"contentName": "source.dot",
 			"patterns": [
 				{
-					"include": "source.dot"
+					"include": "#multiline-optional-arg-no-highlight"
+				},
+				{
+					"begin": "(?:\\G|(?<=\\]))(\\{)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.arguments.begin.latex"
+						}
+					},
+					"end": "(\\})",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.definition.arguments.end.latex"
+						}
+					},
+					"contentName": "variable.parameter.function.latex"
+				},
+				{
+					"begin": "^(?=\\s*)",
+					"end": "^\\s*(?=\\\\end\\{(?:dot2tex|dotcode)\\*?\\})",
+					"contentName": "source.dot",
+					"patterns": [
+						{
+							"include": "source.dot"
+						}
+					]
 				}
-			],
-			"end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)"
+			]
 		},
 		{
-			"begin": "(\\s*\\\\begin\\{((?:gnuplot)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)",
+			"begin": "\\s*\\\\begin\\{(?:gnuplot)\\*?\\}(?:\\[[a-zA-Z0-9_-]*\\])?(?=\\[|\\{)",
+			"end": "\\s*\\\\end\\{(?:gnuplot)\\*?\\}",
 			"captures": {
-				"1": {
+				"0": {
 					"patterns": [
 						{
 							"include": "#begin-env-tokenizer"
@@ -700,13 +1032,36 @@
 					]
 				}
 			},
-			"contentName": "source.gnuplot",
 			"patterns": [
 				{
-					"include": "source.gnuplot"
+					"include": "#multiline-optional-arg-no-highlight"
+				},
+				{
+					"begin": "(?:\\G|(?<=\\]))(\\{)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.arguments.begin.latex"
+						}
+					},
+					"end": "(\\})",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.definition.arguments.end.latex"
+						}
+					},
+					"contentName": "variable.parameter.function.latex"
+				},
+				{
+					"begin": "^(?=\\s*)",
+					"end": "^\\s*(?=\\\\end\\{(?:gnuplot)\\*?\\})",
+					"contentName": "source.gnuplot",
+					"patterns": [
+						{
+							"include": "source.gnuplot"
+						}
+					]
 				}
-			],
-			"end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)"
+			]
 		},
 		{
 			"begin": "((?:\\s*)\\\\begin\\{([a-z]*code(?:\\*)?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)",
@@ -1805,13 +2160,13 @@
 				{
 					"captures": {
 						"1": {
-							"name": "punctuation.definition.optional.arguments.begin.latex"
+							"name": "punctuation.definition.arguments.optional.begin.latex"
 						},
 						"2": {
 							"name": "variable.parameter.function.latex"
 						},
 						"3": {
-							"name": "punctuation.definition.optional.arguments.end.latex"
+							"name": "punctuation.definition.arguments.optional.end.latex"
 						}
 					},
 					"match": "(\\[)([^\\[]*?)(\\])",
@@ -1819,6 +2174,47 @@
 				}
 			]
 		},
+		"multiline-optional-arg-no-highlight": {
+			"begin": "\\G\\[",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.arguments.optional.begin.latex"
+				}
+			},
+			"end": "\\]",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.arguments.optional.end.latex"
+				}
+			},
+			"name": "meta.parameter.optional.latex",
+			"patterns": [
+				{
+					"include": "$self"
+				}
+			]
+		},
+		"multiline-optional-arg": {
+			"begin": "\\G\\[",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.arguments.optional.begin.latex"
+				}
+			},
+			"end": "\\]",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.arguments.optional.end.latex"
+				}
+			},
+			"name": "meta.parameter.optional.latex",
+			"contentName": "variable.parameter.function.latex",
+			"patterns": [
+				{
+					"include": "$self"
+				}
+			]
+		},
 		"autocites-arg": {
 			"patterns": [
 				{
diff --git a/extensions/latex/syntaxes/cpp-grammar-bailout.tmLanguage.json b/extensions/latex/syntaxes/cpp-grammar-bailout.tmLanguage.json
index a303594f0ae4c0..ab4b82758b6a1f 100644
--- a/extensions/latex/syntaxes/cpp-grammar-bailout.tmLanguage.json
+++ b/extensions/latex/syntaxes/cpp-grammar-bailout.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/ffe263692d6096b24e4897650e933c587fa9c55f",
+	"version": "https://github.com/jlelong/vscode-latex-basics/commit/cf0dd90958d8929f297d9fdad4473fa6a4a3771d",
 	"name": "C++",
 	"scopeName": "source.cpp.embedded.latex",
 	"patterns": [
@@ -74,6 +74,9 @@
 		{
 			"include": "#template_definition"
 		},
+		{
+			"include": "#template_explicit_instantiation"
+		},
 		{
 			"include": "#access_control_keywords"
 		},
@@ -95,7 +98,7 @@
 	],
 	"repository": {
 		"access_control_keywords": {
-			"match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(((?:(?:protected)|(?:private)|(?:public)))(?:(?:\\s)+)?(:))",
+			"match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(((?:(?:protected)|(?:private)|(?:public)))(?:(?:\\s)+)?(:))",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -107,7 +110,7 @@
 				"2": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -116,16 +119,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -205,7 +199,7 @@
 			]
 		},
 		"alignas_operator": {
-			"begin": "((?<!\\w)alignas(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"begin": "((?<!\\w)alignas(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(\\()",
 			"end": "\\)|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"1": {
@@ -225,16 +219,7 @@
 					"name": "comment.block.cpp"
 				},
 				"5": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"6": {
 					"name": "punctuation.section.arguments.begin.bracket.round.operator.alignas.cpp"
@@ -253,7 +238,7 @@
 			]
 		},
 		"alignof_operator": {
-			"begin": "((?<!\\w)alignof(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"begin": "((?<!\\w)alignof(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(\\()",
 			"end": "\\)|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"1": {
@@ -273,16 +258,7 @@
 					"name": "comment.block.cpp"
 				},
 				"5": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"6": {
 					"name": "punctuation.section.arguments.begin.bracket.round.operator.alignof.cpp"
@@ -315,7 +291,7 @@
 			"name": "meta.asm.cpp",
 			"patterns": [
 				{
-					"match": "^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:\\n)|$)",
+					"match": "^((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:\\n)|$)",
 					"captures": {
 						"1": {
 							"patterns": [
@@ -331,16 +307,7 @@
 							"name": "comment.block.cpp"
 						},
 						"4": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						}
 					}
 				},
@@ -348,7 +315,7 @@
 					"include": "#comments"
 				},
 				{
-					"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\(",
+					"begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))\\(",
 					"end": "\\)|(?=\\\\end\\{(?:minted|cppcode)\\})",
 					"beginCaptures": {
 						"0": {
@@ -368,16 +335,7 @@
 							"name": "comment.block.cpp"
 						},
 						"4": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						}
 					},
 					"endCaptures": {
@@ -445,7 +403,7 @@
 							]
 						},
 						{
-							"match": "\\[((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]",
+							"match": "\\[((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))\\]",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -461,16 +419,7 @@
 									"name": "comment.block.cpp"
 								},
 								"4": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								},
 								"5": {
 									"name": "variable.other.asm.label.cpp"
@@ -489,16 +438,7 @@
 									"name": "comment.block.cpp"
 								},
 								"9": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						},
@@ -573,7 +513,7 @@
 			"name": "comment.block.cpp"
 		},
 		"builtin_storage_type_initilizer": {
-			"begin": "(?:\\s)*+(?<!\\w)(?:(?:(?:((?:(?:unsigned)|(?:wchar_t)|(?:signed)|(?:double)|(?:short)|(?:float)|(?:auto)|(?:void)|(?:char)|(?:long)|(?:bool)|(?:int)))|((?:(?:uint_least16_t)|(?:uint_least32_t)|(?:uint_least64_t)|(?:int_least16_t)|(?:int_least32_t)|(?:int_least64_t)|(?:uint_least8_t)|(?:uint_fast16_t)|(?:uint_fast32_t)|(?:uint_fast64_t)|(?:int_least8_t)|(?:int_fast16_t)|(?:int_fast32_t)|(?:int_fast64_t)|(?:uint_fast8_t)|(?:suseconds_t)|(?:int_fast8_t)|(?:useconds_t)|(?:blksize_t)|(?:in_addr_t)|(?:in_port_t)|(?:uintptr_t)|(?:uintmax_t)|(?:uintmax_t)|(?:uintmax_t)|(?:u_quad_t)|(?:blkcnt_t)|(?:uint16_t)|(?:uint32_t)|(?:uint64_t)|(?:intptr_t)|(?:intmax_t)|(?:intmax_t)|(?:u_short)|(?:qaddr_t)|(?:caddr_t)|(?:daddr_t)|(?:fixpt_t)|(?:nlink_t)|(?:segsz_t)|(?:swblk_t)|(?:clock_t)|(?:ssize_t)|(?:int16_t)|(?:int32_t)|(?:int64_t)|(?:uint8_t)|(?:u_char)|(?:u_long)|(?:ushort)|(?:quad_t)|(?:mode_t)|(?:size_t)|(?:time_t)|(?:int8_t)|(?:u_int)|(?:div_t)|(?:dev_t)|(?:gid_t)|(?:ino_t)|(?:key_t)|(?:pid_t)|(?:off_t)|(?:uid_t)|(?:uint)|(?:id_t)|(?:id_t))))|((?:(?:pthread_rwlockattr_t)|(?:pthread_mutexattr_t)|(?:pthread_condattr_t)|(?:pthread_rwlock_t)|(?:pthread_mutex_t)|(?:pthread_attr_t)|(?:pthread_cond_t)|(?:pthread_once_t)|(?:pthread_key_t)|(?:pthread_t))))|([a-zA-Z_](?:\\w)*_t))(?!\\w)(?:\\s)*+(?<!\\w)(\\()",
+			"begin": "(?:\\s)*+(?<!\\w)(?:(?:(?:((?:(?:unsigned)|(?:wchar_t)|(?:double)|(?:signed)|(?:short)|(?:float)|(?:auto)|(?:void)|(?:long)|(?:char)|(?:bool)|(?:int)))|((?:(?:uint_least32_t)|(?:uint_least64_t)|(?:uint_least16_t)|(?:uint_fast64_t)|(?:uint_least8_t)|(?:int_least64_t)|(?:int_least32_t)|(?:int_least16_t)|(?:uint_fast16_t)|(?:uint_fast32_t)|(?:int_least8_t)|(?:int_fast16_t)|(?:int_fast32_t)|(?:int_fast64_t)|(?:uint_fast8_t)|(?:int_fast8_t)|(?:suseconds_t)|(?:useconds_t)|(?:uintmax_t)|(?:uintmax_t)|(?:in_port_t)|(?:uintmax_t)|(?:in_addr_t)|(?:blksize_t)|(?:uintptr_t)|(?:intmax_t)|(?:intptr_t)|(?:blkcnt_t)|(?:intmax_t)|(?:u_quad_t)|(?:uint16_t)|(?:uint32_t)|(?:uint64_t)|(?:ssize_t)|(?:fixpt_t)|(?:qaddr_t)|(?:u_short)|(?:int16_t)|(?:int32_t)|(?:int64_t)|(?:uint8_t)|(?:daddr_t)|(?:caddr_t)|(?:swblk_t)|(?:clock_t)|(?:segsz_t)|(?:nlink_t)|(?:time_t)|(?:u_long)|(?:ushort)|(?:quad_t)|(?:mode_t)|(?:size_t)|(?:u_char)|(?:int8_t)|(?:u_int)|(?:uid_t)|(?:off_t)|(?:pid_t)|(?:gid_t)|(?:dev_t)|(?:div_t)|(?:key_t)|(?:ino_t)|(?:id_t)|(?:id_t)|(?:uint))))|((?:(?:pthread_rwlockattr_t)|(?:pthread_mutexattr_t)|(?:pthread_condattr_t)|(?:pthread_rwlock_t)|(?:pthread_mutex_t)|(?:pthread_cond_t)|(?:pthread_attr_t)|(?:pthread_once_t)|(?:pthread_key_t)|(?:pthread_t))))|([a-zA-Z_](?:\\w)*_t))(?!\\w)(?:\\s)*+(?<!\\w)(\\()",
 			"end": "\\)|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"1": {
@@ -604,7 +544,7 @@
 			]
 		},
 		"case_statement": {
-			"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)case(?!\\w))",
+			"begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)case(?!\\w))",
 			"end": ":|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"1": {
@@ -621,16 +561,7 @@
 					"name": "comment.block.cpp"
 				},
 				"4": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"5": {
 					"name": "keyword.control.case.cpp"
@@ -649,7 +580,7 @@
 			]
 		},
 		"class_block": {
-			"begin": "((?<!\\w)class(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?={)|(?:((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*+)?(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(:(?!:)))?)",
+			"begin": "((?<!\\w)class(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?={)|(?:((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*+)?(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(:(?!:)))?)",
 			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"0": {
@@ -672,16 +603,7 @@
 					"name": "comment.block.cpp"
 				},
 				"5": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"6": {
 					"patterns": [
@@ -707,21 +629,12 @@
 					"name": "comment.block.cpp"
 				},
 				"10": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"11": {
 					"patterns": [
 						{
-							"match": "((?<!\\w)final(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))",
+							"match": "((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))",
 							"captures": {
 								"1": {
 									"name": "storage.type.modifier.final.cpp"
@@ -740,21 +653,12 @@
 									"name": "comment.block.cpp"
 								},
 								"5": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						},
 						{
-							"match": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:((?<!\\w)final(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=:|{|$)",
+							"match": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?=:|{|$)",
 							"captures": {
 								"1": {
 									"name": "entity.name.type.class.cpp"
@@ -773,16 +677,7 @@
 									"name": "comment.block.cpp"
 								},
 								"5": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								},
 								"6": {
 									"name": "storage.type.modifier.final.cpp"
@@ -801,16 +696,7 @@
 									"name": "comment.block.cpp"
 								},
 								"10": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						},
@@ -838,16 +724,7 @@
 					"name": "comment.block.cpp"
 				},
 				"15": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"16": {
 					"patterns": [
@@ -863,16 +740,7 @@
 					"name": "comment.block.cpp"
 				},
 				"19": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"20": {
 					"name": "punctuation.separator.colon.inheritance.cpp"
@@ -953,7 +821,7 @@
 			]
 		},
 		"class_declare": {
-			"match": "((?<!\\w)class(?!\\w))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\S)(?![:{a-zA-Z])",
+			"match": "((?<!\\w)class(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?=\\S)(?![:{a-zA-Z])",
 			"captures": {
 				"1": {
 					"name": "storage.type.class.declare.cpp"
@@ -968,7 +836,7 @@
 				"3": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -977,16 +845,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -1002,7 +861,7 @@
 							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -1018,16 +877,7 @@
 									"name": "comment.block.cpp"
 								},
 								"4": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							},
 							"name": "invalid.illegal.reference-type.cpp"
@@ -1048,7 +898,7 @@
 				"7": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -1057,16 +907,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -1082,7 +923,7 @@
 				"9": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -1091,16 +932,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -1116,7 +948,7 @@
 				"11": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -1125,16 +957,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -1153,7 +976,7 @@
 				"14": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -1162,16 +985,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -1481,7 +1295,7 @@
 			]
 		},
 		"constructor_inline": {
-			"begin": "^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:constexpr)|(?:consteval)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(?=\\())",
+			"begin": "^((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:(?:(?:constexpr)|(?:consteval)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(?=\\())",
 			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"0": {
@@ -1501,16 +1315,7 @@
 					"name": "comment.block.cpp"
 				},
 				"4": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"5": {
 					"patterns": [
@@ -1533,16 +1338,7 @@
 					"name": "comment.block.cpp"
 				},
 				"9": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"10": {
 					"patterns": [
@@ -1558,16 +1354,7 @@
 					"name": "comment.block.cpp"
 				},
 				"13": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"14": {
 					"name": "storage.type.modifier.calling-convention.cpp"
@@ -1586,16 +1373,7 @@
 					"name": "comment.block.cpp"
 				},
 				"18": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"19": {
 					"name": "entity.name.function.constructor.cpp entity.name.function.definition.special.constructor.cpp"
@@ -1619,7 +1397,7 @@
 							"include": "#ever_present_context"
 						},
 						{
-							"match": "(\\=)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(default)|(delete))",
+							"match": "(\\=)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(default)|(delete))",
 							"captures": {
 								"1": {
 									"name": "keyword.operator.assignment.cpp"
@@ -1638,22 +1416,13 @@
 									"name": "comment.block.cpp"
 								},
 								"5": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								},
 								"6": {
-									"name": "keyword.other.default.constructor.cpp"
+									"name": "keyword.other.default.function.cpp keyword.other.default.constructor.cpp"
 								},
 								"7": {
-									"name": "keyword.other.delete.constructor.cpp"
+									"name": "keyword.other.delete.function.cpp keyword.other.delete.constructor.cpp"
 								}
 							}
 						},
@@ -1758,12 +1527,7 @@
 							]
 						},
 						{
-							"match": "((?:(?:final)|(?:override)))+",
-							"captures": {
-								"1": {
-									"name": "keyword.operator.$1.cpp"
-								}
-							}
+							"include": "#qualifiers_and_specifiers_post_parameters"
 						},
 						{
 							"include": "$self"
@@ -1801,7 +1565,7 @@
 			]
 		},
 		"constructor_root": {
-			"begin": "\\s*+((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)(((?>(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))::((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\14((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\())",
+			"begin": "\\s*+((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)(((?>(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))::((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))\\14((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?=\\())",
 			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"0": {
@@ -1821,16 +1585,7 @@
 					"name": "comment.block.cpp"
 				},
 				"4": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"5": {
 					"name": "storage.type.modifier.calling-convention.cpp"
@@ -1849,18 +1604,9 @@
 					"name": "comment.block.cpp"
 				},
 				"9": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"10": {
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+				},
+				"10": {
 					"patterns": [
 						{
 							"match": "::",
@@ -1914,16 +1660,7 @@
 					"name": "comment.block.cpp"
 				},
 				"18": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"19": {
 					"patterns": [
@@ -1939,16 +1676,7 @@
 					"name": "comment.block.cpp"
 				},
 				"22": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"23": {
 					"patterns": [
@@ -1964,16 +1692,7 @@
 					"name": "comment.block.cpp"
 				},
 				"26": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				}
 			},
 			"endCaptures": {},
@@ -1994,7 +1713,7 @@
 							"include": "#ever_present_context"
 						},
 						{
-							"match": "(\\=)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(default)|(delete))",
+							"match": "(\\=)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(default)|(delete))",
 							"captures": {
 								"1": {
 									"name": "keyword.operator.assignment.cpp"
@@ -2013,22 +1732,13 @@
 									"name": "comment.block.cpp"
 								},
 								"5": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								},
 								"6": {
-									"name": "keyword.other.default.constructor.cpp"
+									"name": "keyword.other.default.function.cpp keyword.other.default.constructor.cpp"
 								},
 								"7": {
-									"name": "keyword.other.delete.constructor.cpp"
+									"name": "keyword.other.delete.function.cpp keyword.other.delete.constructor.cpp"
 								}
 							}
 						},
@@ -2133,12 +1843,7 @@
 							]
 						},
 						{
-							"match": "((?:(?:final)|(?:override)))+",
-							"captures": {
-								"1": {
-									"name": "keyword.operator.$1.cpp"
-								}
-							}
+							"include": "#qualifiers_and_specifiers_post_parameters"
 						},
 						{
 							"include": "$self"
@@ -2176,7 +1881,7 @@
 			]
 		},
 		"control_flow_keywords": {
-			"match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:(?:co_return)|(?:continue)|(?:co_await)|(?:co_yield)|(?:default)|(?:switch)|(?:return)|(?:throw)|(?:while)|(?:catch)|(?:break)|(?:else)|(?:goto)|(?:case)|(?:for)|(?:try)|(?:do)|(?:if))(?!\\w))",
+			"match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:(?:co_return)|(?:co_yield)|(?:co_await)|(?:continue)|(?:default)|(?:switch)|(?:return)|(?:catch)|(?:while)|(?:throw)|(?:break)|(?:case)|(?:goto)|(?:else)|(?:for)|(?:try)|(?:if)|(?:do))(?!\\w))",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -2188,7 +1893,7 @@
 				"2": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -2197,16 +1902,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -2282,7 +1978,7 @@
 			]
 		},
 		"curly_initializer": {
-			"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:__has_include)|(?:atomic_cancel)|(?:atomic_commit)|(?:dynamic_cast)|(?:thread_local)|(?:synchronized)|(?:static_cast)|(?:const_cast)|(?:co_return)|(?:constexpr)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:consteval)|(?:protected)|(?:namespace)|(?:constinit)|(?:co_return)|(?:noexcept)|(?:noexcept)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:noexcept)|(?:template)|(?:operator)|(?:decltype)|(?:typename)|(?:requires)|(?:co_await)|(?:co_yield)|(?:reflexpr)|(?:alignof)|(?:alignas)|(?:default)|(?:nullptr)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:sizeof)|(?:delete)|(?:not_eq)|(?:bitand)|(?:and_eq)|(?:xor_eq)|(?:typeid)|(?:switch)|(?:return)|(?:static)|(?:extern)|(?:inline)|(?:friend)|(?:public)|(?:ifndef)|(?:define)|(?:pragma)|(?:export)|(?:import)|(?:module)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:false)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:else)|(?:goto)|(?:case)|(?:NULL)|(?:true)|(?:elif)|(?:else)|(?:line)|(?:this)|(?:not)|(?:new)|(?:xor)|(?:and)|(?:for)|(?:try)|(?:asm)|(?:or)|(?:do)|(?:if)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\{)",
+			"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(\\{)",
 			"end": "\\}|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"1": {
@@ -2364,16 +2060,7 @@
 					"name": "comment.block.cpp"
 				},
 				"6": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"7": {
 					"patterns": [
@@ -2389,16 +2076,7 @@
 					"name": "comment.block.cpp"
 				},
 				"10": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"11": {
 					"patterns": [
@@ -2437,16 +2115,7 @@
 					"name": "comment.block.cpp"
 				},
 				"17": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"18": {},
 				"19": {
@@ -2463,16 +2132,7 @@
 					"name": "comment.block.cpp"
 				},
 				"22": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"23": {
 					"name": "punctuation.section.arguments.begin.bracket.curly.initializer.cpp"
@@ -2494,7 +2154,7 @@
 			]
 		},
 		"d9bc4796b0b_module_import": {
-			"match": "^((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((import))(?:(?:\\s)+)?(?:(?:(?:((<)[^>]*(>?)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=\\/\\/)))|((\\\")[^\\\"]*((?:\\\")?)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=\\/\\/))))|(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:\\.(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)*((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=(?:\\/\\/|;)))))|((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=(?:\\/\\/|;))))(?:(?:\\s)+)?(;?)",
+			"match": "^((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((import))(?:(?:\\s)+)?(?:(?:(?:((<)[^>]*(>?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=\\/\\/)))|((\\\")[^\\\"]*((?:\\\")?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=\\/\\/))))|(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:\\.(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)*((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=(?:\\/\\/|;)))))|((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=(?:\\/\\/|;))))(?:(?:\\s)+)?(;?)",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -2506,7 +2166,7 @@
 				"2": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -2515,16 +2175,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -2552,7 +2203,7 @@
 				"9": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -2561,16 +2212,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -2595,7 +2237,7 @@
 				"14": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -2604,16 +2246,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -2632,7 +2265,7 @@
 				"17": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -2641,16 +2274,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -2666,7 +2290,7 @@
 				"19": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -2675,16 +2299,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -2700,7 +2315,7 @@
 				"21": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -2709,16 +2324,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -2986,7 +2592,7 @@
 			}
 		},
 		"decltype": {
-			"begin": "((?<!\\w)decltype(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"begin": "((?<!\\w)decltype(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(\\()",
 			"end": "\\)|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"1": {
@@ -3006,16 +2612,7 @@
 					"name": "comment.block.cpp"
 				},
 				"5": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"6": {
 					"name": "punctuation.section.arguments.begin.bracket.round.decltype.cpp"
@@ -3034,7 +2631,7 @@
 			]
 		},
 		"decltype_specifier": {
-			"begin": "((?<!\\w)decltype(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"begin": "((?<!\\w)decltype(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(\\()",
 			"end": "\\)|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"1": {
@@ -3054,16 +2651,7 @@
 					"name": "comment.block.cpp"
 				},
 				"5": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"6": {
 					"name": "punctuation.section.arguments.begin.bracket.round.decltype.cpp"
@@ -3082,7 +2670,7 @@
 			]
 		},
 		"default_statement": {
-			"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)default(?!\\w))",
+			"begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)default(?!\\w))",
 			"end": ":|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"1": {
@@ -3099,16 +2687,7 @@
 					"name": "comment.block.cpp"
 				},
 				"4": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"5": {
 					"name": "keyword.control.default.cpp"
@@ -3127,7 +2706,7 @@
 			]
 		},
 		"destructor_inline": {
-			"begin": "^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:constexpr)|(?:consteval)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*)(~(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(?=\\())",
+			"begin": "^((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:(?:(?:constexpr)|(?:consteval)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*)(~(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(?=\\())",
 			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"0": {
@@ -3147,16 +2726,7 @@
 					"name": "comment.block.cpp"
 				},
 				"4": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"5": {
 					"patterns": [
@@ -3172,16 +2742,7 @@
 					"name": "comment.block.cpp"
 				},
 				"8": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"9": {
 					"name": "storage.type.modifier.calling-convention.cpp"
@@ -3200,16 +2761,7 @@
 					"name": "comment.block.cpp"
 				},
 				"13": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"14": {
 					"patterns": [
@@ -3232,16 +2784,7 @@
 					"name": "comment.block.cpp"
 				},
 				"18": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"19": {
 					"name": "entity.name.function.destructor.cpp entity.name.function.definition.special.member.destructor.cpp"
@@ -3265,7 +2808,7 @@
 							"include": "#ever_present_context"
 						},
 						{
-							"match": "(\\=)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(default)|(delete))",
+							"match": "(\\=)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(default)|(delete))",
 							"captures": {
 								"1": {
 									"name": "keyword.operator.assignment.cpp"
@@ -3284,22 +2827,13 @@
 									"name": "comment.block.cpp"
 								},
 								"5": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								},
 								"6": {
-									"name": "keyword.other.default.constructor.cpp"
+									"name": "keyword.other.default.function.cpp keyword.other.default.constructor.cpp keyword.other.default.destructor.cpp"
 								},
 								"7": {
-									"name": "keyword.other.delete.constructor.cpp"
+									"name": "keyword.other.delete.function.cpp keyword.other.delete.constructor.cpp keyword.other.delete.destructor.cpp"
 								}
 							}
 						},
@@ -3320,12 +2854,7 @@
 							"patterns": []
 						},
 						{
-							"match": "((?:(?:final)|(?:override)))+",
-							"captures": {
-								"1": {
-									"name": "keyword.operator.wordlike.cpp keyword.operator.$1.cpp"
-								}
-							}
+							"include": "#qualifiers_and_specifiers_post_parameters"
 						},
 						{
 							"include": "$self"
@@ -3363,7 +2892,7 @@
 			]
 		},
 		"destructor_root": {
-			"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)(((?>(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))::((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))~\\14((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\())",
+			"begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)(((?>(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))::((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))~\\14((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?=\\())",
 			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"0": {
@@ -3383,16 +2912,7 @@
 					"name": "comment.block.cpp"
 				},
 				"4": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"5": {
 					"name": "storage.type.modifier.calling-convention.cpp"
@@ -3411,16 +2931,7 @@
 					"name": "comment.block.cpp"
 				},
 				"9": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"10": {
 					"patterns": [
@@ -3476,16 +2987,7 @@
 					"name": "comment.block.cpp"
 				},
 				"18": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"19": {
 					"patterns": [
@@ -3501,18 +3003,9 @@
 					"name": "comment.block.cpp"
 				},
 				"22": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"23": {
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+				},
+				"23": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
@@ -3526,16 +3019,7 @@
 					"name": "comment.block.cpp"
 				},
 				"26": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				}
 			},
 			"endCaptures": {},
@@ -3556,7 +3040,7 @@
 							"include": "#ever_present_context"
 						},
 						{
-							"match": "(\\=)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(default)|(delete))",
+							"match": "(\\=)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(default)|(delete))",
 							"captures": {
 								"1": {
 									"name": "keyword.operator.assignment.cpp"
@@ -3575,22 +3059,13 @@
 									"name": "comment.block.cpp"
 								},
 								"5": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								},
 								"6": {
-									"name": "keyword.other.default.constructor.cpp"
+									"name": "keyword.other.default.function.cpp keyword.other.default.constructor.cpp keyword.other.default.destructor.cpp"
 								},
 								"7": {
-									"name": "keyword.other.delete.constructor.cpp"
+									"name": "keyword.other.delete.function.cpp keyword.other.delete.constructor.cpp keyword.other.delete.destructor.cpp"
 								}
 							}
 						},
@@ -3611,12 +3086,7 @@
 							"patterns": []
 						},
 						{
-							"match": "((?:(?:final)|(?:override)))+",
-							"captures": {
-								"1": {
-									"name": "keyword.operator.wordlike.cpp keyword.operator.$1.cpp"
-								}
-							}
+							"include": "#qualifiers_and_specifiers_post_parameters"
 						},
 						{
 							"include": "$self"
@@ -3654,7 +3124,7 @@
 			]
 		},
 		"diagnostic": {
-			"begin": "(^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?((?:error|warning)))\\b(?:(?:\\s)+)?",
+			"begin": "(^((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?((?:error|warning)))\\b(?:(?:\\s)+)?",
 			"end": "(?<!\\\\)(?:(?=\\n)|(?<=^\\n|[^\\\\]\\n)(?=$))|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"1": {
@@ -3674,16 +3144,7 @@
 					"name": "comment.block.cpp"
 				},
 				"5": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"6": {
 					"name": "punctuation.definition.directive.cpp"
@@ -3784,7 +3245,7 @@
 			"match": "(?<!delete)\\[(?:(?:\\s)+)?\\]"
 		},
 		"enum_block": {
-			"begin": "((?<!\\w)enum(?!\\w))(?:(?:\\s)+(class|struct))?(?:(?:(?:\\s)+|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:(?:\\s)+)?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)(?:(?:(?:\\s)+)?(:)(?:(?:\\s)+)?(?:((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?(::))?(?:(?:\\s)+)?((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))?",
+			"begin": "((?<!\\w)enum(?!\\w))(?:(?:\\s)+(class|struct))?(?:(?:(?:\\s)+|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:(?:\\s)+)?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)(?:(?:(?:\\s)+)?(:)(?:(?:\\s)+)?(?:((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?(::))?(?:(?:\\s)+)?((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))?",
 			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"0": {
@@ -3918,7 +3379,7 @@
 			]
 		},
 		"enum_declare": {
-			"match": "((?<!\\w)enum(?!\\w))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\S)(?![:{a-zA-Z])",
+			"match": "((?<!\\w)enum(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?=\\S)(?![:{a-zA-Z])",
 			"captures": {
 				"1": {
 					"name": "storage.type.enum.declare.cpp"
@@ -3933,7 +3394,7 @@
 				"3": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -3942,16 +3403,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -3967,7 +3419,7 @@
 							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -3983,16 +3435,7 @@
 									"name": "comment.block.cpp"
 								},
 								"4": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							},
 							"name": "invalid.illegal.reference-type.cpp"
@@ -4013,7 +3456,7 @@
 				"7": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -4022,16 +3465,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -4047,7 +3481,7 @@
 				"9": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -4056,16 +3490,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -4081,7 +3506,7 @@
 				"11": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -4090,16 +3515,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -4118,7 +3534,7 @@
 				"14": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -4127,16 +3543,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -4309,7 +3716,7 @@
 			]
 		},
 		"exception_keywords": {
-			"match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:(?:throw)|(?:catch)|(?:try))(?!\\w))",
+			"match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:(?:throw)|(?:catch)|(?:try))(?!\\w))",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -4321,7 +3728,7 @@
 				"2": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -4330,16 +3737,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -4351,7 +3749,7 @@
 			}
 		},
 		"extern_block": {
-			"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(extern)(?=\\s*\\\")",
+			"begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(extern)(?=\\s*\\\")",
 			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"0": {
@@ -4371,16 +3769,7 @@
 					"name": "comment.block.cpp"
 				},
 				"4": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"5": {
 					"name": "storage.type.extern.cpp"
@@ -4519,7 +3908,7 @@
 			]
 		},
 		"function_call": {
-			"begin": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)(?:\\s)*+)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?<!\\Wreinterpret_cast|^reinterpret_cast|\\Watomic_noexcept|^atomic_noexcept|\\Wuint_least16_t|^uint_least16_t|\\Wuint_least32_t|^uint_least32_t|\\Wuint_least64_t|^uint_least64_t|\\Wint_least16_t|^int_least16_t|\\Wint_least32_t|^int_least32_t|\\Wint_least64_t|^int_least64_t|\\Wuint_least8_t|^uint_least8_t|\\Wuint_fast16_t|^uint_fast16_t|\\Wuint_fast32_t|^uint_fast32_t|\\Wuint_fast64_t|^uint_fast64_t|\\Watomic_cancel|^atomic_cancel|\\Watomic_commit|^atomic_commit|\\Wdynamic_cast|^dynamic_cast|\\Wint_least8_t|^int_least8_t|\\Wint_fast16_t|^int_fast16_t|\\Wint_fast32_t|^int_fast32_t|\\Wint_fast64_t|^int_fast64_t|\\Wuint_fast8_t|^uint_fast8_t|\\Wthread_local|^thread_local|\\Wsynchronized|^synchronized|\\Wstatic_cast|^static_cast|\\Wsuseconds_t|^suseconds_t|\\Wint_fast8_t|^int_fast8_t|\\Wconst_cast|^const_cast|\\Wuseconds_t|^useconds_t|\\Wco_return|^co_return|\\Wblksize_t|^blksize_t|\\Win_addr_t|^in_addr_t|\\Win_port_t|^in_port_t|\\Wuintptr_t|^uintptr_t|\\Wuintmax_t|^uintmax_t|\\Wuintmax_t|^uintmax_t|\\Wuintmax_t|^uintmax_t|\\Wconstexpr|^constexpr|\\Wconsteval|^consteval|\\Wconstexpr|^constexpr|\\Wconstexpr|^constexpr|\\Wconsteval|^consteval|\\Wprotected|^protected|\\Wnamespace|^namespace|\\Wconstinit|^constinit|\\Wco_return|^co_return|\\Wnoexcept|^noexcept|\\Wnoexcept|^noexcept|\\Wcontinue|^continue|\\Wco_await|^co_await|\\Wco_yield|^co_yield|\\Wunsigned|^unsigned|\\Wu_quad_t|^u_quad_t|\\Wblkcnt_t|^blkcnt_t|\\Wuint16_t|^uint16_t|\\Wuint32_t|^uint32_t|\\Wuint64_t|^uint64_t|\\Wintptr_t|^intptr_t|\\Wintmax_t|^intmax_t|\\Wintmax_t|^intmax_t|\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wexplicit|^explicit|\\Wvolatile|^volatile|\\Wnoexcept|^noexcept|\\Wtemplate|^template|\\Woperator|^operator|\\Wdecltype|^decltype|\\Wtypename|^typename|\\Wrequires|^requires|\\Wco_await|^co_await|\\Wco_yield|^co_yield|\\Wreflexpr|^reflexpr|\\Walignof|^alignof|\\Walignas|^alignas|\\Wdefault|^default|\\Wwchar_t|^wchar_t|\\Wu_short|^u_short|\\Wqaddr_t|^qaddr_t|\\Wcaddr_t|^caddr_t|\\Wdaddr_t|^daddr_t|\\Wfixpt_t|^fixpt_t|\\Wnlink_t|^nlink_t|\\Wsegsz_t|^segsz_t|\\Wswblk_t|^swblk_t|\\Wclock_t|^clock_t|\\Wssize_t|^ssize_t|\\Wint16_t|^int16_t|\\Wint32_t|^int32_t|\\Wint64_t|^int64_t|\\Wuint8_t|^uint8_t|\\Wnullptr|^nullptr|\\Wmutable|^mutable|\\Wvirtual|^virtual|\\Wmutable|^mutable|\\Wprivate|^private|\\Wtypedef|^typedef|\\W__asm__|^__asm__|\\Wconcept|^concept|\\Wsizeof|^sizeof|\\Wdelete|^delete|\\Wnot_eq|^not_eq|\\Wbitand|^bitand|\\Wand_eq|^and_eq|\\Wxor_eq|^xor_eq|\\Wtypeid|^typeid|\\Wswitch|^switch|\\Wreturn|^return|\\Wsigned|^signed|\\Wdouble|^double|\\Wu_char|^u_char|\\Wu_long|^u_long|\\Wushort|^ushort|\\Wquad_t|^quad_t|\\Wmode_t|^mode_t|\\Wsize_t|^size_t|\\Wtime_t|^time_t|\\Wint8_t|^int8_t|\\Wstruct|^struct|\\Wstatic|^static|\\Wextern|^extern|\\Winline|^inline|\\Wfriend|^friend|\\Wpublic|^public|\\Wexport|^export|\\Wimport|^import|\\Wmodule|^module|\\Wcompl|^compl|\\Wbitor|^bitor|\\Wthrow|^throw|\\Wor_eq|^or_eq|\\Wwhile|^while|\\Wcatch|^catch|\\Wbreak|^break|\\Wshort|^short|\\Wfloat|^float|\\Wu_int|^u_int|\\Wdiv_t|^div_t|\\Wdev_t|^dev_t|\\Wgid_t|^gid_t|\\Wino_t|^ino_t|\\Wkey_t|^key_t|\\Wpid_t|^pid_t|\\Woff_t|^off_t|\\Wuid_t|^uid_t|\\Wfalse|^false|\\Wclass|^class|\\Wunion|^union|\\Wconst|^const|\\Wconst|^const|\\Wusing|^using|\\Welse|^else|\\Wgoto|^goto|\\Wcase|^case|\\Wauto|^auto|\\Wvoid|^void|\\Wchar|^char|\\Wlong|^long|\\Wbool|^bool|\\Wuint|^uint|\\Wid_t|^id_t|\\Wid_t|^id_t|\\WNULL|^NULL|\\Wtrue|^true|\\Wenum|^enum|\\Wthis|^this|\\Wnot|^not|\\Wnew|^new|\\Wxor|^xor|\\Wand|^and|\\Wfor|^for|\\Wtry|^try|\\Wint|^int|\\Wasm|^asm|\\Wor|^or|\\Wdo|^do|\\Wif|^if)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)(?:\\s)*+)?(\\()",
+			"begin": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)(?:\\s)*+)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?<!\\Wreinterpret_cast|^reinterpret_cast|\\Watomic_noexcept|^atomic_noexcept|\\Wuint_least16_t|^uint_least16_t|\\Wuint_least32_t|^uint_least32_t|\\Wuint_least64_t|^uint_least64_t|\\Watomic_cancel|^atomic_cancel|\\Watomic_commit|^atomic_commit|\\Wuint_least8_t|^uint_least8_t|\\Wuint_fast16_t|^uint_fast16_t|\\Wuint_fast32_t|^uint_fast32_t|\\Wint_least16_t|^int_least16_t|\\Wint_least32_t|^int_least32_t|\\Wint_least64_t|^int_least64_t|\\Wuint_fast64_t|^uint_fast64_t|\\Wthread_local|^thread_local|\\Wint_fast16_t|^int_fast16_t|\\Wint_fast32_t|^int_fast32_t|\\Wint_fast64_t|^int_fast64_t|\\Wsynchronized|^synchronized|\\Wuint_fast8_t|^uint_fast8_t|\\Wdynamic_cast|^dynamic_cast|\\Wint_least8_t|^int_least8_t|\\Wint_fast8_t|^int_fast8_t|\\Wstatic_cast|^static_cast|\\Wsuseconds_t|^suseconds_t|\\Wconst_cast|^const_cast|\\Wuseconds_t|^useconds_t|\\Wconstinit|^constinit|\\Wco_return|^co_return|\\Wuintmax_t|^uintmax_t|\\Wuintmax_t|^uintmax_t|\\Wuintmax_t|^uintmax_t|\\Wconstexpr|^constexpr|\\Wconsteval|^consteval|\\Wconstexpr|^constexpr|\\Wconstexpr|^constexpr|\\Wconsteval|^consteval|\\Wprotected|^protected|\\Wnamespace|^namespace|\\Wblksize_t|^blksize_t|\\Wco_return|^co_return|\\Win_addr_t|^in_addr_t|\\Win_port_t|^in_port_t|\\Wuintptr_t|^uintptr_t|\\Wtemplate|^template|\\Wnoexcept|^noexcept|\\Wnoexcept|^noexcept|\\Wcontinue|^continue|\\Wco_await|^co_await|\\Wco_yield|^co_yield|\\Wunsigned|^unsigned|\\Wu_quad_t|^u_quad_t|\\Wblkcnt_t|^blkcnt_t|\\Wuint16_t|^uint16_t|\\Wuint32_t|^uint32_t|\\Wuint64_t|^uint64_t|\\Wintptr_t|^intptr_t|\\Wintmax_t|^intmax_t|\\Wintmax_t|^intmax_t|\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wexplicit|^explicit|\\Wvolatile|^volatile|\\Wnoexcept|^noexcept|\\Woperator|^operator|\\Wdecltype|^decltype|\\Wtypename|^typename|\\Wrequires|^requires|\\Wco_await|^co_await|\\Wco_yield|^co_yield|\\Wreflexpr|^reflexpr|\\Wswblk_t|^swblk_t|\\Wvirtual|^virtual|\\Wssize_t|^ssize_t|\\Wconcept|^concept|\\Wmutable|^mutable|\\Wfixpt_t|^fixpt_t|\\Wint16_t|^int16_t|\\Wint32_t|^int32_t|\\Wint64_t|^int64_t|\\Wuint8_t|^uint8_t|\\Wtypedef|^typedef|\\Wdaddr_t|^daddr_t|\\Wcaddr_t|^caddr_t|\\Wqaddr_t|^qaddr_t|\\Wdefault|^default|\\Wnlink_t|^nlink_t|\\Wsegsz_t|^segsz_t|\\Wu_short|^u_short|\\Wwchar_t|^wchar_t|\\Wprivate|^private|\\W__asm__|^__asm__|\\Walignas|^alignas|\\Walignof|^alignof|\\Wmutable|^mutable|\\Wnullptr|^nullptr|\\Wclock_t|^clock_t|\\Wmode_t|^mode_t|\\Wpublic|^public|\\Wsize_t|^size_t|\\Wdouble|^double|\\Wquad_t|^quad_t|\\Wstatic|^static|\\Wtime_t|^time_t|\\Wmodule|^module|\\Wimport|^import|\\Wexport|^export|\\Wextern|^extern|\\Winline|^inline|\\Wxor_eq|^xor_eq|\\Wand_eq|^and_eq|\\Wreturn|^return|\\Wfriend|^friend|\\Wnot_eq|^not_eq|\\Wsigned|^signed|\\Wstruct|^struct|\\Wint8_t|^int8_t|\\Wushort|^ushort|\\Wswitch|^switch|\\Wu_long|^u_long|\\Wtypeid|^typeid|\\Wu_char|^u_char|\\Wsizeof|^sizeof|\\Wbitand|^bitand|\\Wdelete|^delete|\\Wino_t|^ino_t|\\Wkey_t|^key_t|\\Wpid_t|^pid_t|\\Woff_t|^off_t|\\Wuid_t|^uid_t|\\Wshort|^short|\\Wbreak|^break|\\Wcatch|^catch|\\Wcompl|^compl|\\Wwhile|^while|\\Wfalse|^false|\\Wclass|^class|\\Wunion|^union|\\Wconst|^const|\\Wor_eq|^or_eq|\\Wconst|^const|\\Wthrow|^throw|\\Wbitor|^bitor|\\Wu_int|^u_int|\\Wusing|^using|\\Wdiv_t|^div_t|\\Wdev_t|^dev_t|\\Wgid_t|^gid_t|\\Wfloat|^float|\\Wlong|^long|\\Wgoto|^goto|\\Wuint|^uint|\\Wid_t|^id_t|\\Wcase|^case|\\Wauto|^auto|\\Wvoid|^void|\\Wenum|^enum|\\Wtrue|^true|\\Wchar|^char|\\Wid_t|^id_t|\\WNULL|^NULL|\\Wthis|^this|\\Wbool|^bool|\\Welse|^else|\\Wfor|^for|\\Wnew|^new|\\Wnot|^not|\\Wxor|^xor|\\Wand|^and|\\Wasm|^asm|\\Wint|^int|\\Wtry|^try|\\Wdo|^do|\\Wif|^if|\\Wor|^or)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)(?:\\s)*+)?(\\()",
 			"end": "\\)|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"1": {
@@ -4557,16 +3946,7 @@
 					"name": "comment.block.cpp"
 				},
 				"9": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"10": {
 					"name": "meta.template.call.cpp",
@@ -4593,66 +3973,32 @@
 			]
 		},
 		"function_definition": {
-			"begin": "(?:(?:^|\\G|(?<=;|\\}))|(?<=>))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:((?<!\\w)template(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?<!\\w)(?:(?:(?:constexpr)|(?:consteval)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))|(?:(?:thread_local)|(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*)(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<60>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:__has_include)|(?:atomic_cancel)|(?:atomic_commit)|(?:dynamic_cast)|(?:thread_local)|(?:synchronized)|(?:static_cast)|(?:const_cast)|(?:co_return)|(?:constexpr)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:consteval)|(?:protected)|(?:namespace)|(?:constinit)|(?:co_return)|(?:noexcept)|(?:noexcept)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:noexcept)|(?:template)|(?:operator)|(?:decltype)|(?:typename)|(?:requires)|(?:co_await)|(?:co_yield)|(?:reflexpr)|(?:alignof)|(?:alignas)|(?:default)|(?:nullptr)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:sizeof)|(?:delete)|(?:not_eq)|(?:bitand)|(?:and_eq)|(?:xor_eq)|(?:typeid)|(?:switch)|(?:return)|(?:static)|(?:extern)|(?:inline)|(?:friend)|(?:public)|(?:ifndef)|(?:define)|(?:pragma)|(?:export)|(?:import)|(?:module)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:false)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:else)|(?:goto)|(?:case)|(?:NULL)|(?:true)|(?:elif)|(?:else)|(?:line)|(?:this)|(?:not)|(?:new)|(?:xor)|(?:and)|(?:for)|(?:try)|(?:asm)|(?:or)|(?:do)|(?:if)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<60>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<60>?)+>)(?:\\s)*+)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?<!\\Wreinterpret_cast|^reinterpret_cast|\\Watomic_noexcept|^atomic_noexcept|\\Wuint_least16_t|^uint_least16_t|\\Wuint_least32_t|^uint_least32_t|\\Wuint_least64_t|^uint_least64_t|\\Wint_least16_t|^int_least16_t|\\Wint_least32_t|^int_least32_t|\\Wint_least64_t|^int_least64_t|\\Wuint_least8_t|^uint_least8_t|\\Wuint_fast16_t|^uint_fast16_t|\\Wuint_fast32_t|^uint_fast32_t|\\Wuint_fast64_t|^uint_fast64_t|\\Watomic_cancel|^atomic_cancel|\\Watomic_commit|^atomic_commit|\\Wdynamic_cast|^dynamic_cast|\\Wint_least8_t|^int_least8_t|\\Wint_fast16_t|^int_fast16_t|\\Wint_fast32_t|^int_fast32_t|\\Wint_fast64_t|^int_fast64_t|\\Wuint_fast8_t|^uint_fast8_t|\\Wthread_local|^thread_local|\\Wsynchronized|^synchronized|\\Wstatic_cast|^static_cast|\\Wsuseconds_t|^suseconds_t|\\Wint_fast8_t|^int_fast8_t|\\Wconst_cast|^const_cast|\\Wuseconds_t|^useconds_t|\\Wco_return|^co_return|\\Wblksize_t|^blksize_t|\\Win_addr_t|^in_addr_t|\\Win_port_t|^in_port_t|\\Wuintptr_t|^uintptr_t|\\Wuintmax_t|^uintmax_t|\\Wuintmax_t|^uintmax_t|\\Wuintmax_t|^uintmax_t|\\Wconstexpr|^constexpr|\\Wconsteval|^consteval|\\Wconstexpr|^constexpr|\\Wconstexpr|^constexpr|\\Wconsteval|^consteval|\\Wprotected|^protected|\\Wnamespace|^namespace|\\Wconstinit|^constinit|\\Wco_return|^co_return|\\Wnoexcept|^noexcept|\\Wnoexcept|^noexcept|\\Wcontinue|^continue|\\Wco_await|^co_await|\\Wco_yield|^co_yield|\\Wunsigned|^unsigned|\\Wu_quad_t|^u_quad_t|\\Wblkcnt_t|^blkcnt_t|\\Wuint16_t|^uint16_t|\\Wuint32_t|^uint32_t|\\Wuint64_t|^uint64_t|\\Wintptr_t|^intptr_t|\\Wintmax_t|^intmax_t|\\Wintmax_t|^intmax_t|\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wexplicit|^explicit|\\Wvolatile|^volatile|\\Wnoexcept|^noexcept|\\Wtemplate|^template|\\Woperator|^operator|\\Wdecltype|^decltype|\\Wtypename|^typename|\\Wrequires|^requires|\\Wco_await|^co_await|\\Wco_yield|^co_yield|\\Wreflexpr|^reflexpr|\\Walignof|^alignof|\\Walignas|^alignas|\\Wdefault|^default|\\Wwchar_t|^wchar_t|\\Wu_short|^u_short|\\Wqaddr_t|^qaddr_t|\\Wcaddr_t|^caddr_t|\\Wdaddr_t|^daddr_t|\\Wfixpt_t|^fixpt_t|\\Wnlink_t|^nlink_t|\\Wsegsz_t|^segsz_t|\\Wswblk_t|^swblk_t|\\Wclock_t|^clock_t|\\Wssize_t|^ssize_t|\\Wint16_t|^int16_t|\\Wint32_t|^int32_t|\\Wint64_t|^int64_t|\\Wuint8_t|^uint8_t|\\Wnullptr|^nullptr|\\Wmutable|^mutable|\\Wvirtual|^virtual|\\Wmutable|^mutable|\\Wprivate|^private|\\Wtypedef|^typedef|\\W__asm__|^__asm__|\\Wconcept|^concept|\\Wsizeof|^sizeof|\\Wdelete|^delete|\\Wnot_eq|^not_eq|\\Wbitand|^bitand|\\Wand_eq|^and_eq|\\Wxor_eq|^xor_eq|\\Wtypeid|^typeid|\\Wswitch|^switch|\\Wreturn|^return|\\Wsigned|^signed|\\Wdouble|^double|\\Wu_char|^u_char|\\Wu_long|^u_long|\\Wushort|^ushort|\\Wquad_t|^quad_t|\\Wmode_t|^mode_t|\\Wsize_t|^size_t|\\Wtime_t|^time_t|\\Wint8_t|^int8_t|\\Wstruct|^struct|\\Wstatic|^static|\\Wextern|^extern|\\Winline|^inline|\\Wfriend|^friend|\\Wpublic|^public|\\Wexport|^export|\\Wimport|^import|\\Wmodule|^module|\\Wcompl|^compl|\\Wbitor|^bitor|\\Wthrow|^throw|\\Wor_eq|^or_eq|\\Wwhile|^while|\\Wcatch|^catch|\\Wbreak|^break|\\Wshort|^short|\\Wfloat|^float|\\Wu_int|^u_int|\\Wdiv_t|^div_t|\\Wdev_t|^dev_t|\\Wgid_t|^gid_t|\\Wino_t|^ino_t|\\Wkey_t|^key_t|\\Wpid_t|^pid_t|\\Woff_t|^off_t|\\Wuid_t|^uid_t|\\Wfalse|^false|\\Wclass|^class|\\Wunion|^union|\\Wconst|^const|\\Wconst|^const|\\Wusing|^using|\\Welse|^else|\\Wgoto|^goto|\\Wcase|^case|\\Wauto|^auto|\\Wvoid|^void|\\Wchar|^char|\\Wlong|^long|\\Wbool|^bool|\\Wuint|^uint|\\Wid_t|^id_t|\\Wid_t|^id_t|\\WNULL|^NULL|\\Wtrue|^true|\\Wenum|^enum|\\Wthis|^this|\\Wnot|^not|\\Wnew|^new|\\Wxor|^xor|\\Wand|^and|\\Wfor|^for|\\Wtry|^try|\\Wint|^int|\\Wasm|^asm|\\Wor|^or|\\Wdo|^do|\\Wif|^if)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\()",
+			"begin": "(?:(?:^|\\G|(?<=;|\\}))|(?<=>|\\*\\/))\\s*+(?:((?<!\\w)template(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?<!\\w)(?:(?:(?:constexpr)|(?:consteval)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))|(?:(?:thread_local)|(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*)(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<56>?)+>)(?:\\s)*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<56>?)+>)?(?![\\w<:.]))(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<56>?)+>)(?:\\s)*+)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?<!\\Wreinterpret_cast|^reinterpret_cast|\\Watomic_noexcept|^atomic_noexcept|\\Wuint_least16_t|^uint_least16_t|\\Wuint_least32_t|^uint_least32_t|\\Wuint_least64_t|^uint_least64_t|\\Watomic_cancel|^atomic_cancel|\\Watomic_commit|^atomic_commit|\\Wuint_least8_t|^uint_least8_t|\\Wuint_fast16_t|^uint_fast16_t|\\Wuint_fast32_t|^uint_fast32_t|\\Wint_least16_t|^int_least16_t|\\Wint_least32_t|^int_least32_t|\\Wint_least64_t|^int_least64_t|\\Wuint_fast64_t|^uint_fast64_t|\\Wthread_local|^thread_local|\\Wint_fast16_t|^int_fast16_t|\\Wint_fast32_t|^int_fast32_t|\\Wint_fast64_t|^int_fast64_t|\\Wsynchronized|^synchronized|\\Wuint_fast8_t|^uint_fast8_t|\\Wdynamic_cast|^dynamic_cast|\\Wint_least8_t|^int_least8_t|\\Wint_fast8_t|^int_fast8_t|\\Wstatic_cast|^static_cast|\\Wsuseconds_t|^suseconds_t|\\Wconst_cast|^const_cast|\\Wuseconds_t|^useconds_t|\\Wconstinit|^constinit|\\Wco_return|^co_return|\\Wuintmax_t|^uintmax_t|\\Wuintmax_t|^uintmax_t|\\Wuintmax_t|^uintmax_t|\\Wconstexpr|^constexpr|\\Wconsteval|^consteval|\\Wconstexpr|^constexpr|\\Wconstexpr|^constexpr|\\Wconsteval|^consteval|\\Wprotected|^protected|\\Wnamespace|^namespace|\\Wblksize_t|^blksize_t|\\Wco_return|^co_return|\\Win_addr_t|^in_addr_t|\\Win_port_t|^in_port_t|\\Wuintptr_t|^uintptr_t|\\Wtemplate|^template|\\Wnoexcept|^noexcept|\\Wnoexcept|^noexcept|\\Wcontinue|^continue|\\Wco_await|^co_await|\\Wco_yield|^co_yield|\\Wunsigned|^unsigned|\\Wu_quad_t|^u_quad_t|\\Wblkcnt_t|^blkcnt_t|\\Wuint16_t|^uint16_t|\\Wuint32_t|^uint32_t|\\Wuint64_t|^uint64_t|\\Wintptr_t|^intptr_t|\\Wintmax_t|^intmax_t|\\Wintmax_t|^intmax_t|\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wexplicit|^explicit|\\Wvolatile|^volatile|\\Wnoexcept|^noexcept|\\Woperator|^operator|\\Wdecltype|^decltype|\\Wtypename|^typename|\\Wrequires|^requires|\\Wco_await|^co_await|\\Wco_yield|^co_yield|\\Wreflexpr|^reflexpr|\\Wswblk_t|^swblk_t|\\Wvirtual|^virtual|\\Wssize_t|^ssize_t|\\Wconcept|^concept|\\Wmutable|^mutable|\\Wfixpt_t|^fixpt_t|\\Wint16_t|^int16_t|\\Wint32_t|^int32_t|\\Wint64_t|^int64_t|\\Wuint8_t|^uint8_t|\\Wtypedef|^typedef|\\Wdaddr_t|^daddr_t|\\Wcaddr_t|^caddr_t|\\Wqaddr_t|^qaddr_t|\\Wdefault|^default|\\Wnlink_t|^nlink_t|\\Wsegsz_t|^segsz_t|\\Wu_short|^u_short|\\Wwchar_t|^wchar_t|\\Wprivate|^private|\\W__asm__|^__asm__|\\Walignas|^alignas|\\Walignof|^alignof|\\Wmutable|^mutable|\\Wnullptr|^nullptr|\\Wclock_t|^clock_t|\\Wmode_t|^mode_t|\\Wpublic|^public|\\Wsize_t|^size_t|\\Wdouble|^double|\\Wquad_t|^quad_t|\\Wstatic|^static|\\Wtime_t|^time_t|\\Wmodule|^module|\\Wimport|^import|\\Wexport|^export|\\Wextern|^extern|\\Winline|^inline|\\Wxor_eq|^xor_eq|\\Wand_eq|^and_eq|\\Wreturn|^return|\\Wfriend|^friend|\\Wnot_eq|^not_eq|\\Wsigned|^signed|\\Wstruct|^struct|\\Wint8_t|^int8_t|\\Wushort|^ushort|\\Wswitch|^switch|\\Wu_long|^u_long|\\Wtypeid|^typeid|\\Wu_char|^u_char|\\Wsizeof|^sizeof|\\Wbitand|^bitand|\\Wdelete|^delete|\\Wino_t|^ino_t|\\Wkey_t|^key_t|\\Wpid_t|^pid_t|\\Woff_t|^off_t|\\Wuid_t|^uid_t|\\Wshort|^short|\\Wbreak|^break|\\Wcatch|^catch|\\Wcompl|^compl|\\Wwhile|^while|\\Wfalse|^false|\\Wclass|^class|\\Wunion|^union|\\Wconst|^const|\\Wor_eq|^or_eq|\\Wconst|^const|\\Wthrow|^throw|\\Wbitor|^bitor|\\Wu_int|^u_int|\\Wusing|^using|\\Wdiv_t|^div_t|\\Wdev_t|^dev_t|\\Wgid_t|^gid_t|\\Wfloat|^float|\\Wlong|^long|\\Wgoto|^goto|\\Wuint|^uint|\\Wid_t|^id_t|\\Wcase|^case|\\Wauto|^auto|\\Wvoid|^void|\\Wenum|^enum|\\Wtrue|^true|\\Wchar|^char|\\Wid_t|^id_t|\\WNULL|^NULL|\\Wthis|^this|\\Wbool|^bool|\\Welse|^else|\\Wfor|^for|\\Wnew|^new|\\Wnot|^not|\\Wxor|^xor|\\Wand|^and|\\Wasm|^asm|\\Wint|^int|\\Wtry|^try|\\Wdo|^do|\\Wif|^if|\\Wor|^or)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?=\\()",
 			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"0": {
 					"name": "meta.head.function.definition.cpp"
 				},
 				"1": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"2": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"3": {
-					"name": "comment.block.cpp"
-				},
-				"4": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"5": {
 					"name": "storage.type.template.cpp"
 				},
-				"6": {
+				"2": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"7": {
+				"3": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"8": {
+				"4": {
 					"name": "comment.block.cpp"
 				},
-				"9": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+				"5": {
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
-				"10": {
+				"6": {
 					"patterns": [
 						{
 							"include": "#attributes_context"
@@ -4662,10 +4008,10 @@
 						}
 					]
 				},
-				"11": {
+				"7": {
 					"patterns": [
 						{
-							"match": "((?<!\\w)(?:(?:(?:constexpr)|(?:consteval)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))|(?:(?:thread_local)|(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))",
+							"match": "((?<!\\w)(?:(?:(?:constexpr)|(?:consteval)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))|(?:(?:thread_local)|(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))",
 							"captures": {
 								"1": {
 									"name": "storage.modifier.$1.cpp"
@@ -4684,50 +4030,32 @@
 									"name": "comment.block.cpp"
 								},
 								"5": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
 					]
 				},
-				"12": {
-					"name": "storage.modifier.$12.cpp"
+				"8": {
+					"name": "storage.modifier.$8.cpp"
 				},
-				"13": {
+				"9": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"14": {
+				"10": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"15": {
+				"11": {
 					"name": "comment.block.cpp"
 				},
-				"16": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+				"12": {
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
-				"17": {
+				"13": {
 					"name": "meta.qualified_type.cpp",
 					"patterns": [
 						{
@@ -4782,7 +4110,7 @@
 						}
 					]
 				},
-				"18": {
+				"14": {
 					"patterns": [
 						{
 							"include": "#attributes_context"
@@ -4792,57 +4120,39 @@
 						}
 					]
 				},
-				"19": {
+				"15": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"20": {
+				"16": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"21": {
+				"17": {
 					"name": "comment.block.cpp"
 				},
-				"22": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+				"18": {
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
-				"23": {
+				"19": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"24": {
+				"20": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"25": {
+				"21": {
 					"name": "comment.block.cpp"
 				},
-				"26": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+				"22": {
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
-				"27": {
+				"23": {
 					"patterns": [
 						{
 							"match": "::",
@@ -4857,48 +4167,39 @@
 						}
 					]
 				},
-				"28": {
+				"24": {
 					"patterns": [
 						{
 							"include": "#template_call_range"
 						}
 					]
 				},
-				"29": {},
-				"30": {
+				"25": {},
+				"26": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"31": {
+				"27": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"32": {
+				"28": {
 					"name": "comment.block.cpp"
 				},
-				"33": {
+				"29": {
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+				},
+				"30": {},
+				"31": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+							"match": "\\*",
+							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"34": {},
-				"35": {
-					"patterns": [
-						{
-							"match": "\\*",
-							"name": "storage.modifier.pointer.cpp"
-						},
-						{
-							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -4914,16 +4215,7 @@
 									"name": "comment.block.cpp"
 								},
 								"4": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							},
 							"name": "invalid.illegal.reference-type.cpp"
@@ -4934,31 +4226,38 @@
 						}
 					]
 				},
-				"36": {
+				"32": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"37": {
+				"33": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"38": {
+				"34": {
 					"name": "comment.block.cpp"
 				},
-				"39": {
+				"35": {
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+				},
+				"36": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#inline_comment"
 						}
 					]
 				},
+				"37": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"38": {
+					"name": "comment.block.cpp"
+				},
+				"39": {
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+				},
 				"40": {
 					"patterns": [
 						{
@@ -4973,16 +4272,7 @@
 					"name": "comment.block.cpp"
 				},
 				"43": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"44": {
 					"patterns": [
@@ -4998,115 +4288,63 @@
 					"name": "comment.block.cpp"
 				},
 				"47": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"48": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"49": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"50": {
-					"name": "comment.block.cpp"
-				},
-				"51": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"52": {
 					"name": "storage.type.modifier.calling-convention.cpp"
 				},
-				"53": {
+				"49": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"54": {
+				"50": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"55": {
+				"51": {
 					"name": "comment.block.cpp"
 				},
-				"56": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+				"52": {
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
-				"57": {
+				"53": {
 					"patterns": [
 						{
 							"include": "#scope_resolution_function_definition_inner_generated"
 						}
 					]
 				},
-				"58": {
+				"54": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.definition.cpp"
 				},
-				"59": {
+				"55": {
 					"patterns": [
 						{
 							"include": "#template_call_range"
 						}
 					]
 				},
-				"60": {},
-				"61": {
+				"56": {},
+				"57": {
 					"name": "entity.name.function.definition.cpp"
 				},
-				"62": {
+				"58": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"63": {
+				"59": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"64": {
+				"60": {
 					"name": "comment.block.cpp"
 				},
-				"65": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+				"61": {
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				}
 			},
 			"endCaptures": {},
@@ -5156,7 +4394,7 @@
 							]
 						},
 						{
-							"match": "(?<=^|\\))(?:(?:\\s)+)?(->)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<23>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:__has_include)|(?:atomic_cancel)|(?:atomic_commit)|(?:dynamic_cast)|(?:thread_local)|(?:synchronized)|(?:static_cast)|(?:const_cast)|(?:co_return)|(?:constexpr)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:consteval)|(?:protected)|(?:namespace)|(?:constinit)|(?:co_return)|(?:noexcept)|(?:noexcept)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:noexcept)|(?:template)|(?:operator)|(?:decltype)|(?:typename)|(?:requires)|(?:co_await)|(?:co_yield)|(?:reflexpr)|(?:alignof)|(?:alignas)|(?:default)|(?:nullptr)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:sizeof)|(?:delete)|(?:not_eq)|(?:bitand)|(?:and_eq)|(?:xor_eq)|(?:typeid)|(?:switch)|(?:return)|(?:static)|(?:extern)|(?:inline)|(?:friend)|(?:public)|(?:ifndef)|(?:define)|(?:pragma)|(?:export)|(?:import)|(?:module)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:false)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:else)|(?:goto)|(?:case)|(?:NULL)|(?:true)|(?:elif)|(?:else)|(?:line)|(?:this)|(?:not)|(?:new)|(?:xor)|(?:and)|(?:for)|(?:try)|(?:asm)|(?:or)|(?:do)|(?:if)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<23>?)+>)?(?![\\w<:.]))",
+							"match": "(?<=^|\\))(?:(?:\\s)+)?(->)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<23>?)+>)(?:\\s)*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<23>?)+>)?(?![\\w<:.]))",
 							"captures": {
 								"1": {
 									"name": "punctuation.definition.function.return-type.cpp"
@@ -5175,16 +4413,7 @@
 									"name": "comment.block.cpp"
 								},
 								"5": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								},
 								"6": {
 									"name": "meta.qualified_type.cpp",
@@ -5265,16 +4494,7 @@
 									"name": "comment.block.cpp"
 								},
 								"11": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								},
 								"12": {
 									"patterns": [
@@ -5290,16 +4510,7 @@
 									"name": "comment.block.cpp"
 								},
 								"15": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								},
 								"16": {
 									"patterns": [
@@ -5338,16 +4549,7 @@
 									"name": "comment.block.cpp"
 								},
 								"22": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								},
 								"23": {}
 							}
@@ -5392,9 +4594,6 @@
 				{
 					"include": "#ever_present_context"
 				},
-				{
-					"include": "#string_context"
-				},
 				{
 					"include": "#parameter"
 				},
@@ -5404,8 +4603,8 @@
 			]
 		},
 		"function_pointer": {
-			"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:__has_include)|(?:atomic_cancel)|(?:atomic_commit)|(?:dynamic_cast)|(?:thread_local)|(?:synchronized)|(?:static_cast)|(?:const_cast)|(?:co_return)|(?:constexpr)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:consteval)|(?:protected)|(?:namespace)|(?:constinit)|(?:co_return)|(?:noexcept)|(?:noexcept)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:noexcept)|(?:template)|(?:operator)|(?:decltype)|(?:typename)|(?:requires)|(?:co_await)|(?:co_yield)|(?:reflexpr)|(?:alignof)|(?:alignas)|(?:default)|(?:nullptr)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:sizeof)|(?:delete)|(?:not_eq)|(?:bitand)|(?:and_eq)|(?:xor_eq)|(?:typeid)|(?:switch)|(?:return)|(?:static)|(?:extern)|(?:inline)|(?:friend)|(?:public)|(?:ifndef)|(?:define)|(?:pragma)|(?:export)|(?:import)|(?:module)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:false)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:else)|(?:goto)|(?:case)|(?:NULL)|(?:true)|(?:elif)|(?:else)|(?:line)|(?:this)|(?:not)|(?:new)|(?:xor)|(?:and)|(?:for)|(?:try)|(?:asm)|(?:or)|(?:do)|(?:if)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()(\\*)(?:(?:\\s)+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)*(\\))(?:(?:\\s)+)?(\\()",
-			"end": "(\\))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=[{=,);>]|\\n)(?!\\()|(?=\\\\end\\{(?:minted|cppcode)\\})",
+			"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(\\()(\\*)(?:(?:\\s)+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)*(\\))(?:(?:\\s)+)?(\\()",
+			"end": "(\\))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?=[{=,);>]|\\n)(?!\\()|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"1": {
 					"name": "meta.qualified_type.cpp",
@@ -5486,16 +4685,7 @@
 					"name": "comment.block.cpp"
 				},
 				"6": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"7": {
 					"patterns": [
@@ -5511,16 +4701,7 @@
 					"name": "comment.block.cpp"
 				},
 				"10": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"11": {
 					"patterns": [
@@ -5559,16 +4740,7 @@
 					"name": "comment.block.cpp"
 				},
 				"17": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"18": {},
 				"19": {
@@ -5578,7 +4750,7 @@
 							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -5594,16 +4766,7 @@
 									"name": "comment.block.cpp"
 								},
 								"4": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							},
 							"name": "invalid.illegal.reference-type.cpp"
@@ -5628,16 +4791,7 @@
 					"name": "comment.block.cpp"
 				},
 				"23": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"24": {
 					"patterns": [
@@ -5653,16 +4807,7 @@
 					"name": "comment.block.cpp"
 				},
 				"27": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"28": {
 					"patterns": [
@@ -5678,16 +4823,7 @@
 					"name": "comment.block.cpp"
 				},
 				"31": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"32": {
 					"name": "punctuation.section.parens.begin.bracket.round.function.pointer.cpp"
@@ -5736,16 +4872,7 @@
 					"name": "comment.block.cpp"
 				},
 				"5": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				}
 			},
 			"patterns": [
@@ -5755,8 +4882,8 @@
 			]
 		},
 		"function_pointer_parameter": {
-			"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:__has_include)|(?:atomic_cancel)|(?:atomic_commit)|(?:dynamic_cast)|(?:thread_local)|(?:synchronized)|(?:static_cast)|(?:const_cast)|(?:co_return)|(?:constexpr)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:consteval)|(?:protected)|(?:namespace)|(?:constinit)|(?:co_return)|(?:noexcept)|(?:noexcept)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:noexcept)|(?:template)|(?:operator)|(?:decltype)|(?:typename)|(?:requires)|(?:co_await)|(?:co_yield)|(?:reflexpr)|(?:alignof)|(?:alignas)|(?:default)|(?:nullptr)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:sizeof)|(?:delete)|(?:not_eq)|(?:bitand)|(?:and_eq)|(?:xor_eq)|(?:typeid)|(?:switch)|(?:return)|(?:static)|(?:extern)|(?:inline)|(?:friend)|(?:public)|(?:ifndef)|(?:define)|(?:pragma)|(?:export)|(?:import)|(?:module)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:false)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:else)|(?:goto)|(?:case)|(?:NULL)|(?:true)|(?:elif)|(?:else)|(?:line)|(?:this)|(?:not)|(?:new)|(?:xor)|(?:and)|(?:for)|(?:try)|(?:asm)|(?:or)|(?:do)|(?:if)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()(\\*)(?:(?:\\s)+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)*(\\))(?:(?:\\s)+)?(\\()",
-			"end": "(\\))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=[{=,);>]|\\n)(?!\\()|(?=\\\\end\\{(?:minted|cppcode)\\})",
+			"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(\\()(\\*)(?:(?:\\s)+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)*(\\))(?:(?:\\s)+)?(\\()",
+			"end": "(\\))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?=[{=,);>]|\\n)(?!\\()|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"1": {
 					"name": "meta.qualified_type.cpp",
@@ -5837,16 +4964,7 @@
 					"name": "comment.block.cpp"
 				},
 				"6": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"7": {
 					"patterns": [
@@ -5862,16 +4980,7 @@
 					"name": "comment.block.cpp"
 				},
 				"10": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"11": {
 					"patterns": [
@@ -5910,26 +5019,17 @@
 					"name": "comment.block.cpp"
 				},
 				"17": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"18": {},
-				"19": {
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+				},
+				"18": {},
+				"19": {
 					"patterns": [
 						{
 							"match": "\\*",
 							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -5945,16 +5045,7 @@
 									"name": "comment.block.cpp"
 								},
 								"4": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							},
 							"name": "invalid.illegal.reference-type.cpp"
@@ -5979,16 +5070,7 @@
 					"name": "comment.block.cpp"
 				},
 				"23": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"24": {
 					"patterns": [
@@ -6004,16 +5086,7 @@
 					"name": "comment.block.cpp"
 				},
 				"27": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"28": {
 					"patterns": [
@@ -6029,16 +5102,7 @@
 					"name": "comment.block.cpp"
 				},
 				"31": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"32": {
 					"name": "punctuation.section.parens.begin.bracket.round.function.pointer.cpp"
@@ -6087,16 +5151,7 @@
 					"name": "comment.block.cpp"
 				},
 				"5": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				}
 			},
 			"patterns": [
@@ -6174,7 +5229,7 @@
 			]
 		},
 		"goto_statement": {
-			"match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)goto(?!\\w))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)",
+			"match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)goto(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -6186,7 +5241,7 @@
 				"2": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -6195,16 +5250,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -6223,7 +5269,7 @@
 				"5": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -6232,16 +5278,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -6256,7 +5293,7 @@
 			"match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*"
 		},
 		"include": {
-			"match": "^((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((#)(?:(?:\\s)+)?((?:include|include_next))\\b)(?:(?:\\s)+)?(?:(?:(?:((<)[^>]*(>?)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=\\/\\/)))|((\\\")[^\\\"]*((?:\\\")?)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=\\/\\/))))|(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:\\.(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)*((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=(?:\\/\\/|;)))))|((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=(?:\\/\\/|;))))",
+			"match": "^((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((#)(?:(?:\\s)+)?((?:include|include_next))\\b)(?:(?:\\s)+)?(?:(?:(?:((<)[^>]*(>?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=\\/\\/)))|((\\\")[^\\\"]*((?:\\\")?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=\\/\\/))))|(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:\\.(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)*((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=(?:\\/\\/|;)))))|((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=(?:\\/\\/|;))))",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -6268,7 +5305,7 @@
 				"2": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -6277,16 +5314,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -6317,7 +5345,7 @@
 				"10": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -6326,16 +5354,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -6360,7 +5379,7 @@
 				"15": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -6369,16 +5388,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -6397,7 +5407,7 @@
 				"18": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -6406,16 +5416,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -6431,7 +5432,7 @@
 				"20": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -6440,16 +5441,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -6465,7 +5457,7 @@
 				"22": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -6474,16 +5466,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -6510,7 +5493,7 @@
 					"name": "storage.type.modifier.virtual.cpp"
 				},
 				{
-					"match": "(?<=protected|virtual|private|public|,|:)(?:(?:\\s)+)?(?!(?:(?:(?:protected)|(?:private)|(?:public))|virtual))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:__has_include)|(?:atomic_cancel)|(?:atomic_commit)|(?:dynamic_cast)|(?:thread_local)|(?:synchronized)|(?:static_cast)|(?:const_cast)|(?:co_return)|(?:constexpr)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:consteval)|(?:protected)|(?:namespace)|(?:constinit)|(?:co_return)|(?:noexcept)|(?:noexcept)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:noexcept)|(?:template)|(?:operator)|(?:decltype)|(?:typename)|(?:requires)|(?:co_await)|(?:co_yield)|(?:reflexpr)|(?:alignof)|(?:alignas)|(?:default)|(?:nullptr)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:sizeof)|(?:delete)|(?:not_eq)|(?:bitand)|(?:and_eq)|(?:xor_eq)|(?:typeid)|(?:switch)|(?:return)|(?:static)|(?:extern)|(?:inline)|(?:friend)|(?:public)|(?:ifndef)|(?:define)|(?:pragma)|(?:export)|(?:import)|(?:module)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:false)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:else)|(?:goto)|(?:case)|(?:NULL)|(?:true)|(?:elif)|(?:else)|(?:line)|(?:this)|(?:not)|(?:new)|(?:xor)|(?:and)|(?:for)|(?:try)|(?:asm)|(?:or)|(?:do)|(?:if)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)?(?![\\w<:.]))",
+					"match": "(?<=protected|virtual|private|public|,|:)(?:(?:\\s)+)?(?!(?:(?:(?:protected)|(?:private)|(?:public))|virtual))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)?(?![\\w<:.]))",
 					"captures": {
 						"1": {
 							"name": "meta.qualified_type.cpp",
@@ -6587,7 +5570,7 @@
 						"4": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -6596,16 +5579,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -6621,7 +5595,7 @@
 						"6": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -6630,16 +5604,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -6678,7 +5643,7 @@
 						"11": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -6687,16 +5652,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -6708,7 +5664,7 @@
 			]
 		},
 		"inline_builtin_storage_type": {
-			"match": "(?:\\s)*+(?<!\\w)(?:(?:(?:((?:(?:unsigned)|(?:wchar_t)|(?:signed)|(?:double)|(?:short)|(?:float)|(?:auto)|(?:void)|(?:char)|(?:long)|(?:bool)|(?:int)))|((?:(?:uint_least16_t)|(?:uint_least32_t)|(?:uint_least64_t)|(?:int_least16_t)|(?:int_least32_t)|(?:int_least64_t)|(?:uint_least8_t)|(?:uint_fast16_t)|(?:uint_fast32_t)|(?:uint_fast64_t)|(?:int_least8_t)|(?:int_fast16_t)|(?:int_fast32_t)|(?:int_fast64_t)|(?:uint_fast8_t)|(?:suseconds_t)|(?:int_fast8_t)|(?:useconds_t)|(?:blksize_t)|(?:in_addr_t)|(?:in_port_t)|(?:uintptr_t)|(?:uintmax_t)|(?:uintmax_t)|(?:uintmax_t)|(?:u_quad_t)|(?:blkcnt_t)|(?:uint16_t)|(?:uint32_t)|(?:uint64_t)|(?:intptr_t)|(?:intmax_t)|(?:intmax_t)|(?:u_short)|(?:qaddr_t)|(?:caddr_t)|(?:daddr_t)|(?:fixpt_t)|(?:nlink_t)|(?:segsz_t)|(?:swblk_t)|(?:clock_t)|(?:ssize_t)|(?:int16_t)|(?:int32_t)|(?:int64_t)|(?:uint8_t)|(?:u_char)|(?:u_long)|(?:ushort)|(?:quad_t)|(?:mode_t)|(?:size_t)|(?:time_t)|(?:int8_t)|(?:u_int)|(?:div_t)|(?:dev_t)|(?:gid_t)|(?:ino_t)|(?:key_t)|(?:pid_t)|(?:off_t)|(?:uid_t)|(?:uint)|(?:id_t)|(?:id_t))))|((?:(?:pthread_rwlockattr_t)|(?:pthread_mutexattr_t)|(?:pthread_condattr_t)|(?:pthread_rwlock_t)|(?:pthread_mutex_t)|(?:pthread_attr_t)|(?:pthread_cond_t)|(?:pthread_once_t)|(?:pthread_key_t)|(?:pthread_t))))|([a-zA-Z_](?:\\w)*_t))(?!\\w)",
+			"match": "(?:\\s)*+(?<!\\w)(?:(?:(?:((?:(?:unsigned)|(?:wchar_t)|(?:double)|(?:signed)|(?:short)|(?:float)|(?:auto)|(?:void)|(?:long)|(?:char)|(?:bool)|(?:int)))|((?:(?:uint_least32_t)|(?:uint_least64_t)|(?:uint_least16_t)|(?:uint_fast64_t)|(?:uint_least8_t)|(?:int_least64_t)|(?:int_least32_t)|(?:int_least16_t)|(?:uint_fast16_t)|(?:uint_fast32_t)|(?:int_least8_t)|(?:int_fast16_t)|(?:int_fast32_t)|(?:int_fast64_t)|(?:uint_fast8_t)|(?:int_fast8_t)|(?:suseconds_t)|(?:useconds_t)|(?:uintmax_t)|(?:uintmax_t)|(?:in_port_t)|(?:uintmax_t)|(?:in_addr_t)|(?:blksize_t)|(?:uintptr_t)|(?:intmax_t)|(?:intptr_t)|(?:blkcnt_t)|(?:intmax_t)|(?:u_quad_t)|(?:uint16_t)|(?:uint32_t)|(?:uint64_t)|(?:ssize_t)|(?:fixpt_t)|(?:qaddr_t)|(?:u_short)|(?:int16_t)|(?:int32_t)|(?:int64_t)|(?:uint8_t)|(?:daddr_t)|(?:caddr_t)|(?:swblk_t)|(?:clock_t)|(?:segsz_t)|(?:nlink_t)|(?:time_t)|(?:u_long)|(?:ushort)|(?:quad_t)|(?:mode_t)|(?:size_t)|(?:u_char)|(?:int8_t)|(?:u_int)|(?:uid_t)|(?:off_t)|(?:pid_t)|(?:gid_t)|(?:dev_t)|(?:div_t)|(?:key_t)|(?:ino_t)|(?:id_t)|(?:id_t)|(?:uint))))|((?:(?:pthread_rwlockattr_t)|(?:pthread_mutexattr_t)|(?:pthread_condattr_t)|(?:pthread_rwlock_t)|(?:pthread_mutex_t)|(?:pthread_cond_t)|(?:pthread_attr_t)|(?:pthread_once_t)|(?:pthread_key_t)|(?:pthread_t))))|([a-zA-Z_](?:\\w)*_t))(?!\\w)",
 			"captures": {
 				"1": {
 					"name": "storage.type.primitive.cpp storage.type.built-in.primitive.cpp"
@@ -6725,7 +5681,7 @@
 			}
 		},
 		"inline_comment": {
-			"match": "(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/))",
+			"match": "(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))",
 			"captures": {
 				"1": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -6734,16 +5690,7 @@
 					"name": "comment.block.cpp"
 				},
 				"3": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				}
 			}
 		},
@@ -6752,7 +5699,7 @@
 			"name": "invalid.illegal.unexpected.punctuation.definition.comment.end.cpp"
 		},
 		"label": {
-			"match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\b(?<!case|default)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(:)",
+			"match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\b(?<!case|default)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(:)",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -6764,7 +5711,7 @@
 				"2": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -6773,16 +5720,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -6801,7 +5739,7 @@
 				"5": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -6810,16 +5748,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -6831,7 +5760,7 @@
 			}
 		},
 		"lambdas": {
-			"begin": "(?:(?<=[^\\s]|^)(?<![\\w\\]\\)\\[\\*&\">])|(?<=\\Wreturn|^return))(?:(?:\\s)+)?(\\[(?!\\[| *+\"| *+\\d))((?:[^\\[\\]]|((?<!\\[)\\[(?!\\[)(?:[^\\[\\]]*+\\g<3>?)++\\]))*+)(\\](?!((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))[\\[\\];]))",
+			"begin": "(?:(?<=[^\\s]|^)(?<![\\w\\]\\)\\[\\*&\">])|(?<=\\Wreturn|^return))(?:(?:\\s)+)?(\\[(?!\\[| *+\"| *+\\d))((?:[^\\[\\]]|((?<!\\[)\\[(?!\\[)(?:[^\\[\\]]*+\\g<3>?)++\\]))*+)(\\](?!((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))[\\[\\];]))",
 			"end": "(?<=[;}])|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"1": {
@@ -6844,7 +5773,7 @@
 							"include": "#the_this_keyword"
 						},
 						{
-							"match": "((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?=\\]|\\z|$)|(,))|(\\=))",
+							"match": "((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?=\\]|\\z|$)|(,))|(\\=))",
 							"captures": {
 								"1": {
 									"name": "variable.parameter.capture.cpp"
@@ -6863,16 +5792,7 @@
 									"name": "comment.block.cpp"
 								},
 								"5": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								},
 								"6": {
 									"name": "punctuation.separator.delimiter.comma.cpp"
@@ -6905,16 +5825,7 @@
 					"name": "comment.block.cpp"
 				},
 				"8": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				}
 			},
 			"endCaptures": {},
@@ -6944,15 +5855,23 @@
 					"name": "storage.modifier.lambda.$0.cpp"
 				},
 				{
-					"match": "(->)((?:.+?(?=\\{|$))?)",
-					"captures": {
-						"1": {
+					"begin": "->",
+					"end": "(?=\\{)|(?=\\\\end\\{(?:minted|cppcode)\\})",
+					"beginCaptures": {
+						"0": {
 							"name": "punctuation.definition.lambda.return-type.cpp"
+						}
+					},
+					"endCaptures": {},
+					"patterns": [
+						{
+							"include": "#comments"
 						},
-						"2": {
+						{
+							"match": "\\S+",
 							"name": "storage.type.return-type.lambda.cpp"
 						}
-					}
+					]
 				},
 				{
 					"begin": "\\{",
@@ -6981,7 +5900,7 @@
 			"name": "constant.language.$0.cpp"
 		},
 		"line": {
-			"begin": "^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?line\\b",
+			"begin": "^((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?line\\b",
 			"end": "(?<!\\\\)(?:(?=\\n)|(?<=^\\n|[^\\\\]\\n)(?=$))|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"0": {
@@ -7001,16 +5920,7 @@
 					"name": "comment.block.cpp"
 				},
 				"4": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"5": {
 					"name": "punctuation.definition.directive.cpp"
@@ -7051,7 +5961,7 @@
 			"name": "constant.character.escape.line-continuation.cpp"
 		},
 		"macro": {
-			"begin": "(^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?define\\b)(?:(?:\\s)+)?((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
+			"begin": "(^((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?define\\b)(?:(?:\\s)+)?((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
 			"end": "(?<!\\\\)(?:(?=\\n)|(?<=^\\n|[^\\\\]\\n)(?=$))|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"1": {
@@ -7071,16 +5981,7 @@
 					"name": "comment.block.cpp"
 				},
 				"5": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"6": {
 					"name": "punctuation.definition.directive.cpp"
@@ -7148,7 +6049,7 @@
 			"name": "entity.name.function.preprocessor.cpp"
 		},
 		"member_access": {
-			"match": "(?:((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))(?:(?:\\s)+)?))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:(?:\\s)+)?(?:(?:\\.\\*|\\.)|(?:->\\*|->))(?:(?:\\s)+)?)*)(?:(?:\\s)+)?(\\b(?!uint_least16_t[^\\w]|uint_least32_t[^\\w]|uint_least64_t[^\\w]|int_least16_t[^\\w]|int_least32_t[^\\w]|int_least64_t[^\\w]|uint_least8_t[^\\w]|uint_fast16_t[^\\w]|uint_fast32_t[^\\w]|uint_fast64_t[^\\w]|int_least8_t[^\\w]|int_fast16_t[^\\w]|int_fast32_t[^\\w]|int_fast64_t[^\\w]|uint_fast8_t[^\\w]|suseconds_t[^\\w]|int_fast8_t[^\\w]|useconds_t[^\\w]|blksize_t[^\\w]|in_addr_t[^\\w]|in_port_t[^\\w]|uintptr_t[^\\w]|uintmax_t[^\\w]|uintmax_t[^\\w]|uintmax_t[^\\w]|unsigned[^\\w]|u_quad_t[^\\w]|blkcnt_t[^\\w]|uint16_t[^\\w]|uint32_t[^\\w]|uint64_t[^\\w]|intptr_t[^\\w]|intmax_t[^\\w]|intmax_t[^\\w]|wchar_t[^\\w]|u_short[^\\w]|qaddr_t[^\\w]|caddr_t[^\\w]|daddr_t[^\\w]|fixpt_t[^\\w]|nlink_t[^\\w]|segsz_t[^\\w]|swblk_t[^\\w]|clock_t[^\\w]|ssize_t[^\\w]|int16_t[^\\w]|int32_t[^\\w]|int64_t[^\\w]|uint8_t[^\\w]|signed[^\\w]|double[^\\w]|u_char[^\\w]|u_long[^\\w]|ushort[^\\w]|quad_t[^\\w]|mode_t[^\\w]|size_t[^\\w]|time_t[^\\w]|int8_t[^\\w]|short[^\\w]|float[^\\w]|u_int[^\\w]|div_t[^\\w]|dev_t[^\\w]|gid_t[^\\w]|ino_t[^\\w]|key_t[^\\w]|pid_t[^\\w]|off_t[^\\w]|uid_t[^\\w]|auto[^\\w]|void[^\\w]|char[^\\w]|long[^\\w]|bool[^\\w]|uint[^\\w]|id_t[^\\w]|id_t[^\\w]|int[^\\w])(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b(?!\\())",
+			"match": "(?:((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))(?:(?:\\s)+)?))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:(?:\\s)+)?(?:(?:\\.\\*|\\.)|(?:->\\*|->))(?:(?:\\s)+)?)*)(?:(?:\\s)+)?(\\b(?!uint_least32_t[^\\w]|uint_least16_t[^\\w]|uint_least64_t[^\\w]|int_least32_t[^\\w]|int_least64_t[^\\w]|uint_fast32_t[^\\w]|uint_fast64_t[^\\w]|uint_least8_t[^\\w]|uint_fast16_t[^\\w]|int_least16_t[^\\w]|int_fast16_t[^\\w]|int_least8_t[^\\w]|uint_fast8_t[^\\w]|int_fast64_t[^\\w]|int_fast32_t[^\\w]|int_fast8_t[^\\w]|suseconds_t[^\\w]|useconds_t[^\\w]|in_addr_t[^\\w]|uintmax_t[^\\w]|uintmax_t[^\\w]|uintmax_t[^\\w]|in_port_t[^\\w]|uintptr_t[^\\w]|blksize_t[^\\w]|uint32_t[^\\w]|uint64_t[^\\w]|u_quad_t[^\\w]|intmax_t[^\\w]|intmax_t[^\\w]|unsigned[^\\w]|blkcnt_t[^\\w]|uint16_t[^\\w]|intptr_t[^\\w]|swblk_t[^\\w]|wchar_t[^\\w]|u_short[^\\w]|qaddr_t[^\\w]|caddr_t[^\\w]|daddr_t[^\\w]|fixpt_t[^\\w]|nlink_t[^\\w]|segsz_t[^\\w]|clock_t[^\\w]|ssize_t[^\\w]|int16_t[^\\w]|int32_t[^\\w]|int64_t[^\\w]|uint8_t[^\\w]|int8_t[^\\w]|mode_t[^\\w]|quad_t[^\\w]|ushort[^\\w]|u_long[^\\w]|u_char[^\\w]|double[^\\w]|signed[^\\w]|time_t[^\\w]|size_t[^\\w]|key_t[^\\w]|div_t[^\\w]|ino_t[^\\w]|uid_t[^\\w]|gid_t[^\\w]|off_t[^\\w]|pid_t[^\\w]|float[^\\w]|dev_t[^\\w]|u_int[^\\w]|short[^\\w]|bool[^\\w]|id_t[^\\w]|uint[^\\w]|long[^\\w]|char[^\\w]|void[^\\w]|auto[^\\w]|id_t[^\\w]|int[^\\w])(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b(?!\\())",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -7160,7 +6061,7 @@
 				"2": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -7169,16 +6070,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -7199,7 +6091,7 @@
 				"7": {
 					"patterns": [
 						{
-							"match": "(?<=(?:\\.\\*|\\.|->|->\\*))(?:(?:\\s)+)?(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))(?:(?:\\s)+)?))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
+							"match": "(?<=(?:\\.\\*|\\.|->|->\\*))(?:(?:\\s)+)?(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))(?:(?:\\s)+)?))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -7215,16 +6107,7 @@
 									"name": "comment.block.cpp"
 								},
 								"4": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								},
 								"5": {
 									"name": "variable.language.this.cpp"
@@ -7241,7 +6124,7 @@
 							}
 						},
 						{
-							"match": "(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))(?:(?:\\s)+)?))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
+							"match": "(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))(?:(?:\\s)+)?))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -7257,16 +6140,7 @@
 									"name": "comment.block.cpp"
 								},
 								"4": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								},
 								"5": {
 									"name": "variable.language.this.cpp"
@@ -7296,7 +6170,7 @@
 			}
 		},
 		"memory_operators": {
-			"match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(delete)(?:(?:\\s)+)?(\\[\\])|(delete))|(new))(?!\\w))",
+			"match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:(?:(delete)(?:(?:\\s)+)?(\\[\\])|(delete))|(new))(?!\\w))",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -7308,7 +6182,7 @@
 				"2": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -7317,16 +6191,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -7350,7 +6215,7 @@
 			}
 		},
 		"method_access": {
-			"begin": "(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))(?:(?:\\s)+)?))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:(?:\\s)+)?(?:(?:\\.\\*|\\.)|(?:->\\*|->))(?:(?:\\s)+)?)*)(?:(?:\\s)+)?(~?(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)(?:(?:\\s)+)?(\\()",
+			"begin": "(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))(?:(?:\\s)+)?))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:(?:\\s)+)?(?:(?:\\.\\*|\\.)|(?:->\\*|->))(?:(?:\\s)+)?)*)(?:(?:\\s)+)?(~?(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)(?:(?:\\s)+)?(\\()",
 			"end": "\\)|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"1": {
@@ -7367,16 +6232,7 @@
 					"name": "comment.block.cpp"
 				},
 				"4": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"5": {
 					"name": "variable.language.this.cpp"
@@ -7393,7 +6249,7 @@
 				"9": {
 					"patterns": [
 						{
-							"match": "(?<=(?:\\.\\*|\\.|->|->\\*))(?:(?:\\s)+)?(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))(?:(?:\\s)+)?))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
+							"match": "(?<=(?:\\.\\*|\\.|->|->\\*))(?:(?:\\s)+)?(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))(?:(?:\\s)+)?))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -7409,16 +6265,7 @@
 									"name": "comment.block.cpp"
 								},
 								"4": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								},
 								"5": {
 									"name": "variable.language.this.cpp"
@@ -7435,7 +6282,7 @@
 							}
 						},
 						{
-							"match": "(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))(?:(?:\\s)+)?))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
+							"match": "(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))(?:(?:\\s)+)?))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -7451,16 +6298,7 @@
 									"name": "comment.block.cpp"
 								},
 								"4": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								},
 								"5": {
 									"name": "variable.language.this.cpp"
@@ -7503,7 +6341,7 @@
 			]
 		},
 		"misc_keywords": {
-			"match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:(?:constinit)|(?:requires)|(?:typedef)|(?:concept)|(?:export)|(?:module))(?!\\w))",
+			"match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:(?:constinit)|(?:requires)|(?:typedef)|(?:concept)|(?:export)|(?:module))(?!\\w))",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -7515,7 +6353,7 @@
 				"2": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -7524,16 +6362,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -7609,7 +6438,7 @@
 			]
 		},
 		"namespace_alias": {
-			"match": "(?<!\\w)(namespace)(?:\\s)+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(?:(?:\\s)+)?(\\=)(?:(?:\\s)+)?(((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<8>?)+>)(?:\\s)*+)?::)*\\s*+)(?:(?:\\s)+)?((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(?:(?:\\s)+)?(?:(;)|\\n))",
+			"match": "(?<!\\w)(namespace)(?:\\s)+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(?:(?:\\s)+)?(\\=)(?:(?:\\s)+)?(((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<8>?)+>)(?:\\s)*+)?::)*\\s*+)(?:(?:\\s)+)?((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(?:(?:\\s)+)?(?:(;)|\\n))",
 			"captures": {
 				"1": {
 					"name": "keyword.other.namespace.alias.cpp storage.type.namespace.alias.cpp"
@@ -7681,7 +6510,7 @@
 							"include": "#attributes_context"
 						},
 						{
-							"match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<4>?)+>)(?:\\s)*+)?::)*\\s*+)(?:(?:\\s)+)?((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(?:(?:\\s)+)?(?:(::)(?:(?:\\s)+)?(inline))?",
+							"match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<4>?)+>)(?:\\s)*+)?::)*\\s*+)(?:(?:\\s)+)?((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(?:(?:\\s)+)?(?:(::)(?:(?:\\s)+)?(inline))?",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -7745,7 +6574,7 @@
 			]
 		},
 		"noexcept_operator": {
-			"begin": "((?<!\\w)noexcept(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"begin": "((?<!\\w)noexcept(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(\\()",
 			"end": "\\)|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"1": {
@@ -7765,16 +6594,7 @@
 					"name": "comment.block.cpp"
 				},
 				"5": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"6": {
 					"name": "punctuation.section.arguments.begin.bracket.round.operator.noexcept.cpp"
@@ -8066,7 +6886,7 @@
 			}
 		},
 		"operator_overload": {
-			"begin": "(?:(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:__has_include)|(?:atomic_cancel)|(?:atomic_commit)|(?:dynamic_cast)|(?:thread_local)|(?:synchronized)|(?:static_cast)|(?:const_cast)|(?:co_return)|(?:constexpr)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:consteval)|(?:protected)|(?:namespace)|(?:constinit)|(?:co_return)|(?:noexcept)|(?:noexcept)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:noexcept)|(?:template)|(?:operator)|(?:decltype)|(?:typename)|(?:requires)|(?:co_await)|(?:co_yield)|(?:reflexpr)|(?:alignof)|(?:alignas)|(?:default)|(?:nullptr)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:sizeof)|(?:delete)|(?:not_eq)|(?:bitand)|(?:and_eq)|(?:xor_eq)|(?:typeid)|(?:switch)|(?:return)|(?:static)|(?:extern)|(?:inline)|(?:friend)|(?:public)|(?:ifndef)|(?:define)|(?:pragma)|(?:export)|(?:import)|(?:module)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:false)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:else)|(?:goto)|(?:case)|(?:NULL)|(?:true)|(?:elif)|(?:else)|(?:line)|(?:this)|(?:not)|(?:new)|(?:xor)|(?:and)|(?:for)|(?:try)|(?:asm)|(?:or)|(?:do)|(?:if)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)(?:\\s)*+)?::)*+)(operator)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)(?:\\s)*+)?::)*+)(?:(?:((?:(?:delete\\[\\])|(?:delete)|(?:new\\[\\])|(?:new)|(?:\\->\\*)|(?:<<=)|(?:>>=)|(?:<=>)|(?:\\+\\+)|(?:\\-\\-)|(?:\\(\\))|(?:\\[\\])|(?:\\->)|(?:\\+\\+)|(?:\\-\\-)|(?:<<)|(?:>>)|(?:<=)|(?:>=)|(?:==)|(?:!=)|(?:&&)|(?:\\|\\|)|(?:\\+=)|(?:\\-=)|(?:\\*=)|(?:\\/=)|(?:%=)|(?:&=)|(?:\\^=)|(?:\\|=)|(?:\\+)|(?:\\-)|!|~|(?:\\*)|&|(?:\\*)|(?:\\/)|%|(?:\\+)|(?:\\-)|<|>|&|(?:\\^)|(?:\\|)|=|,))|((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:\\[\\])?)))|(\"\")((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\<|\\()",
+			"begin": "(?:(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)(?:\\s)*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)?(?![\\w<:.]))(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)(?:\\s)*+)?::)*+)(operator)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)(?:\\s)*+)?::)*+)(?:(?:((?:(?:delete\\[\\])|(?:delete)|(?:new\\[\\])|(?:<=>)|(?:<<=)|(?:new)|(?:>>=)|(?:\\->\\*)|(?:\\/=)|(?:%=)|(?:&=)|(?:>=)|(?:\\|=)|(?:\\+\\+)|(?:\\-\\-)|(?:\\(\\))|(?:\\[\\])|(?:\\->)|(?:\\+\\+)|(?:<<)|(?:>>)|(?:\\-\\-)|(?:<=)|(?:\\^=)|(?:==)|(?:!=)|(?:&&)|(?:\\|\\|)|(?:\\+=)|(?:\\-=)|(?:\\*=)|,|(?:\\+)|(?:\\-)|!|~|(?:\\*)|&|(?:\\*)|(?:\\/)|%|(?:\\+)|(?:\\-)|<|>|&|(?:\\^)|(?:\\|)|=))|((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:\\[\\])?)))|(\"\")((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?=\\<|\\()",
 			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"0": {
@@ -8151,16 +6971,7 @@
 					"name": "comment.block.cpp"
 				},
 				"6": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"7": {
 					"patterns": [
@@ -8176,16 +6987,7 @@
 					"name": "comment.block.cpp"
 				},
 				"10": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"11": {
 					"patterns": [
@@ -8224,16 +7026,7 @@
 					"name": "comment.block.cpp"
 				},
 				"17": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"18": {},
 				"19": {
@@ -8243,7 +7036,7 @@
 							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -8259,16 +7052,7 @@
 									"name": "comment.block.cpp"
 								},
 								"4": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							},
 							"name": "invalid.illegal.reference-type.cpp"
@@ -8293,16 +7077,7 @@
 					"name": "comment.block.cpp"
 				},
 				"23": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"24": {
 					"patterns": [
@@ -8318,16 +7093,7 @@
 					"name": "comment.block.cpp"
 				},
 				"27": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"28": {
 					"patterns": [
@@ -8343,16 +7109,7 @@
 					"name": "comment.block.cpp"
 				},
 				"31": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"32": {
 					"patterns": [
@@ -8368,16 +7125,7 @@
 					"name": "comment.block.cpp"
 				},
 				"35": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"36": {
 					"name": "storage.type.modifier.calling-convention.cpp"
@@ -8396,16 +7144,7 @@
 					"name": "comment.block.cpp"
 				},
 				"40": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"41": {
 					"patterns": [
@@ -8421,16 +7160,7 @@
 					"name": "comment.block.cpp"
 				},
 				"44": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"45": {
 					"patterns": [
@@ -8472,16 +7202,7 @@
 					"name": "comment.block.cpp"
 				},
 				"52": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"53": {
 					"patterns": [
@@ -8519,7 +7240,7 @@
 							"name": "entity.name.operator.type.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -8535,16 +7256,7 @@
 									"name": "comment.block.cpp"
 								},
 								"4": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							},
 							"name": "invalid.illegal.reference-type.cpp"
@@ -8569,16 +7281,7 @@
 					"name": "comment.block.cpp"
 				},
 				"62": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"63": {
 					"patterns": [
@@ -8594,16 +7297,7 @@
 					"name": "comment.block.cpp"
 				},
 				"66": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"67": {
 					"patterns": [
@@ -8619,16 +7313,7 @@
 					"name": "comment.block.cpp"
 				},
 				"70": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"71": {
 					"name": "entity.name.operator.type.array.cpp"
@@ -8650,16 +7335,7 @@
 					"name": "comment.block.cpp"
 				},
 				"76": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"77": {
 					"name": "entity.name.operator.custom-literal.cpp"
@@ -8678,16 +7354,7 @@
 					"name": "comment.block.cpp"
 				},
 				"81": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				}
 			},
 			"endCaptures": {},
@@ -8736,6 +7403,36 @@
 						{
 							"include": "#qualifiers_and_specifiers_post_parameters"
 						},
+						{
+							"match": "(\\=)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(default)|(delete))",
+							"captures": {
+								"1": {
+									"name": "keyword.operator.assignment.cpp"
+								},
+								"2": {
+									"patterns": [
+										{
+											"include": "#inline_comment"
+										}
+									]
+								},
+								"3": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"4": {
+									"name": "comment.block.cpp"
+								},
+								"5": {
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								"6": {
+									"name": "keyword.other.default.function.cpp"
+								},
+								"7": {
+									"name": "keyword.other.delete.function.cpp"
+								}
+							}
+						},
 						{
 							"include": "$self"
 						}
@@ -8774,7 +7471,7 @@
 		"operators": {
 			"patterns": [
 				{
-					"begin": "((?<!\\w)sizeof(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+					"begin": "((?<!\\w)sizeof(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(\\()",
 					"end": "\\)|(?=\\\\end\\{(?:minted|cppcode)\\})",
 					"beginCaptures": {
 						"1": {
@@ -8794,16 +7491,7 @@
 							"name": "comment.block.cpp"
 						},
 						"5": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"6": {
 							"name": "punctuation.section.arguments.begin.bracket.round.operator.sizeof.cpp"
@@ -8822,7 +7510,7 @@
 					]
 				},
 				{
-					"begin": "((?<!\\w)alignof(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+					"begin": "((?<!\\w)alignof(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(\\()",
 					"end": "\\)|(?=\\\\end\\{(?:minted|cppcode)\\})",
 					"beginCaptures": {
 						"1": {
@@ -8842,16 +7530,7 @@
 							"name": "comment.block.cpp"
 						},
 						"5": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"6": {
 							"name": "punctuation.section.arguments.begin.bracket.round.operator.alignof.cpp"
@@ -8870,7 +7549,7 @@
 					]
 				},
 				{
-					"begin": "((?<!\\w)alignas(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+					"begin": "((?<!\\w)alignas(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(\\()",
 					"end": "\\)|(?=\\\\end\\{(?:minted|cppcode)\\})",
 					"beginCaptures": {
 						"1": {
@@ -8890,16 +7569,7 @@
 							"name": "comment.block.cpp"
 						},
 						"5": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"6": {
 							"name": "punctuation.section.arguments.begin.bracket.round.operator.alignas.cpp"
@@ -8918,7 +7588,7 @@
 					]
 				},
 				{
-					"begin": "((?<!\\w)typeid(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+					"begin": "((?<!\\w)typeid(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(\\()",
 					"end": "\\)|(?=\\\\end\\{(?:minted|cppcode)\\})",
 					"beginCaptures": {
 						"1": {
@@ -8938,16 +7608,7 @@
 							"name": "comment.block.cpp"
 						},
 						"5": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"6": {
 							"name": "punctuation.section.arguments.begin.bracket.round.operator.typeid.cpp"
@@ -8966,7 +7627,7 @@
 					]
 				},
 				{
-					"begin": "((?<!\\w)noexcept(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+					"begin": "((?<!\\w)noexcept(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(\\()",
 					"end": "\\)|(?=\\\\end\\{(?:minted|cppcode)\\})",
 					"beginCaptures": {
 						"1": {
@@ -8986,16 +7647,7 @@
 							"name": "comment.block.cpp"
 						},
 						"5": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"6": {
 							"name": "punctuation.section.arguments.begin.bracket.round.operator.noexcept.cpp"
@@ -9014,7 +7666,7 @@
 					]
 				},
 				{
-					"begin": "(\\bsizeof\\.\\.\\.)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+					"begin": "(\\bsizeof\\.\\.\\.)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(\\()",
 					"end": "\\)|(?=\\\\end\\{(?:minted|cppcode)\\})",
 					"beginCaptures": {
 						"1": {
@@ -9034,16 +7686,7 @@
 							"name": "comment.block.cpp"
 						},
 						"5": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"6": {
 							"name": "punctuation.section.arguments.begin.bracket.round.operator.sizeof.variadic.cpp"
@@ -9108,7 +7751,7 @@
 		"over_qualified_types": {
 			"patterns": [
 				{
-					"match": "(\\bstruct)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)",
+					"match": "(\\bstruct)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))\\]((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)",
 					"captures": {
 						"1": {
 							"name": "storage.type.struct.parameter.cpp"
@@ -9123,7 +7766,7 @@
 						"3": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -9132,16 +7775,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -9160,7 +7794,7 @@
 						"6": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -9169,16 +7803,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -9191,7 +7816,7 @@
 									"name": "storage.modifier.pointer.cpp"
 								},
 								{
-									"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
+									"match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&",
 									"captures": {
 										"1": {
 											"patterns": [
@@ -9207,16 +7832,7 @@
 											"name": "comment.block.cpp"
 										},
 										"4": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									},
 									"name": "invalid.illegal.reference-type.cpp"
@@ -9237,7 +7853,7 @@
 						"9": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -9246,16 +7862,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -9271,7 +7878,7 @@
 						"11": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -9280,16 +7887,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -9305,7 +7903,7 @@
 						"13": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -9314,16 +7912,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -9342,7 +7931,7 @@
 						"16": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -9351,16 +7940,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -9376,7 +7956,7 @@
 						"18": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -9385,16 +7965,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -9410,7 +7981,7 @@
 						"20": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -9419,16 +7990,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -9437,7 +7999,7 @@
 					}
 				},
 				{
-					"match": "(\\benum)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)",
+					"match": "(\\benum)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))\\]((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)",
 					"captures": {
 						"1": {
 							"name": "storage.type.enum.parameter.cpp"
@@ -9452,7 +8014,7 @@
 						"3": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -9461,16 +8023,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -9489,7 +8042,7 @@
 						"6": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -9498,16 +8051,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -9520,7 +8064,7 @@
 									"name": "storage.modifier.pointer.cpp"
 								},
 								{
-									"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
+									"match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&",
 									"captures": {
 										"1": {
 											"patterns": [
@@ -9536,16 +8080,7 @@
 											"name": "comment.block.cpp"
 										},
 										"4": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									},
 									"name": "invalid.illegal.reference-type.cpp"
@@ -9566,7 +8101,7 @@
 						"9": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -9575,16 +8110,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -9600,7 +8126,7 @@
 						"11": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -9609,16 +8135,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -9634,7 +8151,7 @@
 						"13": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -9643,16 +8160,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -9671,7 +8179,7 @@
 						"16": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -9680,16 +8188,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -9705,7 +8204,7 @@
 						"18": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -9714,16 +8213,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -9739,7 +8229,7 @@
 						"20": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -9748,16 +8238,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -9766,7 +8247,7 @@
 					}
 				},
 				{
-					"match": "(\\bunion)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)",
+					"match": "(\\bunion)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))\\]((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)",
 					"captures": {
 						"1": {
 							"name": "storage.type.union.parameter.cpp"
@@ -9781,7 +8262,7 @@
 						"3": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -9790,16 +8271,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -9818,7 +8290,7 @@
 						"6": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -9827,16 +8299,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -9849,7 +8312,7 @@
 									"name": "storage.modifier.pointer.cpp"
 								},
 								{
-									"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
+									"match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&",
 									"captures": {
 										"1": {
 											"patterns": [
@@ -9865,16 +8328,7 @@
 											"name": "comment.block.cpp"
 										},
 										"4": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									},
 									"name": "invalid.illegal.reference-type.cpp"
@@ -9895,7 +8349,7 @@
 						"9": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -9904,16 +8358,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -9929,7 +8374,7 @@
 						"11": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -9938,16 +8383,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -9963,7 +8399,7 @@
 						"13": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -9972,16 +8408,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -10000,7 +8427,7 @@
 						"16": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -10009,16 +8436,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -10034,7 +8452,7 @@
 						"18": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -10043,16 +8461,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -10068,7 +8477,7 @@
 						"20": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -10077,16 +8486,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -10095,7 +8495,7 @@
 					}
 				},
 				{
-					"match": "(\\bclass)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)",
+					"match": "(\\bclass)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))\\]((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)",
 					"captures": {
 						"1": {
 							"name": "storage.type.class.parameter.cpp"
@@ -10110,7 +8510,7 @@
 						"3": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -10119,16 +8519,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -10147,7 +8538,7 @@
 						"6": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -10156,16 +8547,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -10178,7 +8560,7 @@
 									"name": "storage.modifier.pointer.cpp"
 								},
 								{
-									"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
+									"match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&",
 									"captures": {
 										"1": {
 											"patterns": [
@@ -10194,16 +8576,7 @@
 											"name": "comment.block.cpp"
 										},
 										"4": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									},
 									"name": "invalid.illegal.reference-type.cpp"
@@ -10224,7 +8597,7 @@
 						"9": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -10233,16 +8606,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -10258,7 +8622,7 @@
 						"11": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -10267,16 +8631,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -10292,7 +8647,7 @@
 						"13": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -10301,16 +8656,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -10329,7 +8675,7 @@
 						"16": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -10338,16 +8684,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -10363,7 +8700,7 @@
 						"18": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -10372,16 +8709,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -10397,7 +8725,7 @@
 						"20": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -10406,16 +8734,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -10426,7 +8745,7 @@
 			]
 		},
 		"parameter": {
-			"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\w)",
+			"begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?=\\w)",
 			"end": "(?:(?=\\))|(,))|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"1": {
@@ -10443,16 +8762,7 @@
 					"name": "comment.block.cpp"
 				},
 				"4": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				}
 			},
 			"endCaptures": {
@@ -10465,6 +8775,9 @@
 				{
 					"include": "#ever_present_context"
 				},
+				{
+					"include": "#string_context"
+				},
 				{
 					"include": "#function_pointer_parameter"
 				},
@@ -10475,7 +8788,7 @@
 					"include": "#vararg_ellipses"
 				},
 				{
-					"match": "((?:((?:(?:thread_local)|(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))+)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:\\s)*+(?<!\\w)(?:(?:(?:((?:(?:unsigned)|(?:wchar_t)|(?:signed)|(?:double)|(?:short)|(?:float)|(?:auto)|(?:void)|(?:char)|(?:long)|(?:bool)|(?:int)))|((?:(?:uint_least16_t)|(?:uint_least32_t)|(?:uint_least64_t)|(?:int_least16_t)|(?:int_least32_t)|(?:int_least64_t)|(?:uint_least8_t)|(?:uint_fast16_t)|(?:uint_fast32_t)|(?:uint_fast64_t)|(?:int_least8_t)|(?:int_fast16_t)|(?:int_fast32_t)|(?:int_fast64_t)|(?:uint_fast8_t)|(?:suseconds_t)|(?:int_fast8_t)|(?:useconds_t)|(?:blksize_t)|(?:in_addr_t)|(?:in_port_t)|(?:uintptr_t)|(?:uintmax_t)|(?:uintmax_t)|(?:uintmax_t)|(?:u_quad_t)|(?:blkcnt_t)|(?:uint16_t)|(?:uint32_t)|(?:uint64_t)|(?:intptr_t)|(?:intmax_t)|(?:intmax_t)|(?:u_short)|(?:qaddr_t)|(?:caddr_t)|(?:daddr_t)|(?:fixpt_t)|(?:nlink_t)|(?:segsz_t)|(?:swblk_t)|(?:clock_t)|(?:ssize_t)|(?:int16_t)|(?:int32_t)|(?:int64_t)|(?:uint8_t)|(?:u_char)|(?:u_long)|(?:ushort)|(?:quad_t)|(?:mode_t)|(?:size_t)|(?:time_t)|(?:int8_t)|(?:u_int)|(?:div_t)|(?:dev_t)|(?:gid_t)|(?:ino_t)|(?:key_t)|(?:pid_t)|(?:off_t)|(?:uid_t)|(?:uint)|(?:id_t)|(?:id_t))))|((?:(?:pthread_rwlockattr_t)|(?:pthread_mutexattr_t)|(?:pthread_condattr_t)|(?:pthread_rwlock_t)|(?:pthread_mutex_t)|(?:pthread_attr_t)|(?:pthread_cond_t)|(?:pthread_once_t)|(?:pthread_key_t)|(?:pthread_t))))|([a-zA-Z_](?:\\w)*_t))(?!\\w)|((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\b\\b(?<!\\Wthread_local|^thread_local|\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wstatic|^static|\\Wextern|^extern|\\Wconst|^const)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=,|\\)|=)",
+					"match": "((?:((?:(?:thread_local)|(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:\\s)*+(?<!\\w)(?:(?:(?:((?:(?:unsigned)|(?:wchar_t)|(?:double)|(?:signed)|(?:short)|(?:float)|(?:auto)|(?:void)|(?:long)|(?:char)|(?:bool)|(?:int)))|((?:(?:uint_least32_t)|(?:uint_least64_t)|(?:uint_least16_t)|(?:uint_fast64_t)|(?:uint_least8_t)|(?:int_least64_t)|(?:int_least32_t)|(?:int_least16_t)|(?:uint_fast16_t)|(?:uint_fast32_t)|(?:int_least8_t)|(?:int_fast16_t)|(?:int_fast32_t)|(?:int_fast64_t)|(?:uint_fast8_t)|(?:int_fast8_t)|(?:suseconds_t)|(?:useconds_t)|(?:uintmax_t)|(?:uintmax_t)|(?:in_port_t)|(?:uintmax_t)|(?:in_addr_t)|(?:blksize_t)|(?:uintptr_t)|(?:intmax_t)|(?:intptr_t)|(?:blkcnt_t)|(?:intmax_t)|(?:u_quad_t)|(?:uint16_t)|(?:uint32_t)|(?:uint64_t)|(?:ssize_t)|(?:fixpt_t)|(?:qaddr_t)|(?:u_short)|(?:int16_t)|(?:int32_t)|(?:int64_t)|(?:uint8_t)|(?:daddr_t)|(?:caddr_t)|(?:swblk_t)|(?:clock_t)|(?:segsz_t)|(?:nlink_t)|(?:time_t)|(?:u_long)|(?:ushort)|(?:quad_t)|(?:mode_t)|(?:size_t)|(?:u_char)|(?:int8_t)|(?:u_int)|(?:uid_t)|(?:off_t)|(?:pid_t)|(?:gid_t)|(?:dev_t)|(?:div_t)|(?:key_t)|(?:ino_t)|(?:id_t)|(?:id_t)|(?:uint))))|((?:(?:pthread_rwlockattr_t)|(?:pthread_mutexattr_t)|(?:pthread_condattr_t)|(?:pthread_rwlock_t)|(?:pthread_mutex_t)|(?:pthread_cond_t)|(?:pthread_attr_t)|(?:pthread_once_t)|(?:pthread_key_t)|(?:pthread_t))))|([a-zA-Z_](?:\\w)*_t))(?!\\w)|((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\b\\b(?<!\\Wthread_local|^thread_local|\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wstatic|^static|\\Wextern|^extern|\\Wconst|^const)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?=,|\\)|=)",
 					"captures": {
 						"1": {
 							"patterns": [
@@ -10501,16 +8814,7 @@
 							"name": "comment.block.cpp"
 						},
 						"6": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"7": {
 							"patterns": [
@@ -10526,16 +8830,7 @@
 							"name": "comment.block.cpp"
 						},
 						"10": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"11": {
 							"name": "storage.type.primitive.cpp storage.type.built-in.primitive.cpp"
@@ -10566,16 +8861,7 @@
 							"name": "comment.block.cpp"
 						},
 						"19": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						}
 					}
 				},
@@ -10609,7 +8895,7 @@
 					"name": "keyword.operator.assignment.cpp"
 				},
 				{
-					"match": "(?<!\\s|\\(|,|:)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\)|,|\\[|=|\\n)",
+					"match": "(?<!\\s|\\(|,|:)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?=\\)|,|\\[|=|\\n)",
 					"captures": {
 						"1": {
 							"patterns": [
@@ -10625,16 +8911,7 @@
 							"name": "comment.block.cpp"
 						},
 						"4": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"5": {
 							"name": "variable.parameter.cpp"
@@ -10653,16 +8930,7 @@
 							"name": "comment.block.cpp"
 						},
 						"9": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						}
 					}
 				},
@@ -10697,7 +8965,7 @@
 					"include": "#template_call_range"
 				},
 				{
-					"match": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*))",
+					"match": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*))",
 					"captures": {
 						"0": {
 							"patterns": [
@@ -10706,7 +8974,7 @@
 									"name": "storage.modifier.pointer.cpp"
 								},
 								{
-									"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
+									"match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&",
 									"captures": {
 										"1": {
 											"patterns": [
@@ -10722,16 +8990,7 @@
 											"name": "comment.block.cpp"
 										},
 										"4": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									},
 									"name": "invalid.illegal.reference-type.cpp"
@@ -10756,16 +9015,7 @@
 							"name": "comment.block.cpp"
 						},
 						"4": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"5": {
 							"patterns": [
@@ -10781,23 +9031,14 @@
 							"name": "comment.block.cpp"
 						},
 						"8": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						}
 					}
 				}
 			]
 		},
 		"parameter_class": {
-			"match": "(\\bclass)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)",
+			"match": "(\\bclass)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))\\]((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)",
 			"captures": {
 				"1": {
 					"name": "storage.type.class.parameter.cpp"
@@ -10812,7 +9053,7 @@
 				"3": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -10821,16 +9062,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -10849,7 +9081,7 @@
 				"6": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -10858,16 +9090,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -10880,7 +9103,7 @@
 							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -10896,16 +9119,7 @@
 									"name": "comment.block.cpp"
 								},
 								"4": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							},
 							"name": "invalid.illegal.reference-type.cpp"
@@ -10926,7 +9140,7 @@
 				"9": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -10935,16 +9149,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -10960,7 +9165,7 @@
 				"11": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -10969,16 +9174,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -10994,7 +9190,7 @@
 				"13": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -11003,16 +9199,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -11031,7 +9218,7 @@
 				"16": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -11040,16 +9227,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -11065,7 +9243,7 @@
 				"18": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -11074,16 +9252,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -11099,7 +9268,7 @@
 				"20": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -11108,16 +9277,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -11126,7 +9286,7 @@
 			}
 		},
 		"parameter_enum": {
-			"match": "(\\benum)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)",
+			"match": "(\\benum)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))\\]((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)",
 			"captures": {
 				"1": {
 					"name": "storage.type.enum.parameter.cpp"
@@ -11141,7 +9301,7 @@
 				"3": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -11150,16 +9310,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -11178,7 +9329,7 @@
 				"6": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -11187,16 +9338,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -11209,7 +9351,7 @@
 							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -11225,16 +9367,7 @@
 									"name": "comment.block.cpp"
 								},
 								"4": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							},
 							"name": "invalid.illegal.reference-type.cpp"
@@ -11255,7 +9388,7 @@
 				"9": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -11264,16 +9397,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -11289,7 +9413,7 @@
 				"11": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -11298,16 +9422,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -11323,7 +9438,7 @@
 				"13": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -11332,16 +9447,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -11360,7 +9466,7 @@
 				"16": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -11369,16 +9475,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -11394,7 +9491,7 @@
 				"18": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -11403,16 +9500,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -11428,7 +9516,7 @@
 				"20": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -11437,16 +9525,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -11455,7 +9534,7 @@
 			}
 		},
 		"parameter_or_maybe_value": {
-			"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\w)",
+			"begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?=\\w)",
 			"end": "(?:(?=\\))|(,))|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"1": {
@@ -11472,16 +9551,7 @@
 					"name": "comment.block.cpp"
 				},
 				"4": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				}
 			},
 			"endCaptures": {
@@ -11513,7 +9583,7 @@
 					"include": "#vararg_ellipses"
 				},
 				{
-					"match": "((?:((?:(?:thread_local)|(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))+)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:\\s)*+(?<!\\w)(?:(?:(?:((?:(?:unsigned)|(?:wchar_t)|(?:signed)|(?:double)|(?:short)|(?:float)|(?:auto)|(?:void)|(?:char)|(?:long)|(?:bool)|(?:int)))|((?:(?:uint_least16_t)|(?:uint_least32_t)|(?:uint_least64_t)|(?:int_least16_t)|(?:int_least32_t)|(?:int_least64_t)|(?:uint_least8_t)|(?:uint_fast16_t)|(?:uint_fast32_t)|(?:uint_fast64_t)|(?:int_least8_t)|(?:int_fast16_t)|(?:int_fast32_t)|(?:int_fast64_t)|(?:uint_fast8_t)|(?:suseconds_t)|(?:int_fast8_t)|(?:useconds_t)|(?:blksize_t)|(?:in_addr_t)|(?:in_port_t)|(?:uintptr_t)|(?:uintmax_t)|(?:uintmax_t)|(?:uintmax_t)|(?:u_quad_t)|(?:blkcnt_t)|(?:uint16_t)|(?:uint32_t)|(?:uint64_t)|(?:intptr_t)|(?:intmax_t)|(?:intmax_t)|(?:u_short)|(?:qaddr_t)|(?:caddr_t)|(?:daddr_t)|(?:fixpt_t)|(?:nlink_t)|(?:segsz_t)|(?:swblk_t)|(?:clock_t)|(?:ssize_t)|(?:int16_t)|(?:int32_t)|(?:int64_t)|(?:uint8_t)|(?:u_char)|(?:u_long)|(?:ushort)|(?:quad_t)|(?:mode_t)|(?:size_t)|(?:time_t)|(?:int8_t)|(?:u_int)|(?:div_t)|(?:dev_t)|(?:gid_t)|(?:ino_t)|(?:key_t)|(?:pid_t)|(?:off_t)|(?:uid_t)|(?:uint)|(?:id_t)|(?:id_t))))|((?:(?:pthread_rwlockattr_t)|(?:pthread_mutexattr_t)|(?:pthread_condattr_t)|(?:pthread_rwlock_t)|(?:pthread_mutex_t)|(?:pthread_attr_t)|(?:pthread_cond_t)|(?:pthread_once_t)|(?:pthread_key_t)|(?:pthread_t))))|([a-zA-Z_](?:\\w)*_t))(?!\\w)|((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\b\\b(?<!\\Wthread_local|^thread_local|\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wstatic|^static|\\Wextern|^extern|\\Wconst|^const)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=,|\\)|=)",
+					"match": "((?:((?:(?:thread_local)|(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:\\s)*+(?<!\\w)(?:(?:(?:((?:(?:unsigned)|(?:wchar_t)|(?:double)|(?:signed)|(?:short)|(?:float)|(?:auto)|(?:void)|(?:long)|(?:char)|(?:bool)|(?:int)))|((?:(?:uint_least32_t)|(?:uint_least64_t)|(?:uint_least16_t)|(?:uint_fast64_t)|(?:uint_least8_t)|(?:int_least64_t)|(?:int_least32_t)|(?:int_least16_t)|(?:uint_fast16_t)|(?:uint_fast32_t)|(?:int_least8_t)|(?:int_fast16_t)|(?:int_fast32_t)|(?:int_fast64_t)|(?:uint_fast8_t)|(?:int_fast8_t)|(?:suseconds_t)|(?:useconds_t)|(?:uintmax_t)|(?:uintmax_t)|(?:in_port_t)|(?:uintmax_t)|(?:in_addr_t)|(?:blksize_t)|(?:uintptr_t)|(?:intmax_t)|(?:intptr_t)|(?:blkcnt_t)|(?:intmax_t)|(?:u_quad_t)|(?:uint16_t)|(?:uint32_t)|(?:uint64_t)|(?:ssize_t)|(?:fixpt_t)|(?:qaddr_t)|(?:u_short)|(?:int16_t)|(?:int32_t)|(?:int64_t)|(?:uint8_t)|(?:daddr_t)|(?:caddr_t)|(?:swblk_t)|(?:clock_t)|(?:segsz_t)|(?:nlink_t)|(?:time_t)|(?:u_long)|(?:ushort)|(?:quad_t)|(?:mode_t)|(?:size_t)|(?:u_char)|(?:int8_t)|(?:u_int)|(?:uid_t)|(?:off_t)|(?:pid_t)|(?:gid_t)|(?:dev_t)|(?:div_t)|(?:key_t)|(?:ino_t)|(?:id_t)|(?:id_t)|(?:uint))))|((?:(?:pthread_rwlockattr_t)|(?:pthread_mutexattr_t)|(?:pthread_condattr_t)|(?:pthread_rwlock_t)|(?:pthread_mutex_t)|(?:pthread_cond_t)|(?:pthread_attr_t)|(?:pthread_once_t)|(?:pthread_key_t)|(?:pthread_t))))|([a-zA-Z_](?:\\w)*_t))(?!\\w)|((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\b\\b(?<!\\Wthread_local|^thread_local|\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wstatic|^static|\\Wextern|^extern|\\Wconst|^const)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?=,|\\)|=)",
 					"captures": {
 						"1": {
 							"patterns": [
@@ -11539,16 +9609,7 @@
 							"name": "comment.block.cpp"
 						},
 						"6": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"7": {
 							"patterns": [
@@ -11564,16 +9625,7 @@
 							"name": "comment.block.cpp"
 						},
 						"10": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"11": {
 							"name": "storage.type.primitive.cpp storage.type.built-in.primitive.cpp"
@@ -11604,16 +9656,7 @@
 							"name": "comment.block.cpp"
 						},
 						"19": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						}
 					}
 				},
@@ -11646,7 +9689,7 @@
 					]
 				},
 				{
-					"match": "(?<!\\s|\\(|,|:)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=(?:\\)|,|\\[|=|\\/\\/|(?:(?:\\n)|$)))",
+					"match": "(?<!\\s|\\(|,|:)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?=(?:\\)|,|\\[|=|\\/\\/|(?:(?:\\n)|$)))",
 					"captures": {
 						"1": {
 							"patterns": [
@@ -11662,16 +9705,7 @@
 							"name": "comment.block.cpp"
 						},
 						"4": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"5": {
 							"name": "variable.parameter.cpp"
@@ -11690,16 +9724,7 @@
 							"name": "comment.block.cpp"
 						},
 						"9": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						}
 					}
 				},
@@ -11734,7 +9759,7 @@
 					"include": "#template_call_range"
 				},
 				{
-					"match": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*))",
+					"match": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*))",
 					"captures": {
 						"0": {
 							"patterns": [
@@ -11743,7 +9768,7 @@
 									"name": "storage.modifier.pointer.cpp"
 								},
 								{
-									"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
+									"match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&",
 									"captures": {
 										"1": {
 											"patterns": [
@@ -11759,16 +9784,7 @@
 											"name": "comment.block.cpp"
 										},
 										"4": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									},
 									"name": "invalid.illegal.reference-type.cpp"
@@ -11793,16 +9809,7 @@
 							"name": "comment.block.cpp"
 						},
 						"4": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"5": {
 							"patterns": [
@@ -11818,16 +9825,7 @@
 							"name": "comment.block.cpp"
 						},
 						"8": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						}
 					}
 				},
@@ -11837,7 +9835,7 @@
 			]
 		},
 		"parameter_struct": {
-			"match": "(\\bstruct)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)",
+			"match": "(\\bstruct)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))\\]((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)",
 			"captures": {
 				"1": {
 					"name": "storage.type.struct.parameter.cpp"
@@ -11852,7 +9850,7 @@
 				"3": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -11861,16 +9859,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -11889,7 +9878,7 @@
 				"6": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -11898,16 +9887,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -11920,7 +9900,7 @@
 							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -11936,16 +9916,7 @@
 									"name": "comment.block.cpp"
 								},
 								"4": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							},
 							"name": "invalid.illegal.reference-type.cpp"
@@ -11966,7 +9937,7 @@
 				"9": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -11975,16 +9946,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -12000,7 +9962,7 @@
 				"11": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -12009,16 +9971,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -12034,7 +9987,7 @@
 				"13": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -12043,16 +9996,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -12071,7 +10015,7 @@
 				"16": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -12080,16 +10024,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -12105,7 +10040,7 @@
 				"18": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -12114,16 +10049,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -12139,7 +10065,7 @@
 				"20": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -12148,16 +10074,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -12166,7 +10083,7 @@
 			}
 		},
 		"parameter_union": {
-			"match": "(\\bunion)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)",
+			"match": "(\\bunion)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))\\]((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)",
 			"captures": {
 				"1": {
 					"name": "storage.type.union.parameter.cpp"
@@ -12181,7 +10098,7 @@
 				"3": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -12190,16 +10107,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -12218,7 +10126,7 @@
 				"6": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -12227,16 +10135,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -12249,7 +10148,7 @@
 							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -12265,16 +10164,7 @@
 									"name": "comment.block.cpp"
 								},
 								"4": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							},
 							"name": "invalid.illegal.reference-type.cpp"
@@ -12295,7 +10185,7 @@
 				"9": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -12304,16 +10194,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -12329,7 +10210,7 @@
 				"11": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -12338,16 +10219,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -12363,7 +10235,7 @@
 				"13": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -12372,16 +10244,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -12400,7 +10263,7 @@
 				"16": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -12409,16 +10272,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -12434,7 +10288,7 @@
 				"18": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -12443,16 +10297,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -12468,7 +10313,7 @@
 				"20": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -12477,16 +10322,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -12522,7 +10358,7 @@
 			]
 		},
 		"pragma": {
-			"begin": "^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?pragma\\b",
+			"begin": "^((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?pragma\\b",
 			"end": "(?<!\\\\)(?:(?=\\n)|(?<=^\\n|[^\\\\]\\n)(?=$))|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"0": {
@@ -12542,16 +10378,7 @@
 					"name": "comment.block.cpp"
 				},
 				"4": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"5": {
 					"name": "punctuation.definition.directive.cpp"
@@ -12579,7 +10406,7 @@
 			]
 		},
 		"pragma_mark": {
-			"match": "(^((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?pragma(?:\\s)+mark)(?:\\s)+(.*)",
+			"match": "(^((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?pragma(?:\\s)+mark)(?:\\s)+(.*)",
 			"captures": {
 				"1": {
 					"name": "keyword.control.directive.pragma.pragma-mark.cpp"
@@ -12594,7 +10421,7 @@
 				"3": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -12603,16 +10430,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -12712,7 +10530,7 @@
 			"name": "meta.parens.preprocessor.conditional.cpp"
 		},
 		"preprocessor_conditional_range": {
-			"begin": "^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?((?:(?:ifndef|ifdef)|if))",
+			"begin": "^((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?((?:(?:ifndef|ifdef)|if))",
 			"end": "^(?!\\s*+#\\s*(?:else|endif))|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"0": {
@@ -12732,16 +10550,7 @@
 					"name": "comment.block.cpp"
 				},
 				"4": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"5": {
 					"name": "punctuation.definition.directive.cpp"
@@ -12768,7 +10577,7 @@
 			]
 		},
 		"preprocessor_conditional_standalone": {
-			"match": "^((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?((?<!\\w)(?:endif|else|elif)(?!\\w))",
+			"match": "^((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?((?<!\\w)(?:endif|else|elif)(?!\\w))",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -12780,7 +10589,7 @@
 				"2": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -12789,16 +10598,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -12848,7 +10648,7 @@
 			]
 		},
 		"qualified_type": {
-			"match": "\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:__has_include)|(?:atomic_cancel)|(?:atomic_commit)|(?:dynamic_cast)|(?:thread_local)|(?:synchronized)|(?:static_cast)|(?:const_cast)|(?:co_return)|(?:constexpr)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:consteval)|(?:protected)|(?:namespace)|(?:constinit)|(?:co_return)|(?:noexcept)|(?:noexcept)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:noexcept)|(?:template)|(?:operator)|(?:decltype)|(?:typename)|(?:requires)|(?:co_await)|(?:co_yield)|(?:reflexpr)|(?:alignof)|(?:alignas)|(?:default)|(?:nullptr)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:sizeof)|(?:delete)|(?:not_eq)|(?:bitand)|(?:and_eq)|(?:xor_eq)|(?:typeid)|(?:switch)|(?:return)|(?:static)|(?:extern)|(?:inline)|(?:friend)|(?:public)|(?:ifndef)|(?:define)|(?:pragma)|(?:export)|(?:import)|(?:module)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:false)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:else)|(?:goto)|(?:case)|(?:NULL)|(?:true)|(?:elif)|(?:else)|(?:line)|(?:this)|(?:not)|(?:new)|(?:xor)|(?:and)|(?:for)|(?:try)|(?:asm)|(?:or)|(?:do)|(?:if)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)?(?![\\w<:.])",
+			"match": "\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)(?:\\s)*+)?::)*+)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)?(?![\\w<:.])",
 			"captures": {
 				"0": {
 					"patterns": [
@@ -12924,7 +10724,7 @@
 				"3": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -12933,16 +10733,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -12958,7 +10749,7 @@
 				"5": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -12967,16 +10758,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -13014,7 +10796,7 @@
 				"10": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -13023,16 +10805,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -13042,74 +10815,31 @@
 			"name": "meta.qualified_type.cpp"
 		},
 		"qualifiers_and_specifiers_post_parameters": {
-			"match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?<!\\w)(?:(?:override)|(?:volatile)|(?:noexcept)|(?:final)|(?:const))(?!\\w))+(?=\\s*(?:(?:\\{|;)|[\\n\\r])))",
+			"match": "((?:(?:(?:(?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))(?<!\\w)(?:(?:override)|(?:volatile)|(?:noexcept)|(?:final)|(?:const))(?!\\w))+)(?=\\s*(?:(?:\\{)|;|(?:\\n)|(?:\\r)|=))",
 			"captures": {
 				"1": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"2": {
-					"patterns": [
-						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:(?:override)|(?:volatile)|(?:noexcept)|(?:final)|(?:const))(?!\\w))",
 							"captures": {
 								"1": {
-									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-								},
-								"2": {
-									"name": "comment.block.cpp"
-								},
-								"3": {
 									"patterns": [
 										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
+											"include": "#inline_comment"
 										}
 									]
-								}
-							}
-						}
-					]
-				},
-				"3": {
-					"name": "storage.modifier.specifier.functional.post-parameters.$3.cpp"
-				},
-				"4": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"5": {
-					"patterns": [
-						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
-							"captures": {
-								"1": {
-									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 								},
 								"2": {
-									"name": "comment.block.cpp"
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp"
+								},
+								"4": {
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								"5": {
+									"name": "storage.modifier.specifier.functional.post-parameters.$5.cpp"
 								}
 							}
 						}
@@ -13118,7 +10848,7 @@
 			}
 		},
 		"scope_resolution": {
-			"match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+",
+			"match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+",
 			"captures": {
 				"0": {
 					"patterns": [
@@ -13140,7 +10870,7 @@
 			}
 		},
 		"scope_resolution_function_call": {
-			"match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+",
+			"match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+",
 			"captures": {
 				"0": {
 					"patterns": [
@@ -13162,7 +10892,7 @@
 			}
 		},
 		"scope_resolution_function_call_inner_generated": {
-			"match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)",
+			"match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -13200,7 +10930,7 @@
 			}
 		},
 		"scope_resolution_function_definition": {
-			"match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+",
+			"match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+",
 			"captures": {
 				"0": {
 					"patterns": [
@@ -13222,7 +10952,7 @@
 			}
 		},
 		"scope_resolution_function_definition_inner_generated": {
-			"match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)",
+			"match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -13260,7 +10990,7 @@
 			}
 		},
 		"scope_resolution_function_definition_operator_overload": {
-			"match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+",
+			"match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+",
 			"captures": {
 				"0": {
 					"patterns": [
@@ -13282,7 +11012,7 @@
 			}
 		},
 		"scope_resolution_function_definition_operator_overload_inner_generated": {
-			"match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)",
+			"match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -13320,7 +11050,7 @@
 			}
 		},
 		"scope_resolution_inner_generated": {
-			"match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)",
+			"match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -13358,7 +11088,7 @@
 			}
 		},
 		"scope_resolution_namespace_alias": {
-			"match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+",
+			"match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+",
 			"captures": {
 				"0": {
 					"patterns": [
@@ -13380,7 +11110,7 @@
 			}
 		},
 		"scope_resolution_namespace_alias_inner_generated": {
-			"match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)",
+			"match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -13418,7 +11148,7 @@
 			}
 		},
 		"scope_resolution_namespace_block": {
-			"match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+",
+			"match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+",
 			"captures": {
 				"0": {
 					"patterns": [
@@ -13440,7 +11170,7 @@
 			}
 		},
 		"scope_resolution_namespace_block_inner_generated": {
-			"match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)",
+			"match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -13478,7 +11208,7 @@
 			}
 		},
 		"scope_resolution_namespace_using": {
-			"match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+",
+			"match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+",
 			"captures": {
 				"0": {
 					"patterns": [
@@ -13500,7 +11230,7 @@
 			}
 		},
 		"scope_resolution_namespace_using_inner_generated": {
-			"match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)",
+			"match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -13538,7 +11268,7 @@
 			}
 		},
 		"scope_resolution_parameter": {
-			"match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+",
+			"match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+",
 			"captures": {
 				"0": {
 					"patterns": [
@@ -13560,7 +11290,7 @@
 			}
 		},
 		"scope_resolution_parameter_inner_generated": {
-			"match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)",
+			"match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -13598,7 +11328,7 @@
 			}
 		},
 		"scope_resolution_template_call": {
-			"match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+",
+			"match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+",
 			"captures": {
 				"0": {
 					"patterns": [
@@ -13620,7 +11350,7 @@
 			}
 		},
 		"scope_resolution_template_call_inner_generated": {
-			"match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)",
+			"match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -13658,7 +11388,7 @@
 			}
 		},
 		"scope_resolution_template_definition": {
-			"match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+",
+			"match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+",
 			"captures": {
 				"0": {
 					"patterns": [
@@ -13680,7 +11410,7 @@
 			}
 		},
 		"scope_resolution_template_definition_inner_generated": {
-			"match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)",
+			"match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -13722,7 +11452,7 @@
 			"name": "punctuation.terminator.statement.cpp"
 		},
 		"simple_type": {
-			"match": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:__has_include)|(?:atomic_cancel)|(?:atomic_commit)|(?:dynamic_cast)|(?:thread_local)|(?:synchronized)|(?:static_cast)|(?:const_cast)|(?:co_return)|(?:constexpr)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:consteval)|(?:protected)|(?:namespace)|(?:constinit)|(?:co_return)|(?:noexcept)|(?:noexcept)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:noexcept)|(?:template)|(?:operator)|(?:decltype)|(?:typename)|(?:requires)|(?:co_await)|(?:co_yield)|(?:reflexpr)|(?:alignof)|(?:alignas)|(?:default)|(?:nullptr)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:sizeof)|(?:delete)|(?:not_eq)|(?:bitand)|(?:and_eq)|(?:xor_eq)|(?:typeid)|(?:switch)|(?:return)|(?:static)|(?:extern)|(?:inline)|(?:friend)|(?:public)|(?:ifndef)|(?:define)|(?:pragma)|(?:export)|(?:import)|(?:module)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:false)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:else)|(?:goto)|(?:case)|(?:NULL)|(?:true)|(?:elif)|(?:else)|(?:line)|(?:this)|(?:not)|(?:new)|(?:xor)|(?:and)|(?:for)|(?:try)|(?:asm)|(?:or)|(?:do)|(?:if)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)?(?![\\w<:.]))(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?",
+			"match": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)?(?![\\w<:.]))(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?",
 			"captures": {
 				"1": {
 					"name": "meta.qualified_type.cpp",
@@ -13799,7 +11529,7 @@
 				"4": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -13808,16 +11538,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -13833,7 +11554,7 @@
 				"6": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -13842,16 +11563,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -13890,7 +11602,7 @@
 				"11": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -13899,16 +11611,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -13922,7 +11625,7 @@
 							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -13938,16 +11641,7 @@
 									"name": "comment.block.cpp"
 								},
 								"4": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							},
 							"name": "invalid.illegal.reference-type.cpp"
@@ -13968,7 +11662,7 @@
 				"15": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -13977,16 +11671,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -14002,7 +11687,7 @@
 				"17": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -14011,16 +11696,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -14029,7 +11705,7 @@
 			}
 		},
 		"single_line_macro": {
-			"match": "^((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))#define.*(?<![\\\\])(?:(?:\\n)|$)",
+			"match": "^((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))#define.*(?<![\\\\])(?:(?:\\n)|$)",
 			"captures": {
 				"0": {
 					"patterns": [
@@ -14051,7 +11727,7 @@
 				"2": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -14060,16 +11736,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -14078,7 +11745,7 @@
 			}
 		},
 		"sizeof_operator": {
-			"begin": "((?<!\\w)sizeof(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"begin": "((?<!\\w)sizeof(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(\\()",
 			"end": "\\)|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"1": {
@@ -14098,16 +11765,7 @@
 					"name": "comment.block.cpp"
 				},
 				"5": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"6": {
 					"name": "punctuation.section.arguments.begin.bracket.round.operator.sizeof.cpp"
@@ -14126,7 +11784,7 @@
 			]
 		},
 		"sizeof_variadic_operator": {
-			"begin": "(\\bsizeof\\.\\.\\.)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"begin": "(\\bsizeof\\.\\.\\.)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(\\()",
 			"end": "\\)|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"1": {
@@ -14146,16 +11804,7 @@
 					"name": "comment.block.cpp"
 				},
 				"5": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"6": {
 					"name": "punctuation.section.arguments.begin.bracket.round.operator.sizeof.variadic.cpp"
@@ -14199,7 +11848,7 @@
 		"standard_declares": {
 			"patterns": [
 				{
-					"match": "((?<!\\w)struct(?!\\w))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\S)(?![:{a-zA-Z])",
+					"match": "((?<!\\w)struct(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?=\\S)(?![:{a-zA-Z])",
 					"captures": {
 						"1": {
 							"name": "storage.type.struct.declare.cpp"
@@ -14214,7 +11863,7 @@
 						"3": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -14223,16 +11872,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -14248,7 +11888,7 @@
 									"name": "storage.modifier.pointer.cpp"
 								},
 								{
-									"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
+									"match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&",
 									"captures": {
 										"1": {
 											"patterns": [
@@ -14264,16 +11904,7 @@
 											"name": "comment.block.cpp"
 										},
 										"4": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									},
 									"name": "invalid.illegal.reference-type.cpp"
@@ -14294,7 +11925,7 @@
 						"7": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -14303,16 +11934,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -14328,7 +11950,7 @@
 						"9": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -14337,16 +11959,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -14362,7 +11975,7 @@
 						"11": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -14371,16 +11984,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -14399,7 +12003,7 @@
 						"14": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -14408,16 +12012,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -14426,7 +12021,7 @@
 					}
 				},
 				{
-					"match": "((?<!\\w)union(?!\\w))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\S)(?![:{a-zA-Z])",
+					"match": "((?<!\\w)union(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?=\\S)(?![:{a-zA-Z])",
 					"captures": {
 						"1": {
 							"name": "storage.type.union.declare.cpp"
@@ -14441,7 +12036,7 @@
 						"3": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -14450,16 +12045,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -14475,7 +12061,7 @@
 									"name": "storage.modifier.pointer.cpp"
 								},
 								{
-									"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
+									"match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&",
 									"captures": {
 										"1": {
 											"patterns": [
@@ -14491,16 +12077,7 @@
 											"name": "comment.block.cpp"
 										},
 										"4": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									},
 									"name": "invalid.illegal.reference-type.cpp"
@@ -14521,7 +12098,7 @@
 						"7": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -14530,16 +12107,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -14555,7 +12123,7 @@
 						"9": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -14564,16 +12132,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -14589,7 +12148,7 @@
 						"11": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -14598,16 +12157,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -14626,7 +12176,7 @@
 						"14": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -14635,16 +12185,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -14653,7 +12194,7 @@
 					}
 				},
 				{
-					"match": "((?<!\\w)enum(?!\\w))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\S)(?![:{a-zA-Z])",
+					"match": "((?<!\\w)enum(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?=\\S)(?![:{a-zA-Z])",
 					"captures": {
 						"1": {
 							"name": "storage.type.enum.declare.cpp"
@@ -14668,7 +12209,7 @@
 						"3": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -14677,16 +12218,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -14702,7 +12234,7 @@
 									"name": "storage.modifier.pointer.cpp"
 								},
 								{
-									"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
+									"match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&",
 									"captures": {
 										"1": {
 											"patterns": [
@@ -14718,16 +12250,7 @@
 											"name": "comment.block.cpp"
 										},
 										"4": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									},
 									"name": "invalid.illegal.reference-type.cpp"
@@ -14748,7 +12271,7 @@
 						"7": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -14757,16 +12280,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -14782,7 +12296,7 @@
 						"9": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -14791,16 +12305,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -14816,7 +12321,7 @@
 						"11": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -14825,16 +12330,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -14853,7 +12349,7 @@
 						"14": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -14862,16 +12358,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -14880,7 +12367,7 @@
 					}
 				},
 				{
-					"match": "((?<!\\w)class(?!\\w))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\S)(?![:{a-zA-Z])",
+					"match": "((?<!\\w)class(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?=\\S)(?![:{a-zA-Z])",
 					"captures": {
 						"1": {
 							"name": "storage.type.class.declare.cpp"
@@ -14895,7 +12382,7 @@
 						"3": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -14904,16 +12391,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -14929,7 +12407,7 @@
 									"name": "storage.modifier.pointer.cpp"
 								},
 								{
-									"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
+									"match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&",
 									"captures": {
 										"1": {
 											"patterns": [
@@ -14945,16 +12423,7 @@
 											"name": "comment.block.cpp"
 										},
 										"4": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									},
 									"name": "invalid.illegal.reference-type.cpp"
@@ -14975,7 +12444,7 @@
 						"7": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -14984,16 +12453,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -15009,7 +12469,7 @@
 						"9": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -15018,16 +12478,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -15043,7 +12494,7 @@
 						"11": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -15052,16 +12503,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -15080,7 +12522,7 @@
 						"14": {
 							"patterns": [
 								{
-									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 									"captures": {
 										"1": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -15089,16 +12531,7 @@
 											"name": "comment.block.cpp"
 										},
 										"3": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								}
@@ -15109,7 +12542,7 @@
 			]
 		},
 		"static_assert": {
-			"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)static_assert|_Static_assert(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)static_assert|_Static_assert(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(\\()",
 			"end": "\\)|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"1": {
@@ -15126,16 +12559,7 @@
 					"name": "comment.block.cpp"
 				},
 				"4": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"5": {
 					"name": "keyword.other.static_assert.cpp"
@@ -15154,16 +12578,7 @@
 					"name": "comment.block.cpp"
 				},
 				"9": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"10": {
 					"name": "punctuation.section.arguments.begin.bracket.round.static_assert.cpp"
@@ -15197,7 +12612,7 @@
 			]
 		},
 		"std_space": {
-			"match": "(?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))",
+			"match": "(?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))",
 			"captures": {
 				"0": {
 					"patterns": [
@@ -15209,7 +12624,7 @@
 				"1": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -15218,16 +12633,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -15236,7 +12642,7 @@
 			}
 		},
 		"storage_specifiers": {
-			"match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:(?:thread_local)|(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const))(?!\\w))",
+			"match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:(?:thread_local)|(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const))(?!\\w))",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -15248,7 +12654,7 @@
 				"2": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -15257,16 +12663,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -15490,7 +12887,7 @@
 			]
 		},
 		"struct_block": {
-			"begin": "((?<!\\w)struct(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?={)|(?:((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*+)?(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(:(?!:)))?)",
+			"begin": "((?<!\\w)struct(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?={)|(?:((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*+)?(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(:(?!:)))?)",
 			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"0": {
@@ -15513,16 +12910,7 @@
 					"name": "comment.block.cpp"
 				},
 				"5": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"6": {
 					"patterns": [
@@ -15548,21 +12936,12 @@
 					"name": "comment.block.cpp"
 				},
 				"10": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"11": {
 					"patterns": [
 						{
-							"match": "((?<!\\w)final(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))",
+							"match": "((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))",
 							"captures": {
 								"1": {
 									"name": "storage.type.modifier.final.cpp"
@@ -15581,21 +12960,12 @@
 									"name": "comment.block.cpp"
 								},
 								"5": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						},
 						{
-							"match": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:((?<!\\w)final(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=:|{|$)",
+							"match": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?=:|{|$)",
 							"captures": {
 								"1": {
 									"name": "entity.name.type.struct.cpp"
@@ -15614,16 +12984,7 @@
 									"name": "comment.block.cpp"
 								},
 								"5": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								},
 								"6": {
 									"name": "storage.type.modifier.final.cpp"
@@ -15642,16 +13003,7 @@
 									"name": "comment.block.cpp"
 								},
 								"10": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						},
@@ -15679,16 +13031,7 @@
 					"name": "comment.block.cpp"
 				},
 				"15": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"16": {
 					"patterns": [
@@ -15704,16 +13047,7 @@
 					"name": "comment.block.cpp"
 				},
 				"19": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"20": {
 					"name": "punctuation.separator.colon.inheritance.cpp"
@@ -15794,7 +13128,7 @@
 			]
 		},
 		"struct_declare": {
-			"match": "((?<!\\w)struct(?!\\w))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\S)(?![:{a-zA-Z])",
+			"match": "((?<!\\w)struct(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?=\\S)(?![:{a-zA-Z])",
 			"captures": {
 				"1": {
 					"name": "storage.type.struct.declare.cpp"
@@ -15809,7 +13143,7 @@
 				"3": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -15818,16 +13152,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -15843,7 +13168,7 @@
 							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -15859,16 +13184,7 @@
 									"name": "comment.block.cpp"
 								},
 								"4": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							},
 							"name": "invalid.illegal.reference-type.cpp"
@@ -15889,7 +13205,7 @@
 				"7": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -15898,16 +13214,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -15923,7 +13230,7 @@
 				"9": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -15932,16 +13239,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -15957,7 +13255,7 @@
 				"11": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -15966,16 +13264,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -15994,7 +13283,7 @@
 				"14": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -16003,16 +13292,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -16021,7 +13301,7 @@
 			}
 		},
 		"switch_conditional_parentheses": {
-			"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(\\()",
 			"end": "\\)|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"1": {
@@ -16038,16 +13318,7 @@
 					"name": "comment.block.cpp"
 				},
 				"4": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"5": {
 					"name": "punctuation.section.parens.begin.bracket.round.conditional.switch.cpp"
@@ -16066,7 +13337,7 @@
 			]
 		},
 		"switch_statement": {
-			"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)switch(?!\\w))",
+			"begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)switch(?!\\w))",
 			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"0": {
@@ -16086,16 +13357,7 @@
 					"name": "comment.block.cpp"
 				},
 				"4": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"5": {
 					"name": "keyword.control.switch.cpp"
@@ -16160,10 +13422,10 @@
 			]
 		},
 		"template_argument_defaulted": {
-			"match": "(?<=<|,)(?:(?:\\s)+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:\\s)+)*)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)(?:(?:\\s)+)?([=])",
+			"match": "(?<=<|,)(?:(?:\\s)+)?((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)(?:\\s)+((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(\\=)",
 			"captures": {
 				"1": {
-					"name": "storage.type.template.cpp"
+					"name": "storage.type.template.argument.$1.cpp"
 				},
 				"2": {
 					"name": "entity.name.type.template.cpp"
@@ -16248,7 +13510,7 @@
 					"name": "storage.type.template.cpp"
 				},
 				"2": {
-					"name": "punctuation.section.angle-brackets.start.template.definition.cpp"
+					"name": "punctuation.section.angle-brackets.begin.template.definition.cpp"
 				}
 			},
 			"endCaptures": {
@@ -16268,7 +13530,7 @@
 					},
 					"endCaptures": {
 						"0": {
-							"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
+							"name": "punctuation.section.angle-brackets.end.template.call.cpp"
 						}
 					},
 					"patterns": [
@@ -16283,7 +13545,7 @@
 			]
 		},
 		"template_definition_argument": {
-			"match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:\\s)+)+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))|((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)(?:(?:\\s)+)?(\\.\\.\\.)(?:(?:\\s)+)?((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))(?:(?:\\s)+)?(?:(,)|(?=>|$))",
+			"match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:\\s)+)+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))|((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)(?:(?:\\s)+)?(\\.\\.\\.)(?:(?:\\s)+)?((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))|(?<!\\w)(template)(?:(?:\\s)+)?(<)(?:(?:\\s)+)?((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)(?:(?:\\s)+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(>)(?:(?:\\s)+)?(class|typename)(?:(?:\\s)+((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))?)(?:(?:\\s)+)?(?:(\\=)(?:(?:\\s)+)?(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?(?:(,)|(?=>|$))",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -16295,7 +13557,7 @@
 				"2": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -16304,16 +13566,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -16334,7 +13587,7 @@
 					"name": "entity.name.type.template.cpp"
 				},
 				"6": {
-					"name": "storage.type.template.cpp"
+					"name": "storage.type.template.argument.$6.cpp"
 				},
 				"7": {
 					"name": "punctuation.vararg-ellipses.template.definition.cpp"
@@ -16343,6 +13596,30 @@
 					"name": "entity.name.type.template.cpp"
 				},
 				"9": {
+					"name": "storage.type.template.cpp"
+				},
+				"10": {
+					"name": "punctuation.section.angle-brackets.begin.template.definition.cpp"
+				},
+				"11": {
+					"name": "storage.type.template.argument.$11.cpp"
+				},
+				"12": {
+					"name": "entity.name.type.template.cpp"
+				},
+				"13": {
+					"name": "punctuation.section.angle-brackets.end.template.definition.cpp"
+				},
+				"14": {
+					"name": "storage.type.template.argument.$14.cpp"
+				},
+				"15": {
+					"name": "entity.name.type.template.cpp"
+				},
+				"16": {
+					"name": "keyword.operator.assignment.cpp"
+				},
+				"17": {
 					"name": "punctuation.separator.delimiter.comma.template.argument.cpp"
 				}
 			}
@@ -16366,14 +13643,26 @@
 				}
 			]
 		},
+		"template_explicit_instantiation": {
+			"match": "(?<!\\w)(?:(extern)(?:\\s)+)?(template)(?:\\s)+",
+			"captures": {
+				"1": {
+					"name": "storage.modifier.specifier.extern.cpp"
+				},
+				"2": {
+					"name": "storage.type.template.cpp"
+				}
+			},
+			"name": "meta.template.explicit-instantiation.cpp"
+		},
 		"template_isolated_definition": {
-			"match": "(?<!\\w)(template)(?:(?:\\s)+)?(<)(.*)(>(?:(?:\\s)+)?$)",
+			"match": "(?<!\\w)(template)(?:(?:\\s)+)?(<)(.*)(>)(?:(?:\\s)+)?$",
 			"captures": {
 				"1": {
 					"name": "storage.type.template.cpp"
 				},
 				"2": {
-					"name": "punctuation.section.angle-brackets.start.template.definition.cpp"
+					"name": "punctuation.section.angle-brackets.begin.template.definition.cpp"
 				},
 				"3": {
 					"name": "meta.template.definition.cpp",
@@ -16484,7 +13773,7 @@
 			"applyEndPatternLast": 1
 		},
 		"the_this_keyword": {
-			"match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)this(?!\\w))",
+			"match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)this(?!\\w))",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -16496,7 +13785,7 @@
 				"2": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -16505,16 +13794,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -16526,65 +13806,13 @@
 			}
 		},
 		"type_alias": {
-			"match": "(using)(?:(?:\\s)+)?(?!namespace)(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<29>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:__has_include)|(?:atomic_cancel)|(?:atomic_commit)|(?:dynamic_cast)|(?:thread_local)|(?:synchronized)|(?:static_cast)|(?:const_cast)|(?:co_return)|(?:constexpr)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:consteval)|(?:protected)|(?:namespace)|(?:constinit)|(?:co_return)|(?:noexcept)|(?:noexcept)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:noexcept)|(?:template)|(?:operator)|(?:decltype)|(?:typename)|(?:requires)|(?:co_await)|(?:co_yield)|(?:reflexpr)|(?:alignof)|(?:alignas)|(?:default)|(?:nullptr)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:sizeof)|(?:delete)|(?:not_eq)|(?:bitand)|(?:and_eq)|(?:xor_eq)|(?:typeid)|(?:switch)|(?:return)|(?:static)|(?:extern)|(?:inline)|(?:friend)|(?:public)|(?:ifndef)|(?:define)|(?:pragma)|(?:export)|(?:import)|(?:module)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:false)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:else)|(?:goto)|(?:case)|(?:NULL)|(?:true)|(?:elif)|(?:else)|(?:line)|(?:this)|(?:not)|(?:new)|(?:xor)|(?:and)|(?:for)|(?:try)|(?:asm)|(?:or)|(?:do)|(?:if)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<29>?)+>)?(?![\\w<:.]))(?:(?:\\s)+)?(\\=)(?:(?:\\s)+)?((?:typename)?)(?:(?:\\s)+)?((?:(?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))(?<!\\w)(?:(?:thread_local)|(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const))(?!\\w)(?:\\s)+)+)?(?:(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<29>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:__has_include)|(?:atomic_cancel)|(?:atomic_commit)|(?:dynamic_cast)|(?:thread_local)|(?:synchronized)|(?:static_cast)|(?:const_cast)|(?:co_return)|(?:constexpr)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:consteval)|(?:protected)|(?:namespace)|(?:constinit)|(?:co_return)|(?:noexcept)|(?:noexcept)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:noexcept)|(?:template)|(?:operator)|(?:decltype)|(?:typename)|(?:requires)|(?:co_await)|(?:co_yield)|(?:reflexpr)|(?:alignof)|(?:alignas)|(?:default)|(?:nullptr)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:sizeof)|(?:delete)|(?:not_eq)|(?:bitand)|(?:and_eq)|(?:xor_eq)|(?:typeid)|(?:switch)|(?:return)|(?:static)|(?:extern)|(?:inline)|(?:friend)|(?:public)|(?:ifndef)|(?:define)|(?:pragma)|(?:export)|(?:import)|(?:module)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:false)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:else)|(?:goto)|(?:case)|(?:NULL)|(?:true)|(?:elif)|(?:else)|(?:line)|(?:this)|(?:not)|(?:new)|(?:xor)|(?:and)|(?:for)|(?:try)|(?:asm)|(?:or)|(?:do)|(?:if)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<29>?)+>)?(?![\\w<:.]))|(.*(?<!;)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)?(?:(?:\\s)+)?(?:(;)|\\n)",
+			"match": "(using)(?:\\s)+(?!namespace)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)(?:(?:\\s)+)?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?(?:(?:\\s)+)?(\\=)(?:(?:\\s)+)?((?:typename)?)(?:(?:\\s)+)?((?:(?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))(?<!\\w)(?:(?:thread_local)|(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const))(?!\\w)(?:\\s)+)+)?(?:(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<19>?)+>)(?:\\s)*+)?::)*+)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<19>?)+>)?(?![\\w<:.]))|(.*(?<!;)))(?:(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)?(?:(?:\\s)+)?(?:(;)|\\n)",
 			"captures": {
 				"1": {
 					"name": "keyword.other.using.directive.cpp"
 				},
 				"2": {
-					"name": "meta.qualified_type.cpp",
-					"patterns": [
-						{
-							"match": "::",
-							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
-						},
-						{
-							"match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
-							"name": "storage.type.$0.cpp"
-						},
-						{
-							"include": "#attributes_context"
-						},
-						{
-							"include": "#storage_types"
-						},
-						{
-							"include": "#number_literal"
-						},
-						{
-							"include": "#string_context"
-						},
-						{
-							"include": "#comma"
-						},
-						{
-							"include": "#scope_resolution_inner_generated"
-						},
-						{
-							"begin": "<",
-							"end": ">|(?=\\\\end\\{(?:minted|cppcode)\\})",
-							"beginCaptures": {
-								"0": {
-									"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
-								}
-							},
-							"endCaptures": {
-								"0": {
-									"name": "punctuation.section.angle-brackets.end.template.call.cpp"
-								}
-							},
-							"name": "meta.template.call.cpp",
-							"patterns": [
-								{
-									"include": "#template_call_context"
-								}
-							]
-						},
-						{
-							"match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
-							"name": "entity.name.type.cpp"
-						}
-					]
+					"name": "entity.name.type.cpp"
 				},
 				"3": {
 					"patterns": [
@@ -16597,50 +13825,22 @@
 					]
 				},
 				"4": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
+					"name": "keyword.operator.assignment.cpp"
 				},
 				"5": {
-					"patterns": [
-						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
-							"captures": {
-								"1": {
-									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-								},
-								"2": {
-									"name": "comment.block.cpp"
-								},
-								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
-								}
-							}
-						}
-					]
+					"name": "keyword.other.typename.cpp"
 				},
 				"6": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "#storage_specifiers"
 						}
 					]
 				},
 				"7": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -16649,118 +13849,13 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
 					]
 				},
 				"8": {
-					"patterns": [
-						{
-							"match": "::",
-							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.type.cpp"
-						},
-						{
-							"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
-							"name": "entity.name.scope-resolution.type.cpp"
-						},
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"9": {
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"11": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"12": {
-					"patterns": [
-						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
-							"captures": {
-								"1": {
-									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-								},
-								"2": {
-									"name": "comment.block.cpp"
-								},
-								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
-								}
-							}
-						}
-					]
-				},
-				"14": {
-					"name": "keyword.operator.assignment.cpp"
-				},
-				"15": {
-					"name": "keyword.other.typename.cpp"
-				},
-				"16": {
-					"patterns": [
-						{
-							"include": "#storage_specifiers"
-						}
-					]
-				},
-				"17": {
-					"patterns": [
-						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
-							"captures": {
-								"1": {
-									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-								},
-								"2": {
-									"name": "comment.block.cpp"
-								},
-								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
-								}
-							}
-						}
-					]
-				},
-				"18": {
 					"name": "meta.qualified_type.cpp",
 					"patterns": [
 						{
@@ -16815,7 +13910,7 @@
 						}
 					]
 				},
-				"19": {
+				"9": {
 					"patterns": [
 						{
 							"include": "#attributes_context"
@@ -16825,17 +13920,17 @@
 						}
 					]
 				},
-				"20": {
+				"10": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"21": {
+				"11": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -16844,32 +13939,23 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
 					]
 				},
-				"22": {
+				"12": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"23": {
+				"13": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -16878,22 +13964,13 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
 					]
 				},
-				"24": {
+				"14": {
 					"patterns": [
 						{
 							"match": "::",
@@ -16908,24 +13985,24 @@
 						}
 					]
 				},
-				"25": {
+				"15": {
 					"patterns": [
 						{
 							"include": "#template_call_range"
 						}
 					]
 				},
-				"27": {
+				"17": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"28": {
+				"18": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -16934,22 +14011,13 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
 					]
 				},
-				"30": {
+				"20": {
 					"name": "meta.declaration.type.alias.value.unknown.cpp",
 					"patterns": [
 						{
@@ -16957,14 +14025,14 @@
 						}
 					]
 				},
-				"31": {
+				"21": {
 					"patterns": [
 						{
 							"match": "\\*",
 							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -16980,16 +14048,7 @@
 									"name": "comment.block.cpp"
 								},
 								"4": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							},
 							"name": "invalid.illegal.reference-type.cpp"
@@ -17000,17 +14059,17 @@
 						}
 					]
 				},
-				"32": {
+				"22": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"33": {
+				"23": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -17019,32 +14078,23 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
 					]
 				},
-				"34": {
+				"24": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"35": {
+				"25": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -17053,32 +14103,23 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
 					]
 				},
-				"36": {
+				"26": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"37": {
+				"27": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -17087,42 +14128,33 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
 					]
 				},
-				"38": {
+				"28": {
 					"name": "punctuation.definition.begin.bracket.square.cpp"
 				},
-				"39": {
+				"29": {
 					"patterns": [
 						{
 							"include": "#evaluation_context"
 						}
 					]
 				},
-				"40": {
+				"30": {
 					"name": "punctuation.definition.end.bracket.square.cpp"
 				},
-				"41": {
+				"31": {
 					"name": "punctuation.terminator.statement.cpp"
 				}
 			},
 			"name": "meta.declaration.type.alias.cpp"
 		},
 		"type_casting_operators": {
-			"match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:(?:reinterpret_cast)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast))(?!\\w))",
+			"match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:(?:reinterpret_cast)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast))(?!\\w))",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -17134,7 +14166,7 @@
 				"2": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -17143,16 +14175,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -17174,7 +14197,7 @@
 			"endCaptures": {},
 			"patterns": [
 				{
-					"begin": "((?<!\\w)class(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?={)|(?:((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*+)?(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(:(?!:)))?)",
+					"begin": "((?<!\\w)class(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?={)|(?:((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*+)?(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(:(?!:)))?)",
 					"end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})",
 					"beginCaptures": {
 						"0": {
@@ -17197,16 +14220,7 @@
 							"name": "comment.block.cpp"
 						},
 						"5": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"6": {
 							"patterns": [
@@ -17232,21 +14246,12 @@
 							"name": "comment.block.cpp"
 						},
 						"10": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"11": {
 							"patterns": [
 								{
-									"match": "((?<!\\w)final(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))",
+									"match": "((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))",
 									"captures": {
 										"1": {
 											"name": "storage.type.modifier.final.cpp"
@@ -17265,21 +14270,12 @@
 											"name": "comment.block.cpp"
 										},
 										"5": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								},
 								{
-									"match": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:((?<!\\w)final(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=:|{|$)",
+									"match": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?=:|{|$)",
 									"captures": {
 										"1": {
 											"name": "entity.name.type.class.cpp"
@@ -17298,16 +14294,7 @@
 											"name": "comment.block.cpp"
 										},
 										"5": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										},
 										"6": {
 											"name": "storage.type.modifier.final.cpp"
@@ -17326,16 +14313,7 @@
 											"name": "comment.block.cpp"
 										},
 										"10": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								},
@@ -17363,16 +14341,7 @@
 							"name": "comment.block.cpp"
 						},
 						"15": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"16": {
 							"patterns": [
@@ -17388,16 +14357,7 @@
 							"name": "comment.block.cpp"
 						},
 						"19": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"20": {
 							"name": "punctuation.separator.colon.inheritance.cpp"
@@ -17471,7 +14431,7 @@
 							"name": "meta.tail.class.cpp",
 							"patterns": [
 								{
-									"match": "(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
+									"match": "(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
 									"captures": {
 										"1": {
 											"patterns": [
@@ -17480,7 +14440,7 @@
 													"name": "storage.modifier.pointer.cpp"
 												},
 												{
-													"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
+													"match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&",
 													"captures": {
 														"1": {
 															"patterns": [
@@ -17496,16 +14456,7 @@
 															"name": "comment.block.cpp"
 														},
 														"4": {
-															"patterns": [
-																{
-																	"match": "\\*\\/",
-																	"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-																},
-																{
-																	"match": "\\*",
-																	"name": "comment.block.cpp"
-																}
-															]
+															"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 														}
 													},
 													"name": "invalid.illegal.reference-type.cpp"
@@ -17530,16 +14481,7 @@
 											"name": "comment.block.cpp"
 										},
 										"5": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										},
 										"6": {
 											"patterns": [
@@ -17555,16 +14497,7 @@
 											"name": "comment.block.cpp"
 										},
 										"9": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										},
 										"10": {
 											"patterns": [
@@ -17580,16 +14513,7 @@
 											"name": "comment.block.cpp"
 										},
 										"13": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										},
 										"14": {
 											"name": "entity.name.type.alias.cpp"
@@ -17616,8 +14540,8 @@
 			"endCaptures": {},
 			"patterns": [
 				{
-					"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:__has_include)|(?:atomic_cancel)|(?:atomic_commit)|(?:dynamic_cast)|(?:thread_local)|(?:synchronized)|(?:static_cast)|(?:const_cast)|(?:co_return)|(?:constexpr)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:consteval)|(?:protected)|(?:namespace)|(?:constinit)|(?:co_return)|(?:noexcept)|(?:noexcept)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:noexcept)|(?:template)|(?:operator)|(?:decltype)|(?:typename)|(?:requires)|(?:co_await)|(?:co_yield)|(?:reflexpr)|(?:alignof)|(?:alignas)|(?:default)|(?:nullptr)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:sizeof)|(?:delete)|(?:not_eq)|(?:bitand)|(?:and_eq)|(?:xor_eq)|(?:typeid)|(?:switch)|(?:return)|(?:static)|(?:extern)|(?:inline)|(?:friend)|(?:public)|(?:ifndef)|(?:define)|(?:pragma)|(?:export)|(?:import)|(?:module)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:false)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:else)|(?:goto)|(?:case)|(?:NULL)|(?:true)|(?:elif)|(?:else)|(?:line)|(?:this)|(?:not)|(?:new)|(?:xor)|(?:and)|(?:for)|(?:try)|(?:asm)|(?:or)|(?:do)|(?:if)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()(\\*)(?:(?:\\s)+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)*(\\))(?:(?:\\s)+)?(\\()",
-					"end": "(\\))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=[{=,);>]|\\n)(?!\\()|(?=\\\\end\\{(?:minted|cppcode)\\})",
+					"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(\\()(\\*)(?:(?:\\s)+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)*(\\))(?:(?:\\s)+)?(\\()",
+					"end": "(\\))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?=[{=,);>]|\\n)(?!\\()|(?=\\\\end\\{(?:minted|cppcode)\\})",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.qualified_type.cpp",
@@ -17698,16 +14622,7 @@
 							"name": "comment.block.cpp"
 						},
 						"6": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"7": {
 							"patterns": [
@@ -17723,16 +14638,7 @@
 							"name": "comment.block.cpp"
 						},
 						"10": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"11": {
 							"patterns": [
@@ -17771,16 +14677,7 @@
 							"name": "comment.block.cpp"
 						},
 						"17": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"18": {},
 						"19": {
@@ -17790,7 +14687,7 @@
 									"name": "storage.modifier.pointer.cpp"
 								},
 								{
-									"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
+									"match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&",
 									"captures": {
 										"1": {
 											"patterns": [
@@ -17806,16 +14703,7 @@
 											"name": "comment.block.cpp"
 										},
 										"4": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									},
 									"name": "invalid.illegal.reference-type.cpp"
@@ -17840,16 +14728,7 @@
 							"name": "comment.block.cpp"
 						},
 						"23": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"24": {
 							"patterns": [
@@ -17865,16 +14744,7 @@
 							"name": "comment.block.cpp"
 						},
 						"27": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"28": {
 							"patterns": [
@@ -17890,16 +14760,7 @@
 							"name": "comment.block.cpp"
 						},
 						"31": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"32": {
 							"name": "punctuation.section.parens.begin.bracket.round.function.pointer.cpp"
@@ -17948,16 +14809,7 @@
 							"name": "comment.block.cpp"
 						},
 						"5": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						}
 					},
 					"patterns": [
@@ -17979,7 +14831,7 @@
 			"endCaptures": {},
 			"patterns": [
 				{
-					"begin": "((?<!\\w)struct(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?={)|(?:((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*+)?(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(:(?!:)))?)",
+					"begin": "((?<!\\w)struct(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?={)|(?:((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*+)?(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(:(?!:)))?)",
 					"end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})",
 					"beginCaptures": {
 						"0": {
@@ -18002,16 +14854,7 @@
 							"name": "comment.block.cpp"
 						},
 						"5": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"6": {
 							"patterns": [
@@ -18037,21 +14880,12 @@
 							"name": "comment.block.cpp"
 						},
 						"10": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"11": {
 							"patterns": [
 								{
-									"match": "((?<!\\w)final(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))",
+									"match": "((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))",
 									"captures": {
 										"1": {
 											"name": "storage.type.modifier.final.cpp"
@@ -18070,21 +14904,12 @@
 											"name": "comment.block.cpp"
 										},
 										"5": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								},
 								{
-									"match": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:((?<!\\w)final(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=:|{|$)",
+									"match": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?=:|{|$)",
 									"captures": {
 										"1": {
 											"name": "entity.name.type.struct.cpp"
@@ -18103,16 +14928,7 @@
 											"name": "comment.block.cpp"
 										},
 										"5": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										},
 										"6": {
 											"name": "storage.type.modifier.final.cpp"
@@ -18131,16 +14947,7 @@
 											"name": "comment.block.cpp"
 										},
 										"10": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								},
@@ -18168,16 +14975,7 @@
 							"name": "comment.block.cpp"
 						},
 						"15": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"16": {
 							"patterns": [
@@ -18193,16 +14991,7 @@
 							"name": "comment.block.cpp"
 						},
 						"19": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"20": {
 							"name": "punctuation.separator.colon.inheritance.cpp"
@@ -18276,7 +15065,7 @@
 							"name": "meta.tail.struct.cpp",
 							"patterns": [
 								{
-									"match": "(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
+									"match": "(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
 									"captures": {
 										"1": {
 											"patterns": [
@@ -18285,7 +15074,7 @@
 													"name": "storage.modifier.pointer.cpp"
 												},
 												{
-													"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
+													"match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&",
 													"captures": {
 														"1": {
 															"patterns": [
@@ -18301,16 +15090,7 @@
 															"name": "comment.block.cpp"
 														},
 														"4": {
-															"patterns": [
-																{
-																	"match": "\\*\\/",
-																	"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-																},
-																{
-																	"match": "\\*",
-																	"name": "comment.block.cpp"
-																}
-															]
+															"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 														}
 													},
 													"name": "invalid.illegal.reference-type.cpp"
@@ -18335,16 +15115,7 @@
 											"name": "comment.block.cpp"
 										},
 										"5": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										},
 										"6": {
 											"patterns": [
@@ -18360,16 +15131,7 @@
 											"name": "comment.block.cpp"
 										},
 										"9": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										},
 										"10": {
 											"patterns": [
@@ -18385,16 +15147,7 @@
 											"name": "comment.block.cpp"
 										},
 										"13": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										},
 										"14": {
 											"name": "entity.name.type.alias.cpp"
@@ -18421,7 +15174,7 @@
 			"endCaptures": {},
 			"patterns": [
 				{
-					"begin": "((?<!\\w)union(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?={)|(?:((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*+)?(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(:(?!:)))?)",
+					"begin": "((?<!\\w)union(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?={)|(?:((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*+)?(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(:(?!:)))?)",
 					"end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})",
 					"beginCaptures": {
 						"0": {
@@ -18444,16 +15197,7 @@
 							"name": "comment.block.cpp"
 						},
 						"5": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"6": {
 							"patterns": [
@@ -18479,21 +15223,12 @@
 							"name": "comment.block.cpp"
 						},
 						"10": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"11": {
 							"patterns": [
 								{
-									"match": "((?<!\\w)final(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))",
+									"match": "((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))",
 									"captures": {
 										"1": {
 											"name": "storage.type.modifier.final.cpp"
@@ -18511,22 +15246,13 @@
 										"4": {
 											"name": "comment.block.cpp"
 										},
-										"5": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+										"5": {
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								},
 								{
-									"match": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:((?<!\\w)final(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=:|{|$)",
+									"match": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?=:|{|$)",
 									"captures": {
 										"1": {
 											"name": "entity.name.type.union.cpp"
@@ -18545,16 +15271,7 @@
 											"name": "comment.block.cpp"
 										},
 										"5": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										},
 										"6": {
 											"name": "storage.type.modifier.final.cpp"
@@ -18573,16 +15290,7 @@
 											"name": "comment.block.cpp"
 										},
 										"10": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										}
 									}
 								},
@@ -18610,16 +15318,7 @@
 							"name": "comment.block.cpp"
 						},
 						"15": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"16": {
 							"patterns": [
@@ -18635,16 +15334,7 @@
 							"name": "comment.block.cpp"
 						},
 						"19": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						"20": {
 							"name": "punctuation.separator.colon.inheritance.cpp"
@@ -18718,7 +15408,7 @@
 							"name": "meta.tail.union.cpp",
 							"patterns": [
 								{
-									"match": "(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
+									"match": "(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
 									"captures": {
 										"1": {
 											"patterns": [
@@ -18727,7 +15417,7 @@
 													"name": "storage.modifier.pointer.cpp"
 												},
 												{
-													"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
+													"match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&",
 													"captures": {
 														"1": {
 															"patterns": [
@@ -18743,16 +15433,7 @@
 															"name": "comment.block.cpp"
 														},
 														"4": {
-															"patterns": [
-																{
-																	"match": "\\*\\/",
-																	"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-																},
-																{
-																	"match": "\\*",
-																	"name": "comment.block.cpp"
-																}
-															]
+															"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 														}
 													},
 													"name": "invalid.illegal.reference-type.cpp"
@@ -18777,16 +15458,7 @@
 											"name": "comment.block.cpp"
 										},
 										"5": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										},
 										"6": {
 											"patterns": [
@@ -18802,16 +15474,7 @@
 											"name": "comment.block.cpp"
 										},
 										"9": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										},
 										"10": {
 											"patterns": [
@@ -18827,16 +15490,7 @@
 											"name": "comment.block.cpp"
 										},
 										"13": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 										},
 										"14": {
 											"name": "entity.name.type.alias.cpp"
@@ -18853,7 +15507,7 @@
 			]
 		},
 		"typeid_operator": {
-			"begin": "((?<!\\w)typeid(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"begin": "((?<!\\w)typeid(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(\\()",
 			"end": "\\)|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"1": {
@@ -18873,16 +15527,7 @@
 					"name": "comment.block.cpp"
 				},
 				"5": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"6": {
 					"name": "punctuation.section.arguments.begin.bracket.round.operator.typeid.cpp"
@@ -18901,7 +15546,7 @@
 			]
 		},
 		"typename": {
-			"match": "(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?<!\\w)typename(?!\\w))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<17>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:__has_include)|(?:atomic_cancel)|(?:atomic_commit)|(?:dynamic_cast)|(?:thread_local)|(?:synchronized)|(?:static_cast)|(?:const_cast)|(?:co_return)|(?:constexpr)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:consteval)|(?:protected)|(?:namespace)|(?:constinit)|(?:co_return)|(?:noexcept)|(?:noexcept)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:noexcept)|(?:template)|(?:operator)|(?:decltype)|(?:typename)|(?:requires)|(?:co_await)|(?:co_yield)|(?:reflexpr)|(?:alignof)|(?:alignas)|(?:default)|(?:nullptr)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:sizeof)|(?:delete)|(?:not_eq)|(?:bitand)|(?:and_eq)|(?:xor_eq)|(?:typeid)|(?:switch)|(?:return)|(?:static)|(?:extern)|(?:inline)|(?:friend)|(?:public)|(?:ifndef)|(?:define)|(?:pragma)|(?:export)|(?:import)|(?:module)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:false)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:else)|(?:goto)|(?:case)|(?:NULL)|(?:true)|(?:elif)|(?:else)|(?:line)|(?:this)|(?:not)|(?:new)|(?:xor)|(?:and)|(?:for)|(?:try)|(?:asm)|(?:or)|(?:do)|(?:if)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<17>?)+>)?(?![\\w<:.]))",
+			"match": "(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?<!\\w)typename(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<17>?)+>)(?:\\s)*+)?::)*+)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<17>?)+>)?(?![\\w<:.]))",
 			"captures": {
 				"1": {
 					"name": "storage.modifier.cpp"
@@ -18916,7 +15561,7 @@
 				"3": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -18925,16 +15570,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -18950,7 +15586,7 @@
 				"5": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -18959,16 +15595,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -19049,7 +15676,7 @@
 				"9": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -19058,16 +15685,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -19083,7 +15701,7 @@
 				"11": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -19092,16 +15710,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -19140,7 +15749,7 @@
 				"16": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -19149,16 +15758,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -19168,7 +15768,7 @@
 			}
 		},
 		"undef": {
-			"match": "(^((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?undef\\b)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
+			"match": "(^((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?undef\\b)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
 			"captures": {
 				"1": {
 					"name": "keyword.control.directive.undef.cpp"
@@ -19183,7 +15783,7 @@
 				"3": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -19192,16 +15792,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -19220,7 +15811,7 @@
 				"6": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -19229,16 +15820,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -19251,7 +15833,7 @@
 			"name": "meta.preprocessor.undef.cpp"
 		},
 		"union_block": {
-			"begin": "((?<!\\w)union(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?={)|(?:((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*+)?(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(:(?!:)))?)",
+			"begin": "((?<!\\w)union(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?={)|(?:((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*+)?(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(:(?!:)))?)",
 			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"0": {
@@ -19274,16 +15856,7 @@
 					"name": "comment.block.cpp"
 				},
 				"5": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"6": {
 					"patterns": [
@@ -19309,21 +15882,12 @@
 					"name": "comment.block.cpp"
 				},
 				"10": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"11": {
 					"patterns": [
 						{
-							"match": "((?<!\\w)final(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))",
+							"match": "((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))",
 							"captures": {
 								"1": {
 									"name": "storage.type.modifier.final.cpp"
@@ -19342,21 +15906,12 @@
 									"name": "comment.block.cpp"
 								},
 								"5": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						},
 						{
-							"match": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:((?<!\\w)final(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=:|{|$)",
+							"match": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?=:|{|$)",
 							"captures": {
 								"1": {
 									"name": "entity.name.type.union.cpp"
@@ -19375,16 +15930,7 @@
 									"name": "comment.block.cpp"
 								},
 								"5": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								},
 								"6": {
 									"name": "storage.type.modifier.final.cpp"
@@ -19403,16 +15949,7 @@
 									"name": "comment.block.cpp"
 								},
 								"10": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						},
@@ -19440,16 +15977,7 @@
 					"name": "comment.block.cpp"
 				},
 				"15": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"16": {
 					"patterns": [
@@ -19465,16 +15993,7 @@
 					"name": "comment.block.cpp"
 				},
 				"19": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				},
 				"20": {
 					"name": "punctuation.separator.colon.inheritance.cpp"
@@ -19555,7 +16074,7 @@
 			]
 		},
 		"union_declare": {
-			"match": "((?<!\\w)union(?!\\w))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\S)(?![:{a-zA-Z])",
+			"match": "((?<!\\w)union(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?=\\S)(?![:{a-zA-Z])",
 			"captures": {
 				"1": {
 					"name": "storage.type.union.declare.cpp"
@@ -19570,7 +16089,7 @@
 				"3": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -19579,16 +16098,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -19604,7 +16114,7 @@
 							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -19620,16 +16130,7 @@
 									"name": "comment.block.cpp"
 								},
 								"4": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							},
 							"name": "invalid.illegal.reference-type.cpp"
@@ -19650,7 +16151,7 @@
 				"7": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -19659,16 +16160,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -19684,7 +16176,7 @@
 				"9": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -19693,16 +16185,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -19718,7 +16201,7 @@
 				"11": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -19727,16 +16210,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -19755,7 +16229,7 @@
 				"14": {
 					"patterns": [
 						{
-							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
 							"captures": {
 								"1": {
 									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -19764,16 +16238,7 @@
 									"name": "comment.block.cpp"
 								},
 								"3": {
-									"patterns": [
-										{
-											"match": "\\*\\/",
-											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-										},
-										{
-											"match": "\\*",
-											"name": "comment.block.cpp"
-										}
-									]
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 								}
 							}
 						}
@@ -19790,7 +16255,7 @@
 			}
 		},
 		"using_namespace": {
-			"begin": "(?<!\\w)(using)(?:\\s)+(namespace)(?:\\s)+((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<6>?)+>)(?:\\s)*+)?::)*\\s*+)?((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(?=;|\\n)",
+			"begin": "(?<!\\w)(using)(?:\\s)+(namespace)(?:\\s)+((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<6>?)+>)(?:\\s)*+)?::)*\\s*+)?((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(?=;|\\n)",
 			"end": ";|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"1": {
@@ -19835,7 +16300,7 @@
 		"wordlike_operators": {
 			"patterns": [
 				{
-					"match": "(?<!\\w)(?:(?:noexcept)|(?:delete)|(?:not_eq)|(?:bitand)|(?:and_eq)|(?:xor_eq)|(?:compl)|(?:bitor)|(?:or_eq)|(?:not)|(?:new)|(?:xor)|(?:and)|(?:or))(?!\\w)",
+					"match": "(?<!\\w)(?:(?:noexcept)|(?:xor_eq)|(?:and_eq)|(?:delete)|(?:not_eq)|(?:bitand)|(?:bitor)|(?:compl)|(?:or_eq)|(?:not)|(?:xor)|(?:new)|(?:and)|(?:or))(?!\\w)",
 					"name": "keyword.operator.wordlike.cpp keyword.operator.$0.cpp"
 				}
 			]
diff --git a/extensions/lua/cgmanifest.json b/extensions/lua/cgmanifest.json
index 784ad5bbc194fd..c1b989094470ae 100644
--- a/extensions/lua/cgmanifest.json
+++ b/extensions/lua/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "sumneko/lua.tmbundle",
 					"repositoryUrl": "https://github.com/sumneko/lua.tmbundle",
-					"commitHash": "bc74f9230c3f07c0ecc1bc1727ad98d9e70aff5b"
+					"commitHash": "57be7c5cf8fa173f5f39806822725e503932ab45"
 				}
 			},
 			"licenseDetail": [
diff --git a/extensions/lua/syntaxes/lua.tmLanguage.json b/extensions/lua/syntaxes/lua.tmLanguage.json
index 3244f7683970e2..ac3de0811b3bac 100644
--- a/extensions/lua/syntaxes/lua.tmLanguage.json
+++ b/extensions/lua/syntaxes/lua.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/sumneko/lua.tmbundle/commit/bc74f9230c3f07c0ecc1bc1727ad98d9e70aff5b",
+	"version": "https://github.com/sumneko/lua.tmbundle/commit/57be7c5cf8fa173f5f39806822725e503932ab45",
 	"name": "Lua",
 	"scopeName": "source.lua",
 	"patterns": [
@@ -187,13 +187,17 @@
 			"name": "entity.name.class.lua"
 		},
 		{
-			"match": "(?<=[^.]\\.|:)\\b([a-zA-Z_][a-zA-Z0-9_]*)",
+			"match": "(?<=[^.]\\.|:)\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b(?!\\s*=\\s*\\b(function)\\b)",
 			"name": "entity.other.attribute.lua"
 		},
 		{
-			"match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b",
+			"match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b(?!\\s*=\\s*\\b(function)\\b)",
 			"name": "variable.other.lua"
 		},
+		{
+			"match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b(?=\\s*=\\s*\\b(function)\\b)",
+			"name": "entity.name.function.lua"
+		},
 		{
 			"match": "\\+|-|%|#|\\*|\\/|\\^|==?|~=|!=|<=?|>=?|(?<!\\.)\\.{2}(?!\\.)",
 			"name": "keyword.operator.lua"
@@ -434,6 +438,26 @@
 						}
 					]
 				},
+				{
+					"begin": "(?<=---\\s*)@enum",
+					"beginCaptures": {
+						"0": {
+							"name": "storage.type.annotation.lua"
+						}
+					},
+					"end": "(?=[\\n@#])",
+					"patterns": [
+						{
+							"begin": "\\b([a-zA-Z_\\*][a-zA-Z0-9_\\.\\*\\-]*)",
+							"beginCaptures": {
+								"0": {
+									"name": "variable.lua"
+								}
+							},
+							"end": "(?=\\n)"
+						}
+					]
+				},
 				{
 					"begin": "(?<=---\\s*)@type",
 					"beginCaptures": {
@@ -464,10 +488,56 @@
 									"name": "variable.lua"
 								}
 							},
+							"end": "(?=[\\n#])",
+							"patterns": [
+								{
+									"include": "#luadoc.type"
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "(?<=---\\s*)(@operator)\\s*(\\b[a-z]+)?",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.type.annotation.lua"
+						},
+						"2": {
+							"name": "support.function.library.lua"
+						}
+					},
+					"end": "(?=[\\n@#])",
+					"patterns": [
+						{
+							"include": "#luadoc.type"
+						}
+					]
+				},
+				{
+					"begin": "(?<=---\\s*)@cast",
+					"beginCaptures": {
+						"0": {
+							"name": "storage.type.annotation.lua"
+						}
+					},
+					"end": "(?=[\\n@#])",
+					"patterns": [
+						{
+							"begin": "\\b([a-zA-Z_\\*][a-zA-Z0-9_\\.\\*\\-]*)",
+							"beginCaptures": {
+								"0": {
+									"name": "variable.other.lua"
+								}
+							},
 							"end": "(?=\\n)",
 							"patterns": [
 								{
 									"include": "#luadoc.type"
+								},
+								{
+									"match": "([+-|])",
+									"name": "keyword.operator.lua"
 								}
 							]
 						}
@@ -492,7 +562,7 @@
 									"name": "keyword.operator.lua"
 								}
 							},
-							"end": "(?=\\n)",
+							"end": "(?=[\\n#])",
 							"patterns": [
 								{
 									"include": "#luadoc.type"
@@ -538,7 +608,7 @@
 									"name": "keyword.operator.lua"
 								}
 							},
-							"end": "(?=\\n)",
+							"end": "(?=[\\n#])",
 							"patterns": [
 								{
 									"include": "#string"
@@ -634,6 +704,33 @@
 					},
 					"end": "(?=[\\n@#])"
 				},
+				{
+					"begin": "(?<=---\\s*)@private",
+					"beginCaptures": {
+						"0": {
+							"name": "storage.type.annotation.lua"
+						}
+					},
+					"end": "(?=[\\n@#])"
+				},
+				{
+					"begin": "(?<=---\\s*)@protected",
+					"beginCaptures": {
+						"0": {
+							"name": "storage.type.annotation.lua"
+						}
+					},
+					"end": "(?=[\\n@#])"
+				},
+				{
+					"begin": "(?<=---\\s*)@package",
+					"beginCaptures": {
+						"0": {
+							"name": "storage.type.annotation.lua"
+						}
+					},
+					"end": "(?=[\\n@#])"
+				},
 				{
 					"begin": "(?<=---\\s*)@version",
 					"beginCaptures": {
@@ -748,7 +845,7 @@
 							"name": "keyword.control.lua"
 						}
 					},
-					"end": "(?=\\s)",
+					"end": "(?=[\\s#])",
 					"patterns": [
 						{
 							"match": "[\\(\\),:\\?][ \\t]*",
@@ -780,7 +877,7 @@
 				},
 				{
 					"begin": "(?=[a-zA-Z_\\.\\*\"'\\[])",
-					"end": "(?=[\\s\\)\\,\\?\\:\\}\\|])",
+					"end": "(?=[\\s\\)\\,\\?\\:\\}\\|#])",
 					"patterns": [
 						{
 							"match": "([a-zA-Z0-9_\\.\\*\\[\\]\\<\\>\\,\\-]+)(?<!,)[ \\t]*",
diff --git a/extensions/mangle-loader.js b/extensions/mangle-loader.js
index 0bd1ad81376b29..e8396d4a16e935 100644
--- a/extensions/mangle-loader.js
+++ b/extensions/mangle-loader.js
@@ -4,31 +4,50 @@
  *--------------------------------------------------------------------------------------------*/
 // @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/mangleTypeScript');
 
-let map;
+/**
+ * Map of project paths to mangled file contents
+ *
+ * @type {Map<string, Map<string, { out: string; sourceMap?: string }>>}
+ */
+const mangleMap = new Map();
+
 /**
  * @param {string} projectPath
  */
 function getMangledFileContents(projectPath) {
-	if (!map) {
-		const ts2tsMangler = new Mangler(projectPath, console.log);
-		map = ts2tsMangler.computeNewFileContents();
+	let entry = mangleMap.get(projectPath);
+	if (!entry) {
+		const log = (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data);
+		log(`Mangling ${projectPath}`);
+		const ts2tsMangler = new Mangler(projectPath, log);
+		entry = ts2tsMangler.computeNewFileContents();
+		mangleMap.set(projectPath, entry);
 	}
 
-	return map;
+	return entry;
 }
 
 /**
  * @type {webpack.LoaderDefinitionFunction}
  */
 module.exports = async function (source, sourceMap, meta) {
+	if (source !== fs.readFileSync(this.resourcePath).toString()) {
+		// File content has changed by previous webpack steps.
+		// Skip mangling.
+		return source;
+	}
+
 	const options = this.getOptions();
 	const callback = this.async();
 
 	const fileContentsMap = getMangledFileContents(options.configFile);
 
 	const newContents = fileContentsMap.get(this.resourcePath);
-	callback(null, newContents ?? source, sourceMap, meta);
+	callback(null, newContents?.out ?? source, sourceMap, meta);
 };
diff --git a/extensions/markdown-basics/package.json b/extensions/markdown-basics/package.json
index 69e4da10d230aa..9021acac8728c7 100644
--- a/extensions/markdown-basics/package.json
+++ b/extensions/markdown-basics/package.json
@@ -93,7 +93,8 @@
     "configurationDefaults": {
       "[markdown]": {
         "editor.unicodeHighlight.ambiguousCharacters": false,
-        "editor.unicodeHighlight.invisibleCharacters": false
+        "editor.unicodeHighlight.invisibleCharacters": false,
+        "diffEditor.ignoreTrimWhitespace": false
       }
     }
   },
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index a4d41a64548aba..f78d2158ac8c96 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -571,6 +571,13 @@
           "default": false,
           "description": "%configuration.markdown.occurrencesHighlight.enabled%",
           "scope": "resource"
+        },
+        "markdown.experimental.copyFiles.destination": {
+          "type": "object",
+          "markdownDescription": "%configuration.markdown.copyFiles.destination%",
+          "additionalProperties": {
+            "type": "string"
+          }
         }
       }
     },
@@ -621,7 +628,7 @@
     "watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose"
   },
   "dependencies": {
-    "@vscode/extension-telemetry": "0.7.1-preview",
+    "@vscode/extension-telemetry": "0.7.3-preview",
     "dompurify": "^2.4.1",
     "highlight.js": "^11.4.0",
     "markdown-it": "^12.3.2",
@@ -640,7 +647,7 @@
     "@types/vscode-webview": "^1.57.0",
     "lodash.throttle": "^4.1.1",
     "vscode-languageserver-types": "^3.17.2",
-    "vscode-markdown-languageservice": "^0.2.0"
+    "vscode-markdown-languageservice": "^0.3.0-alpha.3"
   },
   "repository": {
     "type": "git",
diff --git a/extensions/markdown-language-features/package.nls.json b/extensions/markdown-language-features/package.nls.json
index 28a176adf22e7f..42c030abb1067b 100644
--- a/extensions/markdown-language-features/package.nls.json
+++ b/extensions/markdown-language-features/package.nls.json
@@ -4,7 +4,7 @@
 	"markdown.preview.breaks.desc": "Sets how line-breaks are rendered in the Markdown preview. Setting it to 'true' creates a <br> for newlines inside paragraphs.",
 	"markdown.preview.linkify": "Convert URL-like text to links in the Markdown preview.",
 	"markdown.preview.typographer": "Enable some language-neutral replacement and quotes beautification in the Markdown preview.",
-	"markdown.preview.doubleClickToSwitchToEditor.desc": "Double click in the Markdown preview to switch to the editor.",
+	"markdown.preview.doubleClickToSwitchToEditor.desc": "Double-click in the Markdown preview to switch to the editor.",
 	"markdown.preview.fontFamily.desc": "Controls the font family used in the Markdown preview.",
 	"markdown.preview.fontSize.desc": "Controls the font size in pixels used in the Markdown preview.",
 	"markdown.preview.lineHeight.desc": "Controls the line height used in the Markdown preview. This number is relative to the font size.",
@@ -49,5 +49,6 @@
 	"configuration.markdown.updateLinksOnFileMove.include.property": "The glob pattern to match file paths against. Set to true to enable the pattern.",
 	"configuration.markdown.updateLinksOnFileMove.enableForDirectories": "Enable updating links when a directory is moved or renamed in the workspace.",
 	"configuration.markdown.occurrencesHighlight.enabled": "Enable highlighting link occurrences in the current document.",
+	"configuration.markdown.copyFiles.destination": "Defines where files copied into a Markdown document should be created. This is a map from globs that match on the Markdown document to destinations.\n\nThe destinations may use the following variables:\n\n- `${documentFileName}` — The full filename of the Markdown document, for example `readme.md`.\n- `${documentBaseName}` — The basename of Markdown document, for example `readme`.\n- `${documentExtName}` — The extension of the Markdown document, for example `md`.\n- `${documentDirName}` — The name of the Markdown document's parent directory.\n- `${documentWorkspaceFolder}` — The workspace folder for the Markdown document, for examples, `/Users/me/myProject`. This is the same as `${documentDirName}` if the file is not part of in a workspace.\n- `${fileName}` — The file name of the dropped file, for example `image.png`.",
 	"workspaceTrust": "Required for loading styles configured in the workspace."
 }
diff --git a/extensions/markdown-language-features/preview-src/index.ts b/extensions/markdown-language-features/preview-src/index.ts
index 2f0b0ba24e8a94..174a7d35692e4e 100644
--- a/extensions/markdown-language-features/preview-src/index.ts
+++ b/extensions/markdown-language-features/preview-src/index.ts
@@ -57,12 +57,12 @@ function doAfterImagesLoaded(cb: () => void) {
 }
 
 onceDocumentLoaded(() => {
-	const scrollTo = !isNaN(state.line) ? state.line : state.scrollProgress;
+	const scrollProgress = state.scrollProgress;
 
-	if (typeof scrollTo === 'number' && !settings.settings.fragment) {
+	if (typeof scrollProgress === 'number' && !settings.settings.fragment) {
 		doAfterImagesLoaded(() => {
 			scrollDisabledCount += 1;
-			window.scrollTo(0, scrollTo * document.body.clientHeight);
+			window.scrollTo(0, scrollProgress * document.body.clientHeight);
 		});
 		return;
 	}
diff --git a/extensions/markdown-language-features/server/package.json b/extensions/markdown-language-features/server/package.json
index dc58bafec5faf6..7d763a66aec333 100644
--- a/extensions/markdown-language-features/server/package.json
+++ b/extensions/markdown-language-features/server/package.json
@@ -18,7 +18,7 @@
     "vscode-languageserver": "^8.0.2",
     "vscode-languageserver-textdocument": "^1.0.5",
     "vscode-languageserver-types": "^3.17.1",
-    "vscode-markdown-languageservice": "^0.3.0-alpha.2",
+    "vscode-markdown-languageservice": "^0.3.0-alpha.3",
     "vscode-uri": "^3.0.3"
   },
   "devDependencies": {
diff --git a/extensions/markdown-language-features/server/src/configuration.ts b/extensions/markdown-language-features/server/src/configuration.ts
index c5668003a167d8..4b7477a1316abe 100644
--- a/extensions/markdown-language-features/server/src/configuration.ts
+++ b/extensions/markdown-language-features/server/src/configuration.ts
@@ -8,7 +8,7 @@ import { Disposable } from './util/dispose';
 
 export type ValidateEnabled = 'ignore' | 'warning' | 'error' | 'hint';
 
-interface Settings {
+export interface Settings {
 	readonly markdown: {
 		readonly occurrencesHighlight: {
 			readonly enabled: boolean;
diff --git a/extensions/markdown-language-features/server/src/server.ts b/extensions/markdown-language-features/server/src/server.ts
index 3711832b1b6856..fb9d690b2f558c 100644
--- a/extensions/markdown-language-features/server/src/server.ts
+++ b/extensions/markdown-language-features/server/src/server.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken, Connection, InitializeParams, InitializeResult, NotebookDocuments, ResponseError, TextDocuments } from 'vscode-languageserver';
+import { CancellationToken, CompletionRegistrationOptions, CompletionRequest, Connection, Disposable, DocumentHighlightRegistrationOptions, DocumentHighlightRequest, InitializeParams, InitializeResult, NotebookDocuments, ResponseError, TextDocuments } from 'vscode-languageserver';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import * as lsp from 'vscode-languageserver-types';
 import * as md from 'vscode-markdown-languageservice';
 import { URI } from 'vscode-uri';
 import { getLsConfiguration, LsConfiguration } from './config';
-import { ConfigurationManager } from './configuration';
+import { ConfigurationManager, Settings } from './configuration';
 import { registerValidateSupport } from './languageFeatures/diagnostics';
 import { LogFunctionLogger } from './logging';
 import * as protocol from './protocol';
@@ -77,7 +77,7 @@ export async function startServer(connection: Connection, serverConfig: {
 		});
 
 		registerCompletionsSupport(connection, documents, mdLs, configurationManager);
-		registerDocumentHightlightSupport(connection, documents, mdLs, configurationManager);
+		registerDocumentHighlightSupport(connection, documents, mdLs, configurationManager);
 		registerValidateSupport(connection, workspace, documents, mdLs, configurationManager, serverConfig.logger);
 
 		return {
@@ -89,10 +89,8 @@ export async function startServer(connection: Connection, serverConfig: {
 					workspaceDiagnostics: false,
 				},
 				codeActionProvider: { resolveProvider: true },
-				completionProvider: { triggerCharacters: ['.', '/', '#'] },
 				definitionProvider: true,
 				documentLinkProvider: { resolveProvider: true },
-				documentHighlightProvider: true,
 				documentSymbolProvider: true,
 				foldingRangeProvider: true,
 				referencesProvider: true,
@@ -257,6 +255,27 @@ export async function startServer(connection: Connection, serverConfig: {
 	connection.listen();
 }
 
+function registerDynamicClientFeature(
+	config: ConfigurationManager,
+	isEnabled: (settings: Settings | undefined) => boolean,
+	register: () => Promise<Disposable>,
+) {
+	let registration: Promise<IDisposable> | undefined;
+	function update() {
+		const settings = config.getSettings();
+		if (isEnabled(settings)) {
+			if (!registration) {
+				registration = register();
+			}
+		} else {
+			registration?.then(x => x.dispose());
+			registration = undefined;
+		}
+	}
+
+	update();
+	return config.onDidChangeConfiguration(() => update());
+}
 
 function registerCompletionsSupport(
 	connection: Connection,
@@ -264,43 +283,29 @@ function registerCompletionsSupport(
 	ls: md.IMdLanguageService,
 	config: ConfigurationManager,
 ): IDisposable {
-	// let registration: Promise<IDisposable> | undefined;
-	function update() {
-		// TODO: client still makes the request in this case. Figure our how to properly unregister.
-		return;
-		// const settings = config.getSettings();
-		// if (settings?.markdown.suggest.paths.enabled) {
-		// 	if (!registration) {
-		// 		registration = connection.client.register(CompletionRequest.type);
-		// 	}
-		// } else {
-		// 	registration?.then(x => x.dispose());
-		// 	registration = undefined;
-		// }
-	}
-
 	connection.onCompletion(async (params, token): Promise<lsp.CompletionItem[]> => {
-		try {
-			const settings = config.getSettings();
-			if (!settings?.markdown.suggest.paths.enabled) {
-				return [];
-			}
+		const settings = config.getSettings();
+		if (!settings?.markdown.suggest.paths.enabled) {
+			return [];
+		}
 
-			const document = documents.get(params.textDocument.uri);
-			if (document) {
-				return await ls.getCompletionItems(document, params.position, params.context!, token);
-			}
-		} catch (e) {
-			console.error(e.stack);
+		const document = documents.get(params.textDocument.uri);
+		if (document) {
+			return ls.getCompletionItems(document, params.position, params.context!, token);
 		}
 		return [];
 	});
 
-	update();
-	return config.onDidChangeConfiguration(() => update());
+	return registerDynamicClientFeature(config, (settings) => !!settings?.markdown.suggest.paths.enabled, () => {
+		const registrationOptions: CompletionRegistrationOptions = {
+			documentSelector: null,
+			triggerCharacters: ['.', '/', '#'],
+		};
+		return connection.client.register(CompletionRequest.type, registrationOptions);
+	});
 }
 
-function registerDocumentHightlightSupport(
+function registerDocumentHighlightSupport(
 	connection: Connection,
 	documents: TextDocuments<md.ITextDocument>,
 	mdLs: md.IMdLanguageService,
@@ -319,4 +324,11 @@ function registerDocumentHightlightSupport(
 
 		return mdLs!.getDocumentHighlights(document, params.position, token);
 	});
+
+	return registerDynamicClientFeature(configurationManager, (settings) => !!settings?.markdown.occurrencesHighlight.enabled, () => {
+		const registrationOptions: DocumentHighlightRegistrationOptions = {
+			documentSelector: null,
+		};
+		return connection.client.register(DocumentHighlightRequest.type, registrationOptions);
+	});
 }
diff --git a/extensions/markdown-language-features/server/yarn.lock b/extensions/markdown-language-features/server/yarn.lock
index 3c867b8ff50c69..39b84519d7f6ba 100644
--- a/extensions/markdown-language-features/server/yarn.lock
+++ b/extensions/markdown-language-features/server/yarn.lock
@@ -47,10 +47,10 @@ vscode-languageserver@^8.0.2:
   dependencies:
     vscode-languageserver-protocol "3.17.2"
 
-vscode-markdown-languageservice@^0.3.0-alpha.2:
-  version "0.3.0-alpha.2"
-  resolved "https://registry.yarnpkg.com/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.3.0-alpha.2.tgz#7fe1b053001f4829586a7c15c08ce5bd2a3067d1"
-  integrity sha512-O8kcUV/jhUeafjSCMM3ZOGBnX8ro+GzQ+/Pj2iC8JDAlhEldG3cXtexkRtx5EBO9DrkfY80ORXWf1VUXjXrhwA==
+vscode-markdown-languageservice@^0.3.0-alpha.3:
+  version "0.3.0-alpha.3"
+  resolved "https://registry.yarnpkg.com/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.3.0-alpha.3.tgz#219a4880cfc0ea037b5a1833bc0b0039bfd1e2db"
+  integrity sha512-KPjIuCkSqabkzci7TnlLKep5FYIC45tS7UC5H8zoOii7aoKJru5mZBDXJt86bM3XTgnfpW7rUYqhNnvXbbCBbw==
   dependencies:
     "@vscode/l10n" "^0.0.10"
     picomatch "^2.3.1"
diff --git a/extensions/markdown-language-features/src/commands/insertResource.ts b/extensions/markdown-language-features/src/commands/insertResource.ts
index 66041df75d30b2..7cdd861cb5b87a 100644
--- a/extensions/markdown-language-features/src/commands/insertResource.ts
+++ b/extensions/markdown-language-features/src/commands/insertResource.ts
@@ -6,12 +6,11 @@
 import * as vscode from 'vscode';
 import { Utils } from 'vscode-uri';
 import { Command } from '../commandManager';
-import { createUriListSnippet, getParentDocumentUri, imageFileExtensions } from '../languageFeatures/dropIntoEditor';
+import { createUriListSnippet, getParentDocumentUri, imageFileExtensions } from '../languageFeatures/copyFiles/dropIntoEditor';
 import { coalesce } from '../util/arrays';
 import { Schemes } from '../util/schemes';
 
 
-
 export class InsertLinkFromWorkspace implements Command {
 	public readonly id = 'markdown.editor.insertLinkFromWorkspace';
 
diff --git a/extensions/markdown-language-features/src/extension.shared.ts b/extensions/markdown-language-features/src/extension.shared.ts
index dbfafc2bdb5506..ce709783d0bedd 100644
--- a/extensions/markdown-language-features/src/extension.shared.ts
+++ b/extensions/markdown-language-features/src/extension.shared.ts
@@ -7,9 +7,9 @@ import * as vscode from 'vscode';
 import { MdLanguageClient } from './client/client';
 import { CommandManager } from './commandManager';
 import { registerMarkdownCommands } from './commands/index';
-import { registerPasteSupport } from './languageFeatures/copyPaste';
+import { registerPasteSupport } from './languageFeatures/copyFiles/copyPaste';
 import { registerDiagnosticSupport } from './languageFeatures/diagnostics';
-import { registerDropIntoEditorSupport } from './languageFeatures/dropIntoEditor';
+import { registerDropIntoEditorSupport } from './languageFeatures/copyFiles/dropIntoEditor';
 import { registerFindFileReferenceSupport } from './languageFeatures/fileReferences';
 import { registerUpdateLinksOnRename } from './languageFeatures/linkUpdater';
 import { ILogger } from './logging';
diff --git a/extensions/markdown-language-features/src/languageFeatures/copyFiles/copyFiles.ts b/extensions/markdown-language-features/src/languageFeatures/copyFiles/copyFiles.ts
new file mode 100644
index 00000000000000..dc1e5924829e58
--- /dev/null
+++ b/extensions/markdown-language-features/src/languageFeatures/copyFiles/copyFiles.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 * as path from 'path';
+import * as picomatch from 'picomatch';
+import * as vscode from 'vscode';
+import { Utils } from 'vscode-uri';
+import { getParentDocumentUri } from './dropIntoEditor';
+
+
+export async function getNewFileName(document: vscode.TextDocument, file: vscode.DataTransferFile): Promise<vscode.Uri> {
+	const desiredPath = getDesiredNewFilePath(document, file);
+
+	const root = Utils.dirname(desiredPath);
+	const ext = path.extname(file.name);
+	const baseName = path.basename(file.name, ext);
+	for (let i = 0; ; ++i) {
+		const name = i === 0 ? baseName : `${baseName}-${i}`;
+		const uri = vscode.Uri.joinPath(root, `${name}${ext}`);
+		try {
+			await vscode.workspace.fs.stat(uri);
+		} catch {
+			// Does not exist
+			return uri;
+		}
+	}
+}
+
+function getDesiredNewFilePath(document: vscode.TextDocument, file: vscode.DataTransferFile): vscode.Uri {
+	const docUri = getParentDocumentUri(document);
+	const config = vscode.workspace.getConfiguration('markdown').get<Record<string, string>>('experimental.copyFiles.destination') ?? {};
+	for (const [rawGlob, rawDest] of Object.entries(config)) {
+		for (const glob of parseGlob(rawGlob)) {
+			if (picomatch.isMatch(docUri.path, glob)) {
+				return resolveCopyDestination(docUri, file.name, rawDest, uri => vscode.workspace.getWorkspaceFolder(uri)?.uri);
+			}
+		}
+	}
+
+	// Default to next to current file
+	return vscode.Uri.joinPath(Utils.dirname(docUri), file.name);
+}
+
+function parseGlob(rawGlob: string): Iterable<string> {
+	if (rawGlob.startsWith('/')) {
+		// Anchor to workspace folders
+		return (vscode.workspace.workspaceFolders ?? []).map(folder => vscode.Uri.joinPath(folder.uri, rawGlob).path);
+	}
+
+	// Relative path, so implicitly track on ** to match everything
+	if (!rawGlob.startsWith('**')) {
+		return ['**/' + rawGlob];
+	}
+
+	return [rawGlob];
+}
+
+type GetWorkspaceFolder = (documentUri: vscode.Uri) => vscode.Uri | undefined;
+
+export function resolveCopyDestination(documentUri: vscode.Uri, fileName: string, dest: string, getWorkspaceFolder: GetWorkspaceFolder): vscode.Uri {
+	const resolvedDest = resolveCopyDestinationSetting(documentUri, fileName, dest, getWorkspaceFolder);
+
+	if (resolvedDest.startsWith('/')) {
+		// Absolute path
+		return Utils.resolvePath(documentUri, resolvedDest);
+	}
+
+	// Relative to document
+	const dirName = Utils.dirname(documentUri);
+	return Utils.resolvePath(dirName, resolvedDest);
+}
+
+
+function resolveCopyDestinationSetting(documentUri: vscode.Uri, fileName: string, dest: string, getWorkspaceFolder: GetWorkspaceFolder): string {
+	let outDest = dest;
+
+	// Destination that start with `/` implicitly means go to workspace root
+	if (outDest.startsWith('/')) {
+		outDest = '${documentWorkspaceFolder}/' + outDest.slice(1);
+	}
+
+	// Destination that ends with `/` implicitly needs a fileName
+	if (outDest.endsWith('/')) {
+		outDest += '${fileName}';
+	}
+
+	const documentDirName = Utils.dirname(documentUri);
+	const documentBaseName = Utils.basename(documentUri);
+	const documentExtName = Utils.extname(documentUri);
+
+	const workspaceFolder = getWorkspaceFolder(documentUri);
+
+	const vars = new Map<string, string>([
+		['documentDirName', documentDirName.path], //  Parent directory path
+		['documentFileName', documentBaseName], // Full filename: file.md
+		['documentBaseName', documentBaseName.slice(0, documentBaseName.length - documentExtName.length)], // Just the name: file
+		['documentExtName', documentExtName.replace('.', '')], // Just the file ext: md
+
+		// Workspace
+		['documentWorkspaceFolder', (workspaceFolder ?? documentDirName).path],
+
+		// File
+		['fileName', fileName],// Full file name
+	]);
+
+	return outDest.replaceAll(/\$\{(\w+)(?:\/([^\}]+?)\/([^\}]+?)\/)?\}/g, (_, name, pattern, replacement) => {
+		const entry = vars.get(name);
+		if (!entry) {
+			return '';
+		}
+
+		if (pattern && replacement) {
+			return entry.replace(new RegExp(pattern), replacement);
+		}
+
+		return entry;
+	});
+}
diff --git a/extensions/markdown-language-features/src/languageFeatures/copyPaste.ts b/extensions/markdown-language-features/src/languageFeatures/copyFiles/copyPaste.ts
similarity index 80%
rename from extensions/markdown-language-features/src/languageFeatures/copyPaste.ts
rename to extensions/markdown-language-features/src/languageFeatures/copyFiles/copyPaste.ts
index 0a39f9fabb44e8..1babe16107d7ec 100644
--- a/extensions/markdown-language-features/src/languageFeatures/copyPaste.ts
+++ b/extensions/markdown-language-features/src/languageFeatures/copyFiles/copyPaste.ts
@@ -3,10 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as path from 'path';
 import * as vscode from 'vscode';
-import { Utils } from 'vscode-uri';
-import { Schemes } from '../util/schemes';
+import { Schemes } from '../../util/schemes';
+import { getNewFileName } from './copyFiles';
 import { createUriListSnippet, tryGetUriListSnippet } from './dropIntoEditor';
 
 const supportedImageMimes = new Set([
@@ -59,7 +58,7 @@ class PasteEditProvider implements vscode.DocumentPasteEditProvider {
 			}
 		}
 
-		const uri = await this._getNewFileName(document, file);
+		const uri = await getNewFileName(document, file);
 		if (token.isCancellationRequested) {
 			return;
 		}
@@ -77,23 +76,6 @@ class PasteEditProvider implements vscode.DocumentPasteEditProvider {
 		pasteEdit.additionalEdit = workspaceEdit;
 		return pasteEdit;
 	}
-
-	private async _getNewFileName(document: vscode.TextDocument, file: vscode.DataTransferFile): Promise<vscode.Uri> {
-		const root = Utils.dirname(document.uri);
-
-		const ext = path.extname(file.name);
-		const baseName = path.basename(file.name, ext);
-		for (let i = 0; ; ++i) {
-			const name = i === 0 ? baseName : `${baseName}-${i}`;
-			const uri = vscode.Uri.joinPath(root, `${name}${ext}`);
-			try {
-				await vscode.workspace.fs.stat(uri);
-			} catch {
-				// Does not exist
-				return uri;
-			}
-		}
-	}
 }
 
 export function registerPasteSupport(selector: vscode.DocumentSelector,) {
diff --git a/extensions/markdown-language-features/src/languageFeatures/dropIntoEditor.ts b/extensions/markdown-language-features/src/languageFeatures/copyFiles/dropIntoEditor.ts
similarity index 93%
rename from extensions/markdown-language-features/src/languageFeatures/dropIntoEditor.ts
rename to extensions/markdown-language-features/src/languageFeatures/copyFiles/dropIntoEditor.ts
index 6cdf2b00174db3..e91d9d11008cd3 100644
--- a/extensions/markdown-language-features/src/languageFeatures/dropIntoEditor.ts
+++ b/extensions/markdown-language-features/src/languageFeatures/copyFiles/dropIntoEditor.ts
@@ -6,7 +6,7 @@
 import * as path from 'path';
 import * as vscode from 'vscode';
 import * as URI from 'vscode-uri';
-import { Schemes } from '../util/schemes';
+import { Schemes } from '../../util/schemes';
 
 export const imageFileExtensions = new Set<string>([
 	'bmp',
@@ -103,10 +103,11 @@ export function createUriListSnippet(document: vscode.TextDocument, uris: readon
 function getMdPath(dir: vscode.Uri | undefined, file: vscode.Uri) {
 	if (dir && dir.scheme === file.scheme && dir.authority === file.authority) {
 		if (file.scheme === Schemes.file) {
-			// On windows, we must use the native `path.resolve` to generate the relative path
+			// On windows, we must use the native `path.relative` to generate the relative path
 			// so that drive-letters are resolved cast insensitively. However we then want to
 			// convert back to a posix path to insert in to the document.
-			return encodeURI(path.posix.normalize(path.relative(dir.fsPath, file.fsPath)));
+			const relativePath = path.relative(dir.fsPath, file.fsPath);
+			return encodeURI(path.posix.normalize(relativePath.split(path.sep).join(path.posix.sep)));
 		}
 
 		return encodeURI(path.posix.relative(dir.path, file.path));
diff --git a/extensions/markdown-language-features/src/preview/preview.ts b/extensions/markdown-language-features/src/preview/preview.ts
index 64d6e03b2b332d..3d04c6db3095f4 100644
--- a/extensions/markdown-language-features/src/preview/preview.ts
+++ b/extensions/markdown-language-features/src/preview/preview.ts
@@ -755,8 +755,6 @@ export class DynamicMarkdownPreview extends Disposable implements IManagedMarkdo
 				default:
 					return;
 			}
-		} else if (!scrollLocation) {
-			scrollLocation = new StartingScrollLine(0);
 		}
 
 		this._preview.dispose();
diff --git a/extensions/markdown-language-features/src/test/copyFile.test.ts b/extensions/markdown-language-features/src/test/copyFile.test.ts
new file mode 100644
index 00000000000000..e557d29a04ebc3
--- /dev/null
+++ b/extensions/markdown-language-features/src/test/copyFile.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 * as assert from 'assert';
+import 'mocha';
+import * as vscode from 'vscode';
+import { resolveCopyDestination } from '../languageFeatures/copyFiles/copyFiles';
+
+
+suite.only('resolveCopyDestination', () => {
+
+	test('Relative destinations should resolve next to document', async () => {
+		const documentUri = vscode.Uri.parse('test://projects/project/sub/readme.md');
+
+		{
+			const dest = resolveCopyDestination(documentUri, 'img.png', '${fileName}', () => vscode.Uri.parse('test://projects/project/'));
+			assert.strictEqual(dest.toString(), 'test://projects/project/sub/img.png');
+		}
+		{
+			const dest = resolveCopyDestination(documentUri, 'img.png', './${fileName}', () => vscode.Uri.parse('test://projects/project/'));
+			assert.strictEqual(dest.toString(), 'test://projects/project/sub/img.png');
+		}
+		{
+			const dest = resolveCopyDestination(documentUri, 'img.png', '../${fileName}', () => vscode.Uri.parse('test://projects/project/'));
+			assert.strictEqual(dest.toString(), 'test://projects/project/img.png');
+		}
+	});
+
+	test('Destination starting with / should go to workspace root', async () => {
+		const documentUri = vscode.Uri.parse('test://projects/project/sub/readme.md');
+		const dest = resolveCopyDestination(documentUri, 'img.png', '/${fileName}', () => vscode.Uri.parse('test://projects/project/'));
+
+		assert.strictEqual(dest.toString(), 'test://projects/project/img.png');
+	});
+
+	test('If there is no workspace root, / should resolve to document dir', async () => {
+		const documentUri = vscode.Uri.parse('test://projects/project/sub/readme.md');
+		const dest = resolveCopyDestination(documentUri, 'img.png', '/${fileName}', () => undefined);
+
+		assert.strictEqual(dest.toString(), 'test://projects/project/sub/img.png');
+	});
+
+	test('If path ends in /, we should automatically add the fileName', async () => {
+		{
+			const documentUri = vscode.Uri.parse('test://projects/project/sub/readme.md');
+			const dest = resolveCopyDestination(documentUri, 'img.png', 'images/', () => vscode.Uri.parse('test://projects/project/'));
+			assert.strictEqual(dest.toString(), 'test://projects/project/sub/images/img.png');
+		}
+		{
+			const documentUri = vscode.Uri.parse('test://projects/project/sub/readme.md');
+			const dest = resolveCopyDestination(documentUri, 'img.png', './', () => vscode.Uri.parse('test://projects/project/'));
+			assert.strictEqual(dest.toString(), 'test://projects/project/sub/img.png');
+		}
+		{
+			const documentUri = vscode.Uri.parse('test://projects/project/sub/readme.md');
+			const dest = resolveCopyDestination(documentUri, 'img.png', '/', () => vscode.Uri.parse('test://projects/project/'));
+
+			assert.strictEqual(dest.toString(), 'test://projects/project/img.png');
+		}
+	});
+
+	test('Basic transform', async () => {
+		const documentUri = vscode.Uri.parse('test://projects/project/sub/readme.md');
+		const dest = resolveCopyDestination(documentUri, 'img.png', '${fileName/.png/.gif/}', () => undefined);
+
+		assert.strictEqual(dest.toString(), 'test://projects/project/sub/img.gif');
+	});
+
+	test('transforms should support capture groups', async () => {
+		const documentUri = vscode.Uri.parse('test://projects/project/sub/readme.md');
+		const dest = resolveCopyDestination(documentUri, 'img.png', '${fileName/(.+)\\.(.+)/$2.$1/}', () => undefined);
+
+		assert.strictEqual(dest.toString(), 'test://projects/project/sub/png.img');
+	});
+});
diff --git a/extensions/markdown-language-features/src/test/index.ts b/extensions/markdown-language-features/src/test/index.ts
index 2f00d0d5338673..91e28d38e9545d 100644
--- a/extensions/markdown-language-features/src/test/index.ts
+++ b/extensions/markdown-language-features/src/test/index.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-const path = require('path');
-const testRunner = require('../../../../test/integration/electron/testrunner');
+import * as path from 'path';
+import * as testRunner from '../../../../test/integration/electron/testrunner';
 
-const options: any = {
+const options: import('mocha').MochaOptions = {
 	ui: 'tdd',
 	color: true,
 	timeout: 60000
diff --git a/extensions/markdown-language-features/yarn.lock b/extensions/markdown-language-features/yarn.lock
index d43eb364a3cd37..5bc183c0c180c4 100644
--- a/extensions/markdown-language-features/yarn.lock
+++ b/extensions/markdown-language-features/yarn.lock
@@ -243,16 +243,21 @@
   resolved "https://registry.yarnpkg.com/@types/vscode-webview/-/vscode-webview-1.57.0.tgz#bad5194d45ae8d03afc1c0f67f71ff5e7a243bbf"
   integrity sha512-x3Cb/SMa1IwRHfSvKaZDZOTh4cNoG505c3NjTqGlMC082m++x/ETUmtYniDsw6SSmYzZXO8KBNhYxR0+VqymqA==
 
-"@vscode/extension-telemetry@0.7.1-preview":
-  version "0.7.1-preview"
-  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.7.1-preview.tgz#1b954b8932b7f27a3993abda25299b8ba7f97233"
-  integrity sha512-7GdA8lMrcMhRfFxVpk7KBNbx+Bh/OpG702C1uPcyOQqp5lH1txJ/8SZAacFqFMKLRnBdGlJRKBREQe/Fs1X/eQ==
+"@vscode/extension-telemetry@0.7.3-preview":
+  version "0.7.3-preview"
+  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.7.3-preview.tgz#3e45609c862022e7eec52e47fe45176149d82b6c"
+  integrity sha512-V+TanZXj8jhCX8mwGHbRDOTJ5YSWCmngHKs7ZrRoR7sXc4vZYQX+1syp07hDX2BVnPpuBHJiovZ8GZ4zbmQvYw==
   dependencies:
     "@microsoft/1ds-core-js" "^3.2.8"
     "@microsoft/1ds-post-js" "^3.2.8"
     "@microsoft/applicationinsights-web-basic" "^2.8.9"
     applicationinsights "2.3.6"
 
+"@vscode/l10n@^0.0.10":
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/@vscode/l10n/-/l10n-0.0.10.tgz#9c513107c690c0dd16e3ec61e453743de15ebdb0"
+  integrity sha512-E1OCmDcDWa0Ya7vtSjp/XfHFGqYJfh+YPC1RkATU71fTac+j1JjCcB3qwSzmlKAighx2WxhLlfhS0RwAN++PFQ==
+
 applicationinsights@2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-2.3.6.tgz#91277ce44e5f6d2f85336922c05d90f8699c2e70"
@@ -601,22 +606,17 @@ vscode-languageserver-types@3.17.2, vscode-languageserver-types@^3.17.1, vscode-
   resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz#b2c2e7de405ad3d73a883e91989b850170ffc4f2"
   integrity sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA==
 
-vscode-markdown-languageservice@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.2.0.tgz#93e230a1ed826786792e820a6e993e50139a0119"
-  integrity sha512-3Jh7/eN6zEPqfkT6cjL+AwGoQ7euL8RtW3FYf24IfPksz4nAZJcRibRtpSdlCaOKpwEoy/f5Axh94cmWPIGBMw==
+vscode-markdown-languageservice@^0.3.0-alpha.3:
+  version "0.3.0-alpha.3"
+  resolved "https://registry.yarnpkg.com/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.3.0-alpha.3.tgz#219a4880cfc0ea037b5a1833bc0b0039bfd1e2db"
+  integrity sha512-KPjIuCkSqabkzci7TnlLKep5FYIC45tS7UC5H8zoOii7aoKJru5mZBDXJt86bM3XTgnfpW7rUYqhNnvXbbCBbw==
   dependencies:
+    "@vscode/l10n" "^0.0.10"
     picomatch "^2.3.1"
     vscode-languageserver-textdocument "^1.0.5"
     vscode-languageserver-types "^3.17.1"
-    vscode-nls "^5.0.1"
     vscode-uri "^3.0.3"
 
-vscode-nls@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.1.tgz#ba23fc4d4420d25e7f886c8e83cbdcec47aa48b2"
-  integrity sha512-hHQV6iig+M21lTdItKPkJAaWrxALQb/nqpVffakO4knJOh3DrU2SXOMzUzNgo1eADPzu3qSsJY1weCzvR52q9A==
-
 vscode-uri@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.3.tgz#a95c1ce2e6f41b7549f86279d19f47951e4f4d84"
diff --git a/extensions/markdown-math/yarn.lock b/extensions/markdown-math/yarn.lock
index 7609023fa3cf25..52eff595703c7b 100644
--- a/extensions/markdown-math/yarn.lock
+++ b/extensions/markdown-math/yarn.lock
@@ -3,8 +3,8 @@
 
 
 "@iktakahiro/markdown-it-katex@mjbvz/markdown-it-katex":
-  version "4.0.2"
-  resolved "https://codeload.github.com/mjbvz/markdown-it-katex/tar.gz/19f98f10f7d57f6e09049ddaced0da89b73423c5"
+  version "4.0.4"
+  resolved "https://codeload.github.com/mjbvz/markdown-it-katex/tar.gz/cfcbc640a2780f2349d4e137ad51638f39279aa7"
   dependencies:
     katex "^0.16.2"
 
@@ -24,8 +24,8 @@ commander@^8.0.0:
   integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
 
 katex@^0.16.2:
-  version "0.16.2"
-  resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.2.tgz#9d3dc2a7e65fb8aa31101b1f86888ec40eed7b24"
-  integrity sha512-70DJdQAyh9EMsthw3AaQlDyFf54X7nWEUIa5W+rq8XOpEk//w5Th7/8SqFqpvi/KZ2t6MHUj4f9wLmztBmAYQA==
+  version "0.16.4"
+  resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.4.tgz#87021bc3bbd80586ef715aeb476794cba6a49ad4"
+  integrity sha512-WudRKUj8yyBeVDI4aYMNxhx5Vhh2PjpzQw1GRu/LVGqL4m1AxwD1GcUp0IMbdJaf5zsjtj8ghP0DOQRYhroNkw==
   dependencies:
     commander "^8.0.0"
diff --git a/extensions/media-preview/media/audioPreview.js b/extensions/media-preview/media/audioPreview.js
index ea5d6f64ea4847..f6c7b2a7452881 100644
--- a/extensions/media-preview/media/audioPreview.js
+++ b/extensions/media-preview/media/audioPreview.js
@@ -6,6 +6,7 @@
 "use strict";
 
 (function () {
+	// @ts-ignore
 	const vscode = acquireVsCodeApi();
 
 	function getSettings() {
@@ -62,7 +63,8 @@
 		});
 	}
 
-	document.querySelector('.open-file-link').addEventListener('click', () => {
+	document.querySelector('.open-file-link')?.addEventListener('click', (e) => {
+		e.preventDefault();
 		vscode.postMessage({
 			type: 'reopen-as-text',
 		});
diff --git a/extensions/media-preview/media/imagePreview.js b/extensions/media-preview/media/imagePreview.js
index fffdb7f69719ba..92a77fb3f85539 100644
--- a/extensions/media-preview/media/imagePreview.js
+++ b/extensions/media-preview/media/imagePreview.js
@@ -61,6 +61,7 @@
 	const settings = getSettings();
 	const isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0;
 
+	// @ts-ignore
 	const vscode = acquireVsCodeApi();
 
 	const initialState = vscode.getState() || { scale: 'fit', offsetX: 0, offsetY: 0 };
@@ -312,7 +313,8 @@
 
 	image.src = settings.src;
 
-	document.querySelector('.open-file-link').addEventListener('click', () => {
+	document.querySelector('.open-file-link')?.addEventListener('click', (e) => {
+		e.preventDefault();
 		vscode.postMessage({
 			type: 'reopen-as-text',
 		});
diff --git a/extensions/media-preview/media/videoPreview.js b/extensions/media-preview/media/videoPreview.js
index 54aa60ad86fa5d..4cf22d3b446853 100644
--- a/extensions/media-preview/media/videoPreview.js
+++ b/extensions/media-preview/media/videoPreview.js
@@ -6,6 +6,7 @@
 "use strict";
 
 (function () {
+	// @ts-ignore
 	const vscode = acquireVsCodeApi();
 
 	function getSettings() {
@@ -62,7 +63,8 @@
 		});
 	}
 
-	document.querySelector('.open-file-link').addEventListener('click', () => {
+	document.querySelector('.open-file-link')?.addEventListener('click', (e) => {
+		e.preventDefault();
 		vscode.postMessage({
 			type: 'reopen-as-text',
 		});
diff --git a/extensions/media-preview/package.json b/extensions/media-preview/package.json
index de0f90feb3a163..d1a07398474132 100644
--- a/extensions/media-preview/package.json
+++ b/extensions/media-preview/package.json
@@ -104,7 +104,8 @@
     "watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose"
   },
   "dependencies": {
-    "@vscode/extension-telemetry": "0.7.1-preview"
+    "@vscode/extension-telemetry": "0.7.3-preview",
+    "vscode-uri": "^3.0.6"
   },
   "repository": {
     "type": "git",
diff --git a/extensions/media-preview/src/mediaPreview.ts b/extensions/media-preview/src/mediaPreview.ts
index 424f197cc3407e..26d1e25dbaae47 100644
--- a/extensions/media-preview/src/mediaPreview.ts
+++ b/extensions/media-preview/src/mediaPreview.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
+import { Utils } from 'vscode-uri';
 import { BinarySizeStatusBarEntry } from './binarySizeStatusBarEntry';
 import { Disposable } from './util/dispose';
 
@@ -30,15 +31,11 @@ export abstract class MediaPreview extends Disposable {
 	) {
 		super();
 
-		const resourceRoot = resource.with({
-			path: resource.path.replace(/\/[^\/]+?\.\w+$/, '/'),
-		});
-
 		webviewEditor.webview.options = {
 			enableScripts: true,
 			enableForms: false,
 			localResourceRoots: [
-				resourceRoot,
+				Utils.dirname(resource),
 				extensionRoot,
 			]
 		};
diff --git a/extensions/media-preview/tsconfig.json b/extensions/media-preview/tsconfig.json
index c5194e2e33c812..fcd79775de5f88 100644
--- a/extensions/media-preview/tsconfig.json
+++ b/extensions/media-preview/tsconfig.json
@@ -1,8 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
-		"outDir": "./out",
-		"types": []
+		"outDir": "./out"
 	},
 	"include": [
 		"src/**/*",
diff --git a/extensions/media-preview/yarn.lock b/extensions/media-preview/yarn.lock
index 21e4347f845c3b..832b19925fda69 100644
--- a/extensions/media-preview/yarn.lock
+++ b/extensions/media-preview/yarn.lock
@@ -186,10 +186,10 @@
   dependencies:
     "@types/node" "*"
 
-"@vscode/extension-telemetry@0.7.1-preview":
-  version "0.7.1-preview"
-  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.7.1-preview.tgz#1b954b8932b7f27a3993abda25299b8ba7f97233"
-  integrity sha512-7GdA8lMrcMhRfFxVpk7KBNbx+Bh/OpG702C1uPcyOQqp5lH1txJ/8SZAacFqFMKLRnBdGlJRKBREQe/Fs1X/eQ==
+"@vscode/extension-telemetry@0.7.3-preview":
+  version "0.7.3-preview"
+  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.7.3-preview.tgz#3e45609c862022e7eec52e47fe45176149d82b6c"
+  integrity sha512-V+TanZXj8jhCX8mwGHbRDOTJ5YSWCmngHKs7ZrRoR7sXc4vZYQX+1syp07hDX2BVnPpuBHJiovZ8GZ4zbmQvYw==
   dependencies:
     "@microsoft/1ds-core-js" "^3.2.8"
     "@microsoft/1ds-post-js" "^3.2.8"
@@ -405,6 +405,11 @@ uuid@^8.3.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
+vscode-uri@^3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.6.tgz#5e6e2e1a4170543af30151b561a41f71db1d6f91"
+  integrity sha512-fmL7V1eiDBFRRnu+gfRWTzyPpNIHJTc4mWnFkwBUmO9U3KPgJAmTx7oxi2bl/Rh6HLdU7+4C9wlj0k2E4AdKFQ==
+
 webidl-conversions@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
diff --git a/extensions/merge-conflict/package.json b/extensions/merge-conflict/package.json
index afa226bf69404c..0cf8db565b5665 100644
--- a/extensions/merge-conflict/package.json
+++ b/extensions/merge-conflict/package.json
@@ -19,6 +19,9 @@
       "supported": true
     }
   },
+  "enabledApiProposals": [
+    "telemetryLogger"
+  ],
   "activationEvents": [
     "onStartupFinished"
   ],
@@ -165,7 +168,9 @@
       }
     }
   },
-  "dependencies": {},
+  "dependencies": {
+    "@vscode/extension-telemetry": "0.7.3-preview"
+  },
   "devDependencies": {
     "@types/node": "16.x"
   },
diff --git a/extensions/merge-conflict/src/codelensProvider.ts b/extensions/merge-conflict/src/codelensProvider.ts
index 391c737a606ac4..73eeddfb109f24 100644
--- a/extensions/merge-conflict/src/codelensProvider.ts
+++ b/extensions/merge-conflict/src/codelensProvider.ts
@@ -85,11 +85,12 @@ export default class MergeConflictCodeLensProvider implements vscode.CodeLensPro
 				arguments: [conflict]
 			};
 
+			const range = document.lineAt(conflict.range.start.line).range;
 			items.push(
-				new vscode.CodeLens(conflict.range, acceptCurrentCommand),
-				new vscode.CodeLens(conflict.range.with(conflict.range.start.with({ character: conflict.range.start.character + 1 })), acceptIncomingCommand),
-				new vscode.CodeLens(conflict.range.with(conflict.range.start.with({ character: conflict.range.start.character + 2 })), acceptBothCommand),
-				new vscode.CodeLens(conflict.range.with(conflict.range.start.with({ character: conflict.range.start.character + 3 })), diffCommand)
+				new vscode.CodeLens(range, acceptCurrentCommand),
+				new vscode.CodeLens(range, acceptIncomingCommand),
+				new vscode.CodeLens(range, acceptBothCommand),
+				new vscode.CodeLens(range, diffCommand)
 			);
 		});
 
diff --git a/extensions/merge-conflict/src/documentMergeConflict.ts b/extensions/merge-conflict/src/documentMergeConflict.ts
index 4448c25356b732..8b78ad88493cba 100644
--- a/extensions/merge-conflict/src/documentMergeConflict.ts
+++ b/extensions/merge-conflict/src/documentMergeConflict.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import * as interfaces from './interfaces';
 import * as vscode from 'vscode';
+import type TelemetryReporter from '@vscode/extension-telemetry';
 
 export class DocumentMergeConflict implements interfaces.IDocumentMergeConflict {
 
@@ -12,8 +13,9 @@ export class DocumentMergeConflict implements interfaces.IDocumentMergeConflict
 	public incoming: interfaces.IMergeRegion;
 	public commonAncestors: interfaces.IMergeRegion[];
 	public splitter: vscode.Range;
+	private applied = false;
 
-	constructor(descriptor: interfaces.IDocumentMergeConflictDescriptor) {
+	constructor(descriptor: interfaces.IDocumentMergeConflictDescriptor, private readonly telemetryReporter: TelemetryReporter) {
 		this.range = descriptor.range;
 		this.current = descriptor.current;
 		this.incoming = descriptor.incoming;
@@ -22,6 +24,25 @@ export class DocumentMergeConflict implements interfaces.IDocumentMergeConflict
 	}
 
 	public commitEdit(type: interfaces.CommitType, editor: vscode.TextEditor, edit?: vscode.TextEditorEdit): Thenable<boolean> {
+		function commitTypeToString(type: interfaces.CommitType): string {
+			switch (type) {
+				case interfaces.CommitType.Current:
+					return 'current';
+				case interfaces.CommitType.Incoming:
+					return 'incoming';
+				case interfaces.CommitType.Both:
+					return 'both';
+			}
+		}
+
+		/* __GDPR__
+			"mergeMarkers.accept" : {
+				"owner": "hediet",
+				"comment": "Used to understand how the inline merge editor experience is used.",
+				"resolution": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "Indicates how the merge conflict was resolved by the user" }
+			}
+		*/
+		this.telemetryReporter.sendTelemetryEvent('mergeMarkers.accept', { resolution: commitTypeToString(type) });
 
 		if (edit) {
 
@@ -33,6 +54,10 @@ export class DocumentMergeConflict implements interfaces.IDocumentMergeConflict
 	}
 
 	public applyEdit(type: interfaces.CommitType, document: vscode.TextDocument, edit: { replace(range: vscode.Range, newText: string): void }): void {
+		if (this.applied) {
+			return;
+		}
+		this.applied = true;
 
 		// Each conflict is a set of ranges as follows, note placements or newlines
 		// which may not in spans
diff --git a/extensions/merge-conflict/src/documentTracker.ts b/extensions/merge-conflict/src/documentTracker.ts
index f52644ab9df90d..cd11886821e644 100644
--- a/extensions/merge-conflict/src/documentTracker.ts
+++ b/extensions/merge-conflict/src/documentTracker.ts
@@ -7,6 +7,7 @@ import * as vscode from 'vscode';
 import { MergeConflictParser } from './mergeConflictParser';
 import * as interfaces from './interfaces';
 import { Delayer } from './delayer';
+import TelemetryReporter from '@vscode/extension-telemetry';
 
 class ScanTask {
 	public origins: Set<string> = new Set<string>();
@@ -47,6 +48,8 @@ export default class DocumentMergeConflictTracker implements vscode.Disposable,
 	private cache: Map<string, ScanTask> = new Map();
 	private delayExpireTime: number = 0;
 
+	constructor(private readonly telemetryReporter: TelemetryReporter) { }
+
 	getConflicts(document: vscode.TextDocument, origin: string): PromiseLike<interfaces.IDocumentMergeConflict[]> {
 		// Attempt from cache
 
@@ -109,6 +112,8 @@ export default class DocumentMergeConflictTracker implements vscode.Disposable,
 		this.cache.clear();
 	}
 
+	private readonly seenDocumentsWithConflicts = new Set<string>();
+
 	private getConflictsOrEmpty(document: vscode.TextDocument, _origins: string[]): interfaces.IDocumentMergeConflict[] {
 		const containsConflict = MergeConflictParser.containsConflict(document);
 
@@ -116,7 +121,26 @@ export default class DocumentMergeConflictTracker implements vscode.Disposable,
 			return [];
 		}
 
-		const conflicts = MergeConflictParser.scanDocument(document);
+		const conflicts = MergeConflictParser.scanDocument(document, this.telemetryReporter);
+
+		const key = document.uri.toString();
+		// Don't report telemetry for the same document twice. This is an approximation, but good enough.
+		// Otherwise redo/undo could trigger this event multiple times.
+		if (!this.seenDocumentsWithConflicts.has(key)) {
+			this.seenDocumentsWithConflicts.add(key);
+
+			/* __GDPR__
+				"mergeMarkers.documentWithConflictMarkersOpened" : {
+					"owner": "hediet",
+					"comment": "Used to determine how many documents with conflicts are opened.",
+					"conflictCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true, "comment": "Total number of conflict counts" }
+				}
+			*/
+			this.telemetryReporter.sendTelemetryEvent('mergeMarkers.documentWithConflictMarkersOpened', {}, {
+				conflictCount: conflicts.length,
+			});
+		}
+
 		return conflicts;
 	}
 
diff --git a/extensions/merge-conflict/src/mergeConflictParser.ts b/extensions/merge-conflict/src/mergeConflictParser.ts
index cb925f82301130..6b651fd5e03e4d 100644
--- a/extensions/merge-conflict/src/mergeConflictParser.ts
+++ b/extensions/merge-conflict/src/mergeConflictParser.ts
@@ -5,6 +5,7 @@
 import * as vscode from 'vscode';
 import * as interfaces from './interfaces';
 import { DocumentMergeConflict } from './documentMergeConflict';
+import TelemetryReporter from '@vscode/extension-telemetry';
 
 const startHeaderMarker = '<<<<<<<';
 const commonAncestorsMarker = '|||||||';
@@ -20,7 +21,7 @@ interface IScanMergedConflict {
 
 export class MergeConflictParser {
 
-	static scanDocument(document: vscode.TextDocument): interfaces.IDocumentMergeConflict[] {
+	static scanDocument(document: vscode.TextDocument, telemetryReporter: TelemetryReporter): interfaces.IDocumentMergeConflict[] {
 
 		// Scan each line in the document, we already know there is at least a <<<<<<< and
 		// >>>>>> marker within the document, we need to group these into conflict ranges.
@@ -81,7 +82,7 @@ export class MergeConflictParser {
 
 		return conflictDescriptors
 			.filter(Boolean)
-			.map(descriptor => new DocumentMergeConflict(descriptor));
+			.map(descriptor => new DocumentMergeConflict(descriptor, telemetryReporter));
 	}
 
 	private static scanItemTolMergeConflictDescriptor(document: vscode.TextDocument, scanned: IScanMergedConflict): interfaces.IDocumentMergeConflictDescriptor | null {
diff --git a/extensions/merge-conflict/src/services.ts b/extensions/merge-conflict/src/services.ts
index 9f58daad6f419a..273d13d35f7249 100644
--- a/extensions/merge-conflict/src/services.ts
+++ b/extensions/merge-conflict/src/services.ts
@@ -9,20 +9,25 @@ import CommandHandler from './commandHandler';
 import ContentProvider from './contentProvider';
 import Decorator from './mergeDecorator';
 import * as interfaces from './interfaces';
+import TelemetryReporter from '@vscode/extension-telemetry';
 
 const ConfigurationSectionName = 'merge-conflict';
 
 export default class ServiceWrapper implements vscode.Disposable {
 
 	private services: vscode.Disposable[] = [];
+	private telemetryReporter: TelemetryReporter;
 
 	constructor(private context: vscode.ExtensionContext) {
+		const { aiKey } = context.extension.packageJSON as { aiKey: string };
+		this.telemetryReporter = new TelemetryReporter(aiKey);
+		context.subscriptions.push(this.telemetryReporter);
 	}
 
 	begin() {
 
 		const configuration = this.createExtensionConfiguration();
-		const documentTracker = new DocumentTracker();
+		const documentTracker = new DocumentTracker(this.telemetryReporter);
 
 		this.services.push(
 			documentTracker,
diff --git a/extensions/merge-conflict/yarn.lock b/extensions/merge-conflict/yarn.lock
index e724e7fffa3177..4725bb147091fc 100644
--- a/extensions/merge-conflict/yarn.lock
+++ b/extensions/merge-conflict/yarn.lock
@@ -2,7 +2,436 @@
 # yarn lockfile v1
 
 
+"@azure/abort-controller@^1.0.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-1.1.0.tgz#788ee78457a55af8a1ad342acb182383d2119249"
+  integrity sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==
+  dependencies:
+    tslib "^2.2.0"
+
+"@azure/core-auth@^1.3.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.4.0.tgz#6fa9661c1705857820dbc216df5ba5665ac36a9e"
+  integrity sha512-HFrcTgmuSuukRf/EdPmqBrc5l6Q5Uu+2TbuhaKbgaCpP2TfAeiNaQPAadxO+CYBRHGUzIDteMAjFspFLDLnKVQ==
+  dependencies:
+    "@azure/abort-controller" "^1.0.0"
+    tslib "^2.2.0"
+
+"@azure/core-http@^2.2.3":
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@azure/core-http/-/core-http-2.3.1.tgz#eed8a7d012ba8c576c557828f66af0fc4e52b23a"
+  integrity sha512-cur03BUwV0Tbv81bQBOLafFB02B6G++K6F2O3IMl8pSE2QlXm3cu11bfyBNlDUKi5U+xnB3GC63ae3athhkx6Q==
+  dependencies:
+    "@azure/abort-controller" "^1.0.0"
+    "@azure/core-auth" "^1.3.0"
+    "@azure/core-tracing" "1.0.0-preview.13"
+    "@azure/core-util" "^1.1.1"
+    "@azure/logger" "^1.0.0"
+    "@types/node-fetch" "^2.5.0"
+    "@types/tunnel" "^0.0.3"
+    form-data "^4.0.0"
+    node-fetch "^2.6.7"
+    process "^0.11.10"
+    tough-cookie "^4.0.0"
+    tslib "^2.2.0"
+    tunnel "^0.0.6"
+    uuid "^8.3.0"
+    xml2js "^0.4.19"
+
+"@azure/core-tracing@1.0.0-preview.13":
+  version "1.0.0-preview.13"
+  resolved "https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz#55883d40ae2042f6f1e12b17dd0c0d34c536d644"
+  integrity sha512-KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ==
+  dependencies:
+    "@opentelemetry/api" "^1.0.1"
+    tslib "^2.2.0"
+
+"@azure/core-util@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@azure/core-util/-/core-util-1.1.1.tgz#8f87b3dd468795df0f0849d9f096c3e7b29452c1"
+  integrity sha512-A4TBYVQCtHOigFb2ETiiKFDocBoI1Zk2Ui1KpI42aJSIDexF7DHQFpnjonltXAIU/ceH+1fsZAWWgvX6/AKzog==
+  dependencies:
+    "@azure/abort-controller" "^1.0.0"
+    tslib "^2.2.0"
+
+"@azure/logger@^1.0.0":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@azure/logger/-/logger-1.0.3.tgz#6e36704aa51be7d4a1bae24731ea580836293c96"
+  integrity sha512-aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g==
+  dependencies:
+    tslib "^2.2.0"
+
+"@microsoft/1ds-core-js@3.2.8", "@microsoft/1ds-core-js@^3.2.8":
+  version "3.2.8"
+  resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-3.2.8.tgz#1b6b7d9bb858238c818ccf4e4b58ece7aeae5760"
+  integrity sha512-9o9SUAamJiTXIYwpkQDuueYt83uZfXp8zp8YFix1IwVPwC9RmE36T2CX9gXOeq1nDckOuOduYpA8qHvdh5BGfQ==
+  dependencies:
+    "@microsoft/applicationinsights-core-js" "2.8.9"
+    "@microsoft/applicationinsights-shims" "^2.0.2"
+    "@microsoft/dynamicproto-js" "^1.1.7"
+
+"@microsoft/1ds-post-js@^3.2.8":
+  version "3.2.8"
+  resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-3.2.8.tgz#46793842cca161bf7a2a5b6053c349f429e55110"
+  integrity sha512-SjlRoNcXcXBH6WQD/5SkkaCHIVqldH3gDu+bI7YagrOVJ5APxwT1Duw9gm3L1FjFa9S2i81fvJ3EVSKpp9wULA==
+  dependencies:
+    "@microsoft/1ds-core-js" "3.2.8"
+    "@microsoft/applicationinsights-shims" "^2.0.2"
+    "@microsoft/dynamicproto-js" "^1.1.7"
+
+"@microsoft/applicationinsights-channel-js@2.8.9":
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-2.8.9.tgz#840656f3c716de8b3eb0a98c122aa1b92bb8ebfb"
+  integrity sha512-fMBsAEB7pWtPn43y72q9Xy5E5y55r6gMuDQqRRccccVoQDPXyS57VCj5IdATblctru0C6A8XpL2vRyNmEsu0Vg==
+  dependencies:
+    "@microsoft/applicationinsights-common" "2.8.9"
+    "@microsoft/applicationinsights-core-js" "2.8.9"
+    "@microsoft/applicationinsights-shims" "2.0.2"
+    "@microsoft/dynamicproto-js" "^1.1.7"
+
+"@microsoft/applicationinsights-common@2.8.9":
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-common/-/applicationinsights-common-2.8.9.tgz#a75e4a3143a7fd797687830c0ddd2069fd900827"
+  integrity sha512-mObn1moElyxZaGIRF/IU3cOaeKMgxghXnYEoHNUCA2e+rNwBIgxjyKkblFIpmGuHf4X7Oz3o3yBWpaC6AoMpig==
+  dependencies:
+    "@microsoft/applicationinsights-core-js" "2.8.9"
+    "@microsoft/applicationinsights-shims" "2.0.2"
+    "@microsoft/dynamicproto-js" "^1.1.7"
+
+"@microsoft/applicationinsights-core-js@2.8.9":
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.9.tgz#0e5d207acfae6986a6fc97249eeb6117e523bf1b"
+  integrity sha512-HRuIuZ6aOWezcg/G5VyFDDWGL8hDNe/ljPP01J7ImH2kRPEgbtcfPSUMjkamGMefgdq81GZsSoC/NNGTP4pp2w==
+  dependencies:
+    "@microsoft/applicationinsights-shims" "2.0.2"
+    "@microsoft/dynamicproto-js" "^1.1.7"
+
+"@microsoft/applicationinsights-shims@2.0.2", "@microsoft/applicationinsights-shims@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.2.tgz#92b36a09375e2d9cb2b4203383b05772be837085"
+  integrity sha512-PoHEgsnmcqruLNHZ/amACqdJ6YYQpED0KSRe6J7gIJTtpZC1FfFU9b1fmDKDKtFoUSrPzEh1qzO3kmRZP0betg==
+
+"@microsoft/applicationinsights-web-basic@^2.8.9":
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-2.8.9.tgz#eed2f3d1e19069962ed2155915c1656e6936e1d5"
+  integrity sha512-CH0J8JFOy7MjK8JO4pXXU+EML+Ilix+94PMZTX5EJlBU1in+mrik74/8qSg3UC4ekPi12KwrXaHCQSVC3WseXQ==
+  dependencies:
+    "@microsoft/applicationinsights-channel-js" "2.8.9"
+    "@microsoft/applicationinsights-common" "2.8.9"
+    "@microsoft/applicationinsights-core-js" "2.8.9"
+    "@microsoft/applicationinsights-shims" "2.0.2"
+    "@microsoft/dynamicproto-js" "^1.1.7"
+
+"@microsoft/applicationinsights-web-snippet@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-web-snippet/-/applicationinsights-web-snippet-1.0.1.tgz#6bb788b2902e48bf5d460c38c6bb7fedd686ddd7"
+  integrity sha512-2IHAOaLauc8qaAitvWS+U931T+ze+7MNWrDHY47IENP5y2UA0vqJDu67kWZDdpCN1fFC77sfgfB+HV7SrKshnQ==
+
+"@microsoft/dynamicproto-js@^1.1.7":
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.7.tgz#ede48dd3f85af14ee369c805e5ed5b84222b9fe2"
+  integrity sha512-SK3D3aVt+5vOOccKPnGaJWB5gQ8FuKfjboUJHedMP7gu54HqSCXX5iFXhktGD8nfJb0Go30eDvs/UDoTnR2kOA==
+
+"@opentelemetry/api@^1.0.1", "@opentelemetry/api@^1.0.4":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.3.0.tgz#27c6f776ac3c1c616651e506a89f438a0ed6a055"
+  integrity sha512-YveTnGNsFFixTKJz09Oi4zYkiLT5af3WpZDu4aIUM7xX+2bHAkOJayFTVQd6zB8kkWPpbua4Ha6Ql00grdLlJQ==
+
+"@opentelemetry/core@1.8.0", "@opentelemetry/core@^1.0.1":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.8.0.tgz#cca18594dd48ded6dc0d08c7e789c79af0315934"
+  integrity sha512-6SDjwBML4Am0AQmy7z1j6HGrWDgeK8awBRUvl1PGw6HayViMk4QpnUXvv4HTHisecgVBy43NE/cstWprm8tIfw==
+  dependencies:
+    "@opentelemetry/semantic-conventions" "1.8.0"
+
+"@opentelemetry/resources@1.8.0":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-1.8.0.tgz#260be9742cf7bceccc0db928d8ca8d64391acfe3"
+  integrity sha512-KSyMH6Jvss/PFDy16z5qkCK0ERlpyqixb1xwb73wLMvVq+j7i89lobDjw3JkpCcd1Ws0J6jAI4fw28Zufj2ssg==
+  dependencies:
+    "@opentelemetry/core" "1.8.0"
+    "@opentelemetry/semantic-conventions" "1.8.0"
+
+"@opentelemetry/sdk-trace-base@^1.0.1":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.8.0.tgz#70713aab90978a16dea188c8335209f857be7384"
+  integrity sha512-iH41m0UTddnCKJzZx3M85vlhKzRcmT48pUeBbnzsGrq4nIay1oWVHKM5nhB5r8qRDGvd/n7f/YLCXClxwM0tvA==
+  dependencies:
+    "@opentelemetry/core" "1.8.0"
+    "@opentelemetry/resources" "1.8.0"
+    "@opentelemetry/semantic-conventions" "1.8.0"
+
+"@opentelemetry/semantic-conventions@1.8.0", "@opentelemetry/semantic-conventions@^1.0.1":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.8.0.tgz#fe2aa90e6df050a11cd57f5c0f47b0641fd2cad3"
+  integrity sha512-TYh1MRcm4JnvpqtqOwT9WYaBYY4KERHdToxs/suDTLviGRsQkIjS5yYROTYTSJQUnYLOn/TuOh5GoMwfLSU+Ew==
+
+"@types/node-fetch@^2.5.0":
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.2.tgz#d1a9c5fd049d9415dce61571557104dec3ec81da"
+  integrity sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==
+  dependencies:
+    "@types/node" "*"
+    form-data "^3.0.0"
+
+"@types/node@*":
+  version "18.11.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.9.tgz#02d013de7058cea16d36168ef2fc653464cfbad4"
+  integrity sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==
+
 "@types/node@16.x":
   version "16.11.6"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae"
   integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==
+
+"@types/tunnel@^0.0.3":
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/@types/tunnel/-/tunnel-0.0.3.tgz#f109e730b072b3136347561fc558c9358bb8c6e9"
+  integrity sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==
+  dependencies:
+    "@types/node" "*"
+
+"@vscode/extension-telemetry@0.7.3-preview":
+  version "0.7.3-preview"
+  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.7.3-preview.tgz#3e45609c862022e7eec52e47fe45176149d82b6c"
+  integrity sha512-V+TanZXj8jhCX8mwGHbRDOTJ5YSWCmngHKs7ZrRoR7sXc4vZYQX+1syp07hDX2BVnPpuBHJiovZ8GZ4zbmQvYw==
+  dependencies:
+    "@microsoft/1ds-core-js" "^3.2.8"
+    "@microsoft/1ds-post-js" "^3.2.8"
+    "@microsoft/applicationinsights-web-basic" "^2.8.9"
+    applicationinsights "2.3.6"
+
+applicationinsights@2.3.6:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-2.3.6.tgz#91277ce44e5f6d2f85336922c05d90f8699c2e70"
+  integrity sha512-ZzXXpZpDRGcy6Pp5V319nDF9/+Ey7jNknEXZyaBajtC5onN0dcBem6ng5jcb3MPH2AjYWRI8XgyNEuzP/6Y5/A==
+  dependencies:
+    "@azure/core-http" "^2.2.3"
+    "@microsoft/applicationinsights-web-snippet" "^1.0.1"
+    "@opentelemetry/api" "^1.0.4"
+    "@opentelemetry/core" "^1.0.1"
+    "@opentelemetry/sdk-trace-base" "^1.0.1"
+    "@opentelemetry/semantic-conventions" "^1.0.1"
+    cls-hooked "^4.2.2"
+    continuation-local-storage "^3.2.1"
+    diagnostic-channel "1.1.0"
+    diagnostic-channel-publishers "1.0.5"
+
+async-hook-jl@^1.7.6:
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/async-hook-jl/-/async-hook-jl-1.7.6.tgz#4fd25c2f864dbaf279c610d73bf97b1b28595e68"
+  integrity sha512-gFaHkFfSxTjvoxDMYqDuGHlcRyUuamF8s+ZTtJdDzqjws4mCt7v0vuV79/E2Wr2/riMQgtG4/yUtXWs1gZ7JMg==
+  dependencies:
+    stack-chain "^1.3.7"
+
+async-listener@^0.6.0:
+  version "0.6.10"
+  resolved "https://registry.yarnpkg.com/async-listener/-/async-listener-0.6.10.tgz#a7c97abe570ba602d782273c0de60a51e3e17cbc"
+  integrity sha512-gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw==
+  dependencies:
+    semver "^5.3.0"
+    shimmer "^1.1.0"
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
+
+cls-hooked@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/cls-hooked/-/cls-hooked-4.2.2.tgz#ad2e9a4092680cdaffeb2d3551da0e225eae1908"
+  integrity sha512-J4Xj5f5wq/4jAvcdgoGsL3G103BtWpZrMo8NEinRltN+xpTZdI+M38pyQqhuFU/P792xkMFvnKSf+Lm81U1bxw==
+  dependencies:
+    async-hook-jl "^1.7.6"
+    emitter-listener "^1.0.1"
+    semver "^5.4.1"
+
+combined-stream@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+  dependencies:
+    delayed-stream "~1.0.0"
+
+continuation-local-storage@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz#11f613f74e914fe9b34c92ad2d28fe6ae1db7ffb"
+  integrity sha512-jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA==
+  dependencies:
+    async-listener "^0.6.0"
+    emitter-listener "^1.1.1"
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
+
+diagnostic-channel-publishers@1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/diagnostic-channel-publishers/-/diagnostic-channel-publishers-1.0.5.tgz#df8c317086c50f5727fdfb5d2fce214d2e4130ae"
+  integrity sha512-dJwUS0915pkjjimPJVDnS/QQHsH0aOYhnZsLJdnZIMOrB+csj8RnZhWTuwnm8R5v3Z7OZs+ksv5luC14DGB7eg==
+
+diagnostic-channel@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/diagnostic-channel/-/diagnostic-channel-1.1.0.tgz#6985e9dfedfbc072d91dc4388477e4087147756e"
+  integrity sha512-fwujyMe1gj6rk6dYi9hMZm0c8Mz8NDMVl2LB4iaYh3+LIAThZC8RKFGXWG0IML2OxAit/ZFRgZhMkhQ3d/bobQ==
+  dependencies:
+    semver "^5.3.0"
+
+emitter-listener@^1.0.1, emitter-listener@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/emitter-listener/-/emitter-listener-1.1.2.tgz#56b140e8f6992375b3d7cb2cab1cc7432d9632e8"
+  integrity sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==
+  dependencies:
+    shimmer "^1.2.0"
+
+form-data@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
+  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
+form-data@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
+mime-db@1.52.0:
+  version "1.52.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
+
+mime-types@^2.1.12:
+  version "2.1.35"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
+  dependencies:
+    mime-db "1.52.0"
+
+node-fetch@^2.6.7:
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
+  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
+  dependencies:
+    whatwg-url "^5.0.0"
+
+process@^0.11.10:
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
+
+psl@^1.1.33:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
+  integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
+
+punycode@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+
+querystringify@^2.1.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
+  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
+
+requires-port@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
+
+sax@>=0.6.0:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+
+semver@^5.3.0, semver@^5.4.1:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
+shimmer@^1.1.0, shimmer@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
+  integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==
+
+stack-chain@^1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/stack-chain/-/stack-chain-1.3.7.tgz#d192c9ff4ea6a22c94c4dd459171e3f00cea1285"
+  integrity sha512-D8cWtWVdIe/jBA7v5p5Hwl5yOSOrmZPWDPe2KxQ5UAGD+nxbxU0lKXA4h85Ta6+qgdKVL3vUxsbIZjc1kBG7ug==
+
+tough-cookie@^4.0.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874"
+  integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==
+  dependencies:
+    psl "^1.1.33"
+    punycode "^2.1.1"
+    universalify "^0.2.0"
+    url-parse "^1.5.3"
+
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
+
+tslib@^2.2.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
+  integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
+
+tunnel@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
+  integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
+
+universalify@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
+  integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==
+
+url-parse@^1.5.3:
+  version "1.5.10"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
+  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
+  dependencies:
+    querystringify "^2.1.1"
+    requires-port "^1.0.0"
+
+uuid@^8.3.0:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+
+webidl-conversions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
+
+whatwg-url@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
+  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
+  dependencies:
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
+xml2js@^0.4.19:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
+  integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==
+  dependencies:
+    sax ">=0.6.0"
+    xmlbuilder "~11.0.0"
+
+xmlbuilder@~11.0.0:
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
+  integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
diff --git a/extensions/microsoft-authentication/package.json b/extensions/microsoft-authentication/package.json
index 9a130e61ca8d35..7700cf6e692775 100644
--- a/extensions/microsoft-authentication/package.json
+++ b/extensions/microsoft-authentication/package.json
@@ -54,7 +54,7 @@
   },
   "dependencies": {
     "node-fetch": "2.6.7",
-    "@vscode/extension-telemetry": "0.7.1-preview"
+    "@vscode/extension-telemetry": "0.7.3-preview"
   },
   "repository": {
     "type": "git",
diff --git a/extensions/microsoft-authentication/src/AADHelper.ts b/extensions/microsoft-authentication/src/AADHelper.ts
index 3609ca4bf47828..18c44ac38023e9 100644
--- a/extensions/microsoft-authentication/src/AADHelper.ts
+++ b/extensions/microsoft-authentication/src/AADHelper.ts
@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode';
 import * as querystring from 'querystring';
-import path = require('path');
+import * as path from 'path';
 import Logger from './logger';
 import { isSupportedEnvironment } from './utils';
 import { generateCodeChallenge, generateCodeVerifier, randomUUID } from './cryptoUtils';
@@ -586,7 +586,7 @@ export class AzureActiveDirectoryService {
 			if (token.expiresIn) {
 				this.setSessionTimeout(token.sessionId, token.refreshToken, scopeData, token.expiresIn * AzureActiveDirectoryService.REFRESH_TIMEOUT_MODIFIER);
 			}
-			await this.setToken(token, scopeData);
+			this.setToken(token, scopeData);
 			Logger.info(`Token refresh success for scopes: ${token.scope}`);
 			return token;
 		} catch (e) {
@@ -728,7 +728,7 @@ export class AzureActiveDirectoryService {
 		if (token.expiresIn) {
 			this.setSessionTimeout(token.sessionId, token.refreshToken, scopeData, token.expiresIn * AzureActiveDirectoryService.REFRESH_TIMEOUT_MODIFIER);
 		}
-		await this.setToken(token, scopeData);
+		this.setToken(token, scopeData);
 		Logger.info(`Login successful for scopes: ${scopeData.scopeStr}`);
 		return await this.convertToSession(token);
 	}
@@ -777,7 +777,7 @@ export class AzureActiveDirectoryService {
 
 	//#region storage operations
 
-	private async setToken(token: IToken, scopeData: IScopeData): Promise<void> {
+	private setToken(token: IToken, scopeData: IScopeData): void {
 		Logger.info(`Setting token for scopes: ${scopeData.scopeStr}`);
 
 		const existingTokenIndex = this._tokens.findIndex(t => t.sessionId === token.sessionId);
@@ -787,17 +787,54 @@ export class AzureActiveDirectoryService {
 			this._tokens.push(token);
 		}
 
+		// Don't await because setting the token is only useful for any new windows that open.
+		this.storeToken(token, scopeData);
+	}
+
+	private async storeToken(token: IToken, scopeData: IScopeData): Promise<void> {
+		if (!vscode.window.state.focused) {
+			const shouldStore = await new Promise((resolve, _) => {
+				// To handle the case where the window is not focused for a long time. We want to store the token
+				// at some point so that the next time they _do_ interact with VS Code, they don't have to sign in again.
+				const timer = setTimeout(
+					() => resolve(true),
+					// 5 hours + random extra 0-30 seconds so that each window doesn't try to store at the same time
+					(18000000) + Math.floor(Math.random() * 30000)
+				);
+				const dispose = vscode.Disposable.from(
+					vscode.window.onDidChangeWindowState(e => {
+						if (e.focused) {
+							resolve(true);
+							dispose.dispose();
+							clearTimeout(timer);
+						}
+					}),
+					this._tokenStorage.onDidChangeInOtherWindow(e => {
+						if (e.updated.includes(token.sessionId)) {
+							resolve(false);
+							dispose.dispose();
+							clearTimeout(timer);
+						}
+					})
+				);
+			});
+
+			if (!shouldStore) {
+				Logger.info(`Not storing token for scopes ${scopeData.scopeStr} because it was added in another window`);
+				return;
+			}
+		}
+
 		await this._tokenStorage.store(token.sessionId, {
 			id: token.sessionId,
 			refreshToken: token.refreshToken,
 			scope: token.scope,
 			account: token.account
 		});
+		Logger.info(`Stored token for scopes: ${scopeData.scopeStr}`);
 	}
 
 	private async checkForUpdates(e: IDidChangeInOtherWindowEvent<IStoredSession>): Promise<void> {
-		const added: vscode.AuthenticationSession[] = [];
-		const removed: vscode.AuthenticationSession[] = [];
 		for (const key of e.added) {
 			const session = await this._tokenStorage.get(key);
 			if (!session) {
@@ -834,11 +871,13 @@ export class AzureActiveDirectoryService {
 
 		for (const { value } of e.removed) {
 			Logger.info(`Session removed in another window with scopes: ${value.scope}`);
-			const session = await this.removeSessionById(value.id, false);
-			if (session) {
-				removed.push(session);
-			}
+			await this.removeSessionById(value.id, false);
 		}
+
+		// NOTE: We don't need to handle changed sessions because all that really would give us is a new refresh token
+		// because access tokens are not stored in Secret Storage due to their short lifespan. This new refresh token
+		// is not useful in this window because we really only care about the lifetime of the _access_ token which we
+		// are already managing (see usages of `setSessionTimeout`).
 	}
 
 	//#endregion
diff --git a/extensions/microsoft-authentication/yarn.lock b/extensions/microsoft-authentication/yarn.lock
index f10e6096483a45..74d1ece8ab373b 100644
--- a/extensions/microsoft-authentication/yarn.lock
+++ b/extensions/microsoft-authentication/yarn.lock
@@ -218,10 +218,10 @@
   resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.0.0.tgz#165aae4819ad2174a17476dbe66feebd549556c0"
   integrity sha512-xSQfNcvOiE5f9dyd4Kzxbof1aTrLobL278pGLKOZI6esGfZ7ts9Ka16CzIN6Y8hFHE1C7jIBZokULhK1bOgjRw==
 
-"@vscode/extension-telemetry@0.7.1-preview":
-  version "0.7.1-preview"
-  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.7.1-preview.tgz#1b954b8932b7f27a3993abda25299b8ba7f97233"
-  integrity sha512-7GdA8lMrcMhRfFxVpk7KBNbx+Bh/OpG702C1uPcyOQqp5lH1txJ/8SZAacFqFMKLRnBdGlJRKBREQe/Fs1X/eQ==
+"@vscode/extension-telemetry@0.7.3-preview":
+  version "0.7.3-preview"
+  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.7.3-preview.tgz#3e45609c862022e7eec52e47fe45176149d82b6c"
+  integrity sha512-V+TanZXj8jhCX8mwGHbRDOTJ5YSWCmngHKs7ZrRoR7sXc4vZYQX+1syp07hDX2BVnPpuBHJiovZ8GZ4zbmQvYw==
   dependencies:
     "@microsoft/1ds-core-js" "^3.2.8"
     "@microsoft/1ds-post-js" "^3.2.8"
diff --git a/extensions/notebook-renderers/src/ansi.ts b/extensions/notebook-renderers/src/ansi.ts
index 2a89d8d4b29ed5..bd1c3658982cbc 100644
--- a/extensions/notebook-renderers/src/ansi.ts
+++ b/extensions/notebook-renderers/src/ansi.ts
@@ -379,6 +379,11 @@ export function handleANSIOutput(text: string): HTMLSpanElement {
 	}
 }
 
+const ttPolicy = window.trustedTypes?.createPolicy('notebookRenderer', {
+	createHTML: value => value,
+	createScript: value => value,
+});
+
 export function appendStylizedStringToContainer(
 	root: HTMLElement,
 	stringContent: string,
@@ -392,7 +397,14 @@ export function appendStylizedStringToContainer(
 		return;
 	}
 
-	const container = linkify(stringContent, true, workspaceFolder);
+	let container = document.createElement('span');
+	const trustedHtml = ttPolicy?.createHTML(stringContent) ?? stringContent;
+	container.innerHTML = trustedHtml as string;
+
+	if (container.childElementCount === 0) {
+		// plain text
+		container = linkify(stringContent, true, workspaceFolder);
+	}
 
 	container.className = cssClasses.join(' ');
 	if (customTextColor) {
diff --git a/extensions/notebook-renderers/src/index.ts b/extensions/notebook-renderers/src/index.ts
index c8a5e5fc000fb5..f2d7f072564902 100644
--- a/extensions/notebook-renderers/src/index.ts
+++ b/extensions/notebook-renderers/src/index.ts
@@ -172,9 +172,17 @@ function renderStream(outputInfo: OutputItem, container: HTMLElement, error: boo
 		const outputElement = (prev.firstChild as HTMLElement | null);
 		if (outputElement && outputElement.getAttribute('output-mime-type') === outputInfo.mime) {
 			// same stream
-			const text = outputInfo.text();
 
-			const element = document.createElement('span');
+			// find child with same id
+			const existing = outputElement.querySelector(`[output-item-id="${outputInfo.id}"]`) as HTMLElement | null;
+			if (existing) {
+				clearContainer(existing);
+			}
+
+			const text = outputInfo.text();
+			const element = existing ?? document.createElement('span');
+			element.classList.add('output-stream');
+			element.setAttribute('output-item-id', outputInfo.id);
 			insertOutput(outputInfo.id, [text], ctx.settings.lineLimit, ctx.settings.outputScrolling, element);
 			outputElement.appendChild(element);
 			return;
@@ -183,6 +191,7 @@ function renderStream(outputInfo: OutputItem, container: HTMLElement, error: boo
 
 	const element = document.createElement('span');
 	element.classList.add('output-stream');
+	element.setAttribute('output-item-id', outputInfo.id);
 
 	const text = outputInfo.text();
 	insertOutput(outputInfo.id, [text], ctx.settings.lineLimit, ctx.settings.outputScrolling, element);
diff --git a/extensions/notebook-renderers/src/linkify.ts b/extensions/notebook-renderers/src/linkify.ts
index 2ce09ec1bfd1c2..416527484d978b 100644
--- a/extensions/notebook-renderers/src/linkify.ts
+++ b/extensions/notebook-renderers/src/linkify.ts
@@ -64,17 +64,9 @@ export class LinkDetector {
 						container.appendChild(document.createTextNode(part.value));
 						break;
 					case 'web':
+					case 'path':
 						container.appendChild(this.createWebLink(part.value));
 						break;
-					case 'path': {
-						container.appendChild(document.createTextNode(part.value));
-
-						// const path = part.captures[0];
-						// const lineNumber = part.captures[1] ? Number(part.captures[1]) : 0;
-						// const columnNumber = part.captures[2] ? Number(part.captures[2]) : 0;
-						// container.appendChild(this.createPathLink(part.value, path, lineNumber, columnNumber, workspaceFolder));
-						break;
-					}
 				}
 			} catch (e) {
 				container.appendChild(document.createTextNode(part.value));
@@ -85,7 +77,7 @@ export class LinkDetector {
 
 	private createWebLink(url: string): Node {
 		const link = this.createLink(url);
-
+		link.href = url;
 		return link;
 	}
 
@@ -127,7 +119,7 @@ export class LinkDetector {
 	// 	return link;
 	// }
 
-	private createLink(text: string): HTMLElement {
+	private createLink(text: string): HTMLAnchorElement {
 		const link = document.createElement('a');
 		link.textContent = text;
 		return link;
diff --git a/extensions/npm/package.json b/extensions/npm/package.json
index 40ec7e7f4ae593..dbebc670d688a9 100644
--- a/extensions/npm/package.json
+++ b/extensions/npm/package.json
@@ -12,6 +12,9 @@
   "categories": [
     "Other"
   ],
+  "enabledApiProposals": [
+    "terminalQuickFixProvider"
+  ],
   "scripts": {
     "compile": "gulp compile-extension:npm",
     "watch": "gulp watch-extension:npm"
@@ -43,7 +46,10 @@
     "onView:npm"
   ],
   "capabilities": {
-    "virtualWorkspaces": false,
+    "virtualWorkspaces": {
+      "supported": "limited",
+      "description": "%virtualWorkspaces%"
+    },
     "untrustedWorkspaces": {
       "supported": "limited",
       "description": "%workspaceTrust%"
@@ -334,7 +340,22 @@
         },
         "when": "shellExecutionSupported"
       }
-    ]
+    ],
+    "terminal": {
+      "quickFixes": [
+        {
+          "id": "ms-vscode.npm-command",
+          "commandLineMatcher": "npm",
+          "commandExitResult": "error",
+          "outputMatcher": {
+            "anchor": "bottom",
+            "length": 8,
+            "lineMatcher": "Did you mean (?:this|one of these)\\?((?:\\n.+?npm .+ #.+)+)",
+            "offset": 2
+          }
+        }
+      ]
+    }
   },
   "repository": {
     "type": "git",
diff --git a/extensions/npm/package.nls.json b/extensions/npm/package.nls.json
index d34249d2d2bb71..1b2e87874a3562 100644
--- a/extensions/npm/package.nls.json
+++ b/extensions/npm/package.nls.json
@@ -2,6 +2,7 @@
 	"description": "Extension to add task support for npm scripts.",
 	"displayName": "NPM support for VS Code",
 	"workspaceTrust": "This extension executes tasks, which require trust to run.",
+	"virtualWorkspaces": "Functionality that requires running the 'npm' command is not available in virtual workspaces.",
 	"config.npm.autoDetect": "Controls whether npm scripts should be automatically detected.",
 	"config.npm.runSilent": "Run npm commands with the `--silent` option.",
 	"config.npm.packageManager": "The package manager used to run scripts.",
diff --git a/extensions/npm/src/npmMain.ts b/extensions/npm/src/npmMain.ts
index a8289599917ef9..26c6412b2d792a 100644
--- a/extensions/npm/src/npmMain.ts
+++ b/extensions/npm/src/npmMain.ts
@@ -70,6 +70,30 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 		return '';
 	}));
 	context.subscriptions.push(new NpmScriptLensProvider());
+
+	context.subscriptions.push(vscode.window.registerTerminalQuickFixProvider('ms-vscode.npm-command', {
+		provideTerminalQuickFixes({ outputMatch }) {
+			if (!outputMatch) {
+				return;
+			}
+
+			const lines = outputMatch.regexMatch[1];
+			const fixes: vscode.TerminalQuickFixCommand[] = [];
+			for (const line of lines.split('\n')) {
+				// search from the second char, since the lines might be prefixed with
+				// "npm ERR!" which comes before the actual command suggestion.
+				const begin = line.indexOf('npm', 1);
+				if (begin === -1) {
+					continue;
+				}
+
+				const end = line.lastIndexOf('#');
+				fixes.push({ terminalCommand: line.slice(begin, end === -1 ? undefined : end - 1) });
+			}
+
+			return fixes;
+		},
+	}));
 }
 
 async function getNPMCommandPath(): Promise<string | undefined> {
diff --git a/extensions/npm/src/preferred-pm.ts b/extensions/npm/src/preferred-pm.ts
index 58be79acfdb0a0..f69933d10f1c37 100644
--- a/extensions/npm/src/preferred-pm.ts
+++ b/extensions/npm/src/preferred-pm.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import findWorkspaceRoot = require('../node_modules/find-yarn-workspace-root');
-import findUp = require('find-up');
+import * as findUp from 'find-up';
 import * as path from 'path';
-import whichPM = require('which-pm');
+import * as whichPM from 'which-pm';
 import { Uri, workspace } from 'vscode';
 
 interface PreferredProperties {
diff --git a/extensions/npm/tsconfig.json b/extensions/npm/tsconfig.json
index 7234fdfeb97574..ec12eb547b3862 100644
--- a/extensions/npm/tsconfig.json
+++ b/extensions/npm/tsconfig.json
@@ -8,6 +8,7 @@
 	},
 	"include": [
 		"src/**/*",
-		"../../src/vscode-dts/vscode.d.ts"
+		"../../src/vscode-dts/vscode.d.ts",
+		"../../src/vscode-dts/vscode.proposed.terminalQuickFixProvider.d.ts",
 	]
 }
diff --git a/extensions/package.json b/extensions/package.json
index 7c28cece4f9213..905800d7cbd957 100644
--- a/extensions/package.json
+++ b/extensions/package.json
@@ -4,7 +4,7 @@
   "license": "MIT",
   "description": "Dependencies shared by all extensions",
   "dependencies": {
-    "typescript": "^4.9.3"
+    "typescript": "4.9.4"
   },
   "scripts": {
     "postinstall": "node ./postinstall.mjs"
diff --git a/extensions/php-language-features/src/features/completionItemProvider.ts b/extensions/php-language-features/src/features/completionItemProvider.ts
index 205c59d77b8f21..ba82b71f606636 100644
--- a/extensions/php-language-features/src/features/completionItemProvider.ts
+++ b/extensions/php-language-features/src/features/completionItemProvider.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { CompletionItemProvider, CompletionItem, CompletionItemKind, CancellationToken, TextDocument, Position, Range, TextEdit, workspace, CompletionContext } from 'vscode';
-import phpGlobals = require('./phpGlobals');
-import phpGlobalFunctions = require('./phpGlobalFunctions');
+import * as phpGlobals from './phpGlobals';
+import * as phpGlobalFunctions from './phpGlobalFunctions';
 
 export default class PHPCompletionItemProvider implements CompletionItemProvider {
 
diff --git a/extensions/php-language-features/src/features/hoverProvider.ts b/extensions/php-language-features/src/features/hoverProvider.ts
index fdf489187e10fc..95ec47bc11a2e5 100644
--- a/extensions/php-language-features/src/features/hoverProvider.ts
+++ b/extensions/php-language-features/src/features/hoverProvider.ts
@@ -5,8 +5,8 @@
 
 import { HoverProvider, Hover, MarkedString, TextDocument, CancellationToken, Position, workspace } from 'vscode';
 import { textToMarkedString } from './utils/markedTextUtil';
-import phpGlobals = require('./phpGlobals');
-import phpGlobalFunctions = require('./phpGlobalFunctions');
+import * as phpGlobals from './phpGlobals';
+import * as phpGlobalFunctions from './phpGlobalFunctions';
 
 export default class PHPHoverProvider implements HoverProvider {
 
diff --git a/extensions/php-language-features/src/features/signatureHelpProvider.ts b/extensions/php-language-features/src/features/signatureHelpProvider.ts
index bf56516caf0eb0..ea3fec492432d8 100644
--- a/extensions/php-language-features/src/features/signatureHelpProvider.ts
+++ b/extensions/php-language-features/src/features/signatureHelpProvider.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { SignatureHelpProvider, SignatureHelp, SignatureInformation, CancellationToken, TextDocument, Position, workspace } from 'vscode';
-import phpGlobals = require('./phpGlobals');
-import phpGlobalFunctions = require('./phpGlobalFunctions');
+import * as phpGlobals from './phpGlobals';
+import * as phpGlobalFunctions from './phpGlobalFunctions';
 
 const _NL = '\n'.charCodeAt(0);
 const _TAB = '\t'.charCodeAt(0);
diff --git a/extensions/pug/cgmanifest.json b/extensions/pug/cgmanifest.json
index 341ab356db26e7..1575c2a5d4b7f6 100644
--- a/extensions/pug/cgmanifest.json
+++ b/extensions/pug/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "davidrios/pug-tmbundle",
 					"repositoryUrl": "https://github.com/davidrios/pug-tmbundle",
-					"commitHash": "8d7e93262a949afca023ee67ca8bb01a3b43e607"
+					"commitHash": "aee5f096dac969fe09afac55f05f3f4e774f61a3"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/pug/package.json b/extensions/pug/package.json
index fd74f5b915cc26..0d3c6b6eed84dc 100644
--- a/extensions/pug/package.json
+++ b/extensions/pug/package.json
@@ -33,7 +33,12 @@
         "scopeName": "text.pug",
         "path": "./syntaxes/pug.tmLanguage.json"
       }
-    ]
+    ],
+    "configurationDefaults": {
+      "[jade]": {
+        "diffEditor.ignoreTrimWhitespace": false
+      }
+    }
   },
   "repository": {
     "type": "git",
diff --git a/extensions/pug/syntaxes/pug.tmLanguage.json b/extensions/pug/syntaxes/pug.tmLanguage.json
index 4c1869c3258852..bd5517103ce6d6 100644
--- a/extensions/pug/syntaxes/pug.tmLanguage.json
+++ b/extensions/pug/syntaxes/pug.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/davidrios/pug-tmbundle/commit/8d7e93262a949afca023ee67ca8bb01a3b43e607",
+	"version": "https://github.com/davidrios/pug-tmbundle/commit/aee5f096dac969fe09afac55f05f3f4e774f61a3",
 	"name": "Pug",
 	"scopeName": "text.pug",
 	"patterns": [
@@ -60,7 +60,7 @@
 			]
 		},
 		{
-			"begin": "^(\\s*)(script)((\\.$)|(?=[^\\n]*(text|application)/javascript.*\\.$))",
+			"begin": "^(\\s*)(script)((\\.$)|(?=[^\\n]*((text|application)/javascript|module).*\\.$))",
 			"beginCaptures": {
 				"2": {
 					"name": "entity.name.tag.pug"
@@ -145,6 +145,24 @@
 				}
 			]
 		},
+		{
+			"begin": "^(\\s*):(scss)(?=\\(|$)",
+			"beginCaptures": {
+				"2": {
+					"name": "constant.language.name.scss.filter.pug"
+				}
+			},
+			"end": "^(?!(\\1\\s)|\\s*$)",
+			"name": "source.css.scss.filter.pug",
+			"patterns": [
+				{
+					"include": "#tag_attributes"
+				},
+				{
+					"include": "source.css.scss"
+				}
+			]
+		},
 		{
 			"begin": "^(\\s*):(less)(?=\\(|$)",
 			"beginCaptures": {
@@ -198,6 +216,24 @@
 				}
 			]
 		},
+		{
+			"begin": "^(\\s*):(uglify-js)(?=\\(|$)",
+			"beginCaptures": {
+				"2": {
+					"name": "constant.language.name.js.filter.pug"
+				}
+			},
+			"end": "^(?!(\\1\\s)|\\s*$)",
+			"name": "source.js.filter.pug",
+			"patterns": [
+				{
+					"include": "#tag_attributes"
+				},
+				{
+					"include": "source.js"
+				}
+			]
+		},
 		{
 			"begin": "^(\\s*)((:(?=.))|(:$))",
 			"beginCaptures": {
@@ -233,7 +269,7 @@
 			]
 		},
 		{
-			"begin": "^(\\s*)(?=[\\w.#].*?\\.$)(?=(?:(?:(?:(?:(?:#[\\w-]+)|(?:\\.[\\w-]+))|(?:(?:[#!]\\{[^}]*\\})|(?:\\w(?:(?:[\\w:-]+[\\w-])|(?:[\\w-]*)))))(?:(?:#[\\w-]+)|(?:\\.[\\w-]+)|(?:\\((?:[^()\\'\\\"]*(?:(?:\\'(?:[^\\']|(?:(?<!\\\\)\\\\\\'))*\\')|(?:\\\"(?:[^\\\"]|(?:(?<!\\\\)\\\\\\\"))*\\\")))*[^()]*\\))*)*)(?:(?:(?::\\s+)|(?<=\\)))(?:(?:(?:(?:#[\\w-]+)|(?:\\.[\\w-]+))|(?:(?:[#!]\\{[^}]*\\})|(?:\\w(?:(?:[\\w:-]+[\\w-])|(?:[\\w-]*)))))(?:(?:#[\\w-]+)|(?:\\.[\\w-]+)|(?:\\((?:[^()\\'\\\"]*(?:(?:\\'(?:[^\\']|(?:(?<!\\\\)\\\\\\'))*\\')|(?:\\\"(?:[^\\\"]|(?:(?<!\\\\)\\\\\\\"))*\\\")))*[^()]*\\))*)*))*)\\.$)(?:(?:(#[\\w-]+)|(\\.[\\w-]+))|((?:[#!]\\{[^}]*\\})|(?:\\w(?:(?:[\\w:-]+[\\w-])|(?:[\\w-]*)))))",
+			"begin": "^(\\s*)(?:(?=\\.$)|(?:(?=[\\w.#].*?\\.$)(?=(?:(?:(?:(?:(?:#[\\w-]+)|(?:\\.[\\w-]+))|(?:(?:[#!]\\{[^}]*\\})|(?:\\w(?:(?:[\\w:-]+[\\w-])|(?:[\\w-]*)))))(?:(?:#[\\w-]+)|(?:\\.[\\w-]+)|(?:\\((?:[^()\\'\\\"]*(?:(?:\\'(?:[^\\']|(?:(?<!\\\\)\\\\\\'))*\\')|(?:\\\"(?:[^\\\"]|(?:(?<!\\\\)\\\\\\\"))*\\\")))*[^()]*\\))*)*)(?:(?:(?::\\s+)|(?<=\\)))(?:(?:(?:(?:#[\\w-]+)|(?:\\.[\\w-]+))|(?:(?:[#!]\\{[^}]*\\})|(?:\\w(?:(?:[\\w:-]+[\\w-])|(?:[\\w-]*)))))(?:(?:#[\\w-]+)|(?:\\.[\\w-]+)|(?:\\((?:[^()\\'\\\"]*(?:(?:\\'(?:[^\\']|(?:(?<!\\\\)\\\\\\'))*\\')|(?:\\\"(?:[^\\\"]|(?:(?<!\\\\)\\\\\\\"))*\\\")))*[^()]*\\))*)*))*)\\.$)(?:(?:(#[\\w-]+)|(\\.[\\w-]+))|((?:[#!]\\{[^}]*\\})|(?:\\w(?:(?:[\\w:-]+[\\w-])|(?:[\\w-]*)))))))",
 			"beginCaptures": {
 				"2": {
 					"name": "entity.other.attribute-name.id.pug"
@@ -248,6 +284,10 @@
 			"end": "^(?!(\\1\\s)|\\s*$)",
 			"comment": "Generated from dot_block_tag.py",
 			"patterns": [
+				{
+					"match": "\\.$",
+					"name": "storage.type.function.pug.dot-block-dot"
+				},
 				{
 					"include": "#tag_attributes"
 				},
@@ -301,6 +341,9 @@
 				{
 					"include": "#flow_control"
 				},
+				{
+					"include": "#flow_control_each"
+				},
 				{
 					"include": "#case_conds"
 				},
@@ -471,7 +514,7 @@
 			]
 		},
 		"flow_control": {
-			"begin": "(for|if|else if|else|each|until|while|unless|case)(\\s+|$)",
+			"begin": "(for|if|else if|else|until|while|unless|case)(\\s+|$)",
 			"captures": {
 				"1": {
 					"name": "storage.type.function.pug"
@@ -493,6 +536,32 @@
 				}
 			]
 		},
+		"flow_control_each": {
+			"begin": "(each)(\\s+|$)",
+			"captures": {
+				"1": {
+					"name": "storage.type.function.pug"
+				}
+			},
+			"end": "$",
+			"name": "meta.control.flow.pug.each",
+			"patterns": [
+				{
+					"match": "([\\w$_]+)(?:\\s*,\\s*([\\w$_]+))?",
+					"name": "variable.other.pug.each-var"
+				},
+				{
+					"begin": "",
+					"end": "$",
+					"name": "js.embedded.control.flow.pug",
+					"patterns": [
+						{
+							"include": "source.js"
+						}
+					]
+				}
+			]
+		},
 		"case_when_paren": {
 			"begin": "\\(",
 			"end": "\\)",
@@ -549,6 +618,11 @@
 		"complete_tag": {
 			"begin": "(?=[\\w.#])|(:\\s*)",
 			"end": "(\\.?$)|(?=:.)",
+			"endCaptures": {
+				"1": {
+					"name": "storage.type.function.pug.dot-block-dot"
+				}
+			},
 			"patterns": [
 				{
 					"include": "#blocks_and_includes"
@@ -562,6 +636,9 @@
 				{
 					"include": "#flow_control"
 				},
+				{
+					"include": "#flow_control_each"
+				},
 				{
 					"match": "(?<=:)\\w.*$",
 					"name": "invalid.illegal.name.tag.pug"
@@ -656,7 +733,7 @@
 				},
 				{
 					"begin": "=\\s*",
-					"end": "$|(?=,|(?:\\s+[^!%&*\\-+~|<>:?/])|\\))",
+					"end": "$|(?=,|(?:\\s+[^!%&*\\-+~|<>?/])|\\))",
 					"name": "attribute_value",
 					"patterns": [
 						{
@@ -678,7 +755,7 @@
 				},
 				{
 					"begin": "(?<=[%&*\\-+~|<>:?/])\\s+",
-					"end": "$|(?=,|(?:\\s+[^!%&*\\-+~|<>:?/])|\\))",
+					"end": "$|(?=,|(?:\\s+[^!%&*\\-+~|<>?/])|\\))",
 					"name": "attribute_value2",
 					"patterns": [
 						{
diff --git a/extensions/python/package.json b/extensions/python/package.json
index 17cbe7787e18ac..332ff083c2bc44 100644
--- a/extensions/python/package.json
+++ b/extensions/python/package.json
@@ -45,7 +45,12 @@
         "scopeName": "source.regexp.python",
         "path": "./syntaxes/MagicRegExp.tmLanguage.json"
       }
-    ]
+    ],
+    "configurationDefaults": {
+      "[python]": {
+        "diffEditor.ignoreTrimWhitespace": false
+      }
+    }
   },
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin MagicStack/MagicPython grammars/MagicPython.tmLanguage ./syntaxes/MagicPython.tmLanguage.json grammars/MagicRegExp.tmLanguage ./syntaxes/MagicRegExp.tmLanguage.json"
diff --git a/extensions/razor/cgmanifest.json b/extensions/razor/cgmanifest.json
index d74caebd37ceaf..56b865a44084ec 100644
--- a/extensions/razor/cgmanifest.json
+++ b/extensions/razor/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "dotnet/razor-tooling",
 					"repositoryUrl": "https://github.com/dotnet/razor-tooling",
-					"commitHash": "4d5eeeaeeadf6371354e5fd8ad4c195185806f0c"
+					"commitHash": "8d0ae9664cb27276eab36d83e48e88356468ca67"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/razor/syntaxes/cshtml.tmLanguage.json b/extensions/razor/syntaxes/cshtml.tmLanguage.json
index 3adbebf821b9d2..36805c4eb25cc0 100644
--- a/extensions/razor/syntaxes/cshtml.tmLanguage.json
+++ b/extensions/razor/syntaxes/cshtml.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/razor-tooling/commit/4d5eeeaeeadf6371354e5fd8ad4c195185806f0c",
+	"version": "https://github.com/dotnet/razor-tooling/commit/8d0ae9664cb27276eab36d83e48e88356468ca67",
 	"name": "ASP.NET Razor",
 	"scopeName": "text.html.cshtml",
 	"patterns": [
@@ -41,6 +41,31 @@
 				}
 			]
 		},
+		"optionally-transitioned-razor-control-structures": {
+			"patterns": [
+				{
+					"include": "#razor-comment"
+				},
+				{
+					"include": "#razor-codeblock"
+				},
+				{
+					"include": "#explicit-razor-expression"
+				},
+				{
+					"include": "#escaped-transition"
+				},
+				{
+					"include": "#directives"
+				},
+				{
+					"include": "#optionally-transitioned-csharp-control-structures"
+				},
+				{
+					"include": "#implicit-expression"
+				}
+			]
+		},
 		"escaped-transition": {
 			"name": "constant.character.escape.razor.transition",
 			"match": "@@"
@@ -89,7 +114,7 @@
 					"include": "#razor-single-line-markup"
 				},
 				{
-					"include": "#razor-control-structures"
+					"include": "#optionally-transitioned-razor-control-structures"
 				},
 				{
 					"include": "source.cs"
@@ -966,6 +991,40 @@
 				}
 			}
 		},
+		"optionally-transitioned-csharp-control-structures": {
+			"patterns": [
+				{
+					"include": "#using-statement-with-optional-transition"
+				},
+				{
+					"include": "#if-statement-with-optional-transition"
+				},
+				{
+					"include": "#else-part"
+				},
+				{
+					"include": "#foreach-statement-with-optional-transition"
+				},
+				{
+					"include": "#for-statement-with-optional-transition"
+				},
+				{
+					"include": "#while-statement"
+				},
+				{
+					"include": "#switch-statement-with-optional-transition"
+				},
+				{
+					"include": "#lock-statement-with-optional-transition"
+				},
+				{
+					"include": "#do-statement-with-optional-transition"
+				},
+				{
+					"include": "#try-statement-with-optional-transition"
+				}
+			]
+		},
 		"transitioned-csharp-control-structures": {
 			"patterns": [
 				{
@@ -1001,6 +1060,34 @@
 			]
 		},
 		"using-statement": {
+			"name": "meta.statement.using.razor",
+			"begin": "(?:(@))(using)\\b\\s*(?=\\()",
+			"beginCaptures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#transition"
+						}
+					]
+				},
+				"2": {
+					"name": "keyword.other.using.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#csharp-condition"
+				},
+				{
+					"include": "#csharp-code-block"
+				},
+				{
+					"include": "#razor-codeblock-body"
+				}
+			],
+			"end": "(?<=})"
+		},
+		"using-statement-with-optional-transition": {
 			"name": "meta.statement.using.razor",
 			"begin": "(?:^\\s*|(@))(using)\\b\\s*(?=\\()",
 			"beginCaptures": {
@@ -1029,6 +1116,34 @@
 			"end": "(?<=})"
 		},
 		"if-statement": {
+			"name": "meta.statement.if.razor",
+			"begin": "(?:(@))(if)\\b\\s*(?=\\()",
+			"beginCaptures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#transition"
+						}
+					]
+				},
+				"2": {
+					"name": "keyword.control.conditional.if.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#csharp-condition"
+				},
+				{
+					"include": "#csharp-code-block"
+				},
+				{
+					"include": "#razor-codeblock-body"
+				}
+			],
+			"end": "(?<=})"
+		},
+		"if-statement-with-optional-transition": {
 			"name": "meta.statement.if.razor",
 			"begin": "(?:^\\s*|(@))(if)\\b\\s*(?=\\()",
 			"beginCaptures": {
@@ -1081,6 +1196,34 @@
 			"end": "(?<=})"
 		},
 		"for-statement": {
+			"name": "meta.statement.for.razor",
+			"begin": "(?:(@))(for)\\b\\s*(?=\\()",
+			"beginCaptures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#transition"
+						}
+					]
+				},
+				"2": {
+					"name": "keyword.control.loop.for.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#csharp-condition"
+				},
+				{
+					"include": "#csharp-code-block"
+				},
+				{
+					"include": "#razor-codeblock-body"
+				}
+			],
+			"end": "(?<=})"
+		},
+		"for-statement-with-optional-transition": {
 			"name": "meta.statement.for.razor",
 			"begin": "(?:^\\s*|(@))(for)\\b\\s*(?=\\()",
 			"beginCaptures": {
@@ -1109,6 +1252,41 @@
 			"end": "(?<=})"
 		},
 		"foreach-statement": {
+			"name": "meta.statement.foreach.razor",
+			"begin": "(?:(@)(await\\s+)?)(foreach)\\b\\s*(?=\\()",
+			"beginCaptures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#transition"
+						}
+					]
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#await-prefix"
+						}
+					]
+				},
+				"3": {
+					"name": "keyword.control.loop.foreach.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#foreach-condition"
+				},
+				{
+					"include": "#csharp-code-block"
+				},
+				{
+					"include": "#razor-codeblock-body"
+				}
+			],
+			"end": "(?<=})"
+		},
+		"foreach-statement-with-optional-transition": {
 			"name": "meta.statement.foreach.razor",
 			"begin": "(?:^\\s*|(@)(await\\s+)?)(foreach)\\b\\s*(?=\\()",
 			"beginCaptures": {
@@ -1203,7 +1381,35 @@
 		},
 		"do-statement": {
 			"name": "meta.statement.do.razor",
-			"begin": "(?:^\\s*|(@))(do)\\b\\s*",
+			"begin": "(?:(@))(do)\\b\\s",
+			"beginCaptures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#transition"
+						}
+					]
+				},
+				"2": {
+					"name": "keyword.control.loop.do.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#csharp-condition"
+				},
+				{
+					"include": "#csharp-code-block"
+				},
+				{
+					"include": "#razor-codeblock-body"
+				}
+			],
+			"end": "(?<=})"
+		},
+		"do-statement-with-optional-transition": {
+			"name": "meta.statement.do.razor",
+			"begin": "(?:^\\s*|(@))(do)\\b\\s",
 			"beginCaptures": {
 				"1": {
 					"patterns": [
@@ -1263,6 +1469,34 @@
 			}
 		},
 		"switch-statement": {
+			"name": "meta.statement.switch.razor",
+			"begin": "(?:(@))(switch)\\b\\s*(?=\\()",
+			"beginCaptures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#transition"
+						}
+					]
+				},
+				"2": {
+					"name": "keyword.control.switch.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#csharp-condition"
+				},
+				{
+					"include": "#switch-code-block"
+				},
+				{
+					"include": "#razor-codeblock-body"
+				}
+			],
+			"end": "(?<=})"
+		},
+		"switch-statement-with-optional-transition": {
 			"name": "meta.statement.switch.razor",
 			"begin": "(?:^\\s*|(@))(switch)\\b\\s*(?=\\()",
 			"beginCaptures": {
@@ -1314,6 +1548,34 @@
 			}
 		},
 		"lock-statement": {
+			"name": "meta.statement.lock.razor",
+			"begin": "(?:(@))(lock)\\b\\s*(?=\\()",
+			"beginCaptures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#transition"
+						}
+					]
+				},
+				"2": {
+					"name": "keyword.other.lock.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#csharp-condition"
+				},
+				{
+					"include": "#csharp-code-block"
+				},
+				{
+					"include": "#razor-codeblock-body"
+				}
+			],
+			"end": "(?<=})"
+		},
+		"lock-statement-with-optional-transition": {
 			"name": "meta.statement.lock.razor",
 			"begin": "(?:^\\s*|(@))(lock)\\b\\s*(?=\\()",
 			"beginCaptures": {
@@ -1354,7 +1616,48 @@
 				}
 			]
 		},
+		"try-statement-with-optional-transition": {
+			"patterns": [
+				{
+					"include": "#try-block-with-optional-transition"
+				},
+				{
+					"include": "#catch-clause"
+				},
+				{
+					"include": "#finally-clause"
+				}
+			]
+		},
 		"try-block": {
+			"name": "meta.statement.try.razor",
+			"begin": "(?:(@))(try)\\b\\s*",
+			"beginCaptures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#transition"
+						}
+					]
+				},
+				"2": {
+					"name": "keyword.control.try.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#csharp-condition"
+				},
+				{
+					"include": "#csharp-code-block"
+				},
+				{
+					"include": "#razor-codeblock-body"
+				}
+			],
+			"end": "(?<=})"
+		},
+		"try-block-with-optional-transition": {
 			"name": "meta.statement.try.razor",
 			"begin": "(?:^\\s*|(@))(try)\\b\\s*",
 			"beginCaptures": {
diff --git a/extensions/references-view/src/calls/model.ts b/extensions/references-view/src/calls/model.ts
index ce8cbbcf973d0b..30d320355aa2e0 100644
--- a/extensions/references-view/src/calls/model.ts
+++ b/extensions/references-view/src/calls/model.ts
@@ -180,13 +180,34 @@ class CallItemDataProvider implements vscode.TreeDataProvider<CallItem> {
 		item.tooltip = item.label ? `${item.label} - ${element.item.detail}` : element.item.detail;
 		item.contextValue = 'call-item';
 		item.iconPath = getThemeIcon(element.item.kind);
+
+		type OpenArgs = [vscode.Uri, vscode.TextDocumentShowOptions];
+		let openArgs: OpenArgs;
+
+		if (element.model.direction === CallsDirection.Outgoing) {
+
+			openArgs = [element.item.uri, { selection: element.item.selectionRange.with({ end: element.item.selectionRange.start }) }];
+
+		} else {
+			// incoming call -> reveal first call instead of caller
+			let firstLoctionStart: vscode.Position | undefined;
+			if (element.locations) {
+				for (const loc of element.locations) {
+					if (loc.uri.toString() === element.item.uri.toString()) {
+						firstLoctionStart = firstLoctionStart?.isBefore(loc.range.start) ? firstLoctionStart : loc.range.start;
+					}
+				}
+			}
+			if (!firstLoctionStart) {
+				firstLoctionStart = element.item.selectionRange.start;
+			}
+			openArgs = [element.item.uri, { selection: new vscode.Range(firstLoctionStart, firstLoctionStart) }];
+		}
+
 		item.command = {
 			command: 'vscode.open',
 			title: vscode.l10n.t('Open Call'),
-			arguments: [
-				element.item.uri,
-				<vscode.TextDocumentShowOptions>{ selection: element.item.selectionRange.with({ end: element.item.selectionRange.start }) }
-			]
+			arguments: openArgs
 		};
 		item.collapsibleState = vscode.TreeItemCollapsibleState.Collapsed;
 		return item;
diff --git a/extensions/references-view/src/navigation.ts b/extensions/references-view/src/navigation.ts
index e592dfbf7eae60..fdb7dc648811c4 100644
--- a/extensions/references-view/src/navigation.ts
+++ b/extensions/references-view/src/navigation.ts
@@ -18,6 +18,7 @@ export class Navigation {
 		this._disposables.push(
 			vscode.commands.registerCommand('references-view.next', () => this.next(false)),
 			vscode.commands.registerCommand('references-view.prev', () => this.previous(false)),
+			_view.onDidChangeSelection(() => this._ensureSelectedElementIsVisible()),
 		);
 	}
 
@@ -30,6 +31,20 @@ export class Navigation {
 		this._ctxCanNavigate.set(Boolean(this._delegate));
 	}
 
+	private _ensureSelectedElementIsVisible(): void {
+		if (this._view.selection.length === 0) {
+			return;
+		}
+		const [item] = this._view.selection;
+		const location = this._delegate?.location(item);
+		if (!location) {
+			return;
+		}
+		if (vscode.window.activeTextEditor?.document.uri.toString() !== location.uri.toString()) {
+			this._open(location, true);
+		}
+	}
+
 	private _anchor(): undefined | unknown {
 		if (!this._delegate) {
 			return undefined;
diff --git a/extensions/references-view/src/references/model.ts b/extensions/references-view/src/references/model.ts
index 83978565f2057e..19bac0047d9508 100644
--- a/extensions/references-view/src/references/model.ts
+++ b/extensions/references-view/src/references/model.ts
@@ -126,7 +126,9 @@ export class ReferencesModel implements SymbolItemNavigation<FileItem | Referenc
 	}
 
 	location(item: FileItem | ReferenceItem) {
-		return item instanceof ReferenceItem ? item.location : undefined;
+		return item instanceof ReferenceItem
+			? item.location
+			: new vscode.Location(item.uri, item.references[0]?.location.range ?? new vscode.Position(0, 0));
 	}
 
 	nearest(uri: vscode.Uri, position: vscode.Position): FileItem | ReferenceItem | undefined {
diff --git a/extensions/shared.webpack.config.js b/extensions/shared.webpack.config.js
index 6b70079224d3ac..1ad14eca57dfb2 100644
--- a/extensions/shared.webpack.config.js
+++ b/extensions/shared.webpack.config.js
@@ -15,6 +15,13 @@ const CopyWebpackPlugin = require('copy-webpack-plugin');
 const { NLSBundlePlugin } = require('vscode-nls-dev/lib/webpack-bundler');
 const { DefinePlugin, optimize } = require('webpack');
 
+const tsLoaderOptions = {
+	compilerOptions: {
+		'sourceMap': true,
+	},
+	onlyCompileBundledFiles: true,
+};
+
 function withNodeDefaults(/**@type WebpackConfig*/extConfig) {
 	/** @type WebpackConfig */
 	const defaultConfig = {
@@ -42,11 +49,7 @@ function withNodeDefaults(/**@type WebpackConfig*/extConfig) {
 					// configure TypeScript loader:
 					// * enable sources maps for end-to-end source maps
 					loader: 'ts-loader',
-					options: {
-						compilerOptions: {
-							'sourceMap': true,
-						}
-					}
+					options: tsLoaderOptions
 				}, {
 					loader: path.resolve(__dirname, 'mangle-loader.js'),
 					options: {
@@ -125,11 +128,8 @@ function withBrowserDefaults(/**@type WebpackConfig*/extConfig, /** @type Additi
 						// * enable sources maps for end-to-end source maps
 						loader: 'ts-loader',
 						options: {
-							compilerOptions: {
-								'sourceMap': true,
-							},
+							...tsLoaderOptions,
 							...(additionalOptions ? {} : { configFile: additionalOptions.configFile }),
-							onlyCompileBundledFiles: true,
 						}
 					},
 					{
diff --git a/extensions/shellscript/cgmanifest.json b/extensions/shellscript/cgmanifest.json
index 6f0ae3a254e693..1a444370322427 100644
--- a/extensions/shellscript/cgmanifest.json
+++ b/extensions/shellscript/cgmanifest.json
@@ -4,14 +4,13 @@
 			"component": {
 				"type": "git",
 				"git": {
-					"name": "atom/language-shellscript",
-					"repositoryUrl": "https://github.com/atom/language-shellscript",
-					"commitHash": "4f8d7bb5cc4d1643674551683df10fe552dd5a6f"
+					"name": "jeff-hykin/better-shell-syntax",
+					"repositoryUrl": "https://github.com/jeff-hykin/better-shell-syntax",
+					"commitHash": "b05618771b35b4baa25661dff91170b4924fdac8"
 				}
 			},
 			"license": "MIT",
-			"description": "The file syntaxes/shell-unix-bash.tmLanguage.json was derived from the Atom package https://github.com/atom/language-shellscript which was originally converted from the TextMate bundle https://github.com/textmate/shellscript.tmbundle.",
-			"version": "0.28.2"
+			"version": "1.2.8"
 		}
 	],
 	"version": 1
diff --git a/extensions/shellscript/package.json b/extensions/shellscript/package.json
index 7fa55ea680c5ff..36031a33840984 100644
--- a/extensions/shellscript/package.json
+++ b/extensions/shellscript/package.json
@@ -9,7 +9,7 @@
     "vscode": "*"
   },
   "scripts": {
-    "update-grammar": "node ../node_modules/vscode-grammar-updater/bin atom/language-shellscript grammars/shell-unix-bash.cson ./syntaxes/shell-unix-bash.tmLanguage.json"
+    "update-grammar": "node ../node_modules/vscode-grammar-updater/bin jeff-hykin/better-shell-syntax autogenerated/shell.tmLanguage.json ./syntaxes/shell-unix-bash.tmLanguage.json"
   },
   "contributes": {
     "languages": [
diff --git a/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json b/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json
index bfbb5f135d03f9..cedbdfad988d15 100644
--- a/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json
+++ b/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json
@@ -1,60 +1,184 @@
 {
 	"information_for_contributors": [
-		"This file has been converted from https://github.com/atom/language-shellscript/blob/master/grammars/shell-unix-bash.cson",
+		"This file has been converted from https://github.com/jeff-hykin/better-shell-syntax/blob/master/autogenerated/shell.tmLanguage.json",
 		"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/atom/language-shellscript/commit/4f8d7bb5cc4d1643674551683df10fe552dd5a6f",
+	"version": "https://github.com/jeff-hykin/better-shell-syntax/commit/b05618771b35b4baa25661dff91170b4924fdac8",
 	"name": "Shell Script",
 	"scopeName": "source.shell",
 	"patterns": [
 		{
-			"include": "#comment"
-		},
-		{
-			"include": "#pipeline"
-		},
-		{
-			"include": "#list"
-		},
-		{
-			"include": "#compound-command"
-		},
-		{
-			"include": "#loop"
-		},
-		{
-			"include": "#string"
-		},
-		{
-			"include": "#function-definition"
-		},
-		{
-			"include": "#variable"
-		},
-		{
-			"include": "#interpolation"
+			"include": "#initial_context"
+		}
+	],
+	"repository": {
+		"alias_statement": {
+			"begin": "(alias)(?:\\s)+\\s*+((?<!\\w)[a-zA-Z_][a-zA-Z_0-9]*(?!\\w))(?:(\\[)((?:(?:(?:\\$)?(?<!\\w)[a-zA-Z_][a-zA-Z_0-9]*(?!\\w)|@)|\\*))(\\]))?(?:(?:(\\=)|(\\+\\=))|(\\-\\=))",
+			"end": "(?:(?:(?:(?:(?:(;)|(&&))|(\\|\\|))|(&))|\\n)|(?= |$))",
+			"beginCaptures": {
+				"1": {
+					"name": "storage.type.alias.shell"
+				},
+				"2": {
+					"name": "variable.other.assignment.shell"
+				},
+				"3": {
+					"name": "punctuation.definition.array.access.shell"
+				},
+				"4": {
+					"name": "variable.other.assignment.shell"
+				},
+				"5": {
+					"name": "punctuation.definition.array.access.shell"
+				},
+				"6": {
+					"name": "keyword.operator.assignment.shell"
+				},
+				"7": {
+					"name": "keyword.operator.assignment.compound.shell"
+				},
+				"8": {
+					"name": "keyword.operator.assignment.compound.shell"
+				}
+			},
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.terminator.statement.semicolon.shell"
+				},
+				"2": {
+					"name": "punctuation.separator.statement.and.shell"
+				},
+				"3": {
+					"name": "punctuation.separator.statement.or.shell"
+				},
+				"4": {
+					"name": "punctuation.separator.statement.background.shell"
+				}
+			},
+			"name": "meta.expression.assignment.shell",
+			"patterns": [
+				{
+					"include": "#statement_context"
+				}
+			]
 		},
-		{
-			"include": "#heredoc"
+		"argument": {
+			"begin": "\\s++(?!(?:%|&|\\||\\(|\\[|#|\\n|$|;))",
+			"end": "(?=\\s|;|\\||&|$|\\n|\\)|\\`)",
+			"beginCaptures": {},
+			"endCaptures": {},
+			"name": "meta.argument.shell",
+			"patterns": [
+				{
+					"include": "#argument_context"
+				},
+				{
+					"include": "#line_continuation"
+				}
+			]
 		},
-		{
-			"include": "#herestring"
+		"argument_context": {
+			"patterns": [
+				{
+					"match": "[^ \n'&;<>\\(\\)\\$`\\\\\"\\|]+(?!>)",
+					"captures": {
+						"0": {
+							"patterns": [
+								{
+									"match": "\\*",
+									"name": "variable.language.special.wildcard.shell"
+								},
+								{
+									"include": "#variable"
+								},
+								{
+									"include": "#numeric_literal"
+								},
+								{
+									"match": "(?<!\\w)(\\b(?:true|false)\\b)(?!\\w)",
+									"captures": {
+										"1": {
+											"name": "constant.language.$1.shell"
+										}
+									}
+								}
+							]
+						}
+					},
+					"name": "string.unquoted.argument.shell"
+				},
+				{
+					"include": "#statement_context"
+				}
+			]
 		},
-		{
-			"include": "#redirection"
+		"assignment": {
+			"begin": "\\s*+((?<!\\w)[a-zA-Z_][a-zA-Z_0-9]*(?!\\w))(?:(\\[)((?:(?:(?:\\$)?(?<!\\w)[a-zA-Z_][a-zA-Z_0-9]*(?!\\w)|@)|\\*))(\\]))?(?:(?:(\\=)|(\\+\\=))|(\\-\\=))",
+			"end": "(?:(?:(?:(?:(?:(;)|(&&))|(\\|\\|))|(&))|\\n)|(?= |$))",
+			"beginCaptures": {
+				"1": {
+					"name": "variable.other.assignment.shell"
+				},
+				"2": {
+					"name": "punctuation.definition.array.access.shell"
+				},
+				"3": {
+					"name": "variable.other.assignment.shell"
+				},
+				"4": {
+					"name": "punctuation.definition.array.access.shell"
+				},
+				"5": {
+					"name": "keyword.operator.assignment.shell"
+				},
+				"6": {
+					"name": "keyword.operator.assignment.compound.shell"
+				},
+				"7": {
+					"name": "keyword.operator.assignment.compound.shell"
+				}
+			},
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.terminator.statement.semicolon.shell"
+				},
+				"2": {
+					"name": "punctuation.separator.statement.and.shell"
+				},
+				"3": {
+					"name": "punctuation.separator.statement.or.shell"
+				},
+				"4": {
+					"name": "punctuation.separator.statement.background.shell"
+				}
+			},
+			"name": "meta.expression.assignment.shell",
+			"patterns": [
+				{
+					"include": "#argument_context"
+				}
+			]
 		},
-		{
-			"include": "#pathname"
+		"block_comment": {
+			"begin": "\\s*+(\\/\\*)",
+			"end": "\\*\\/",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.definition.comment.begin.shell"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.comment.end.shell"
+				}
+			},
+			"name": "comment.block.shell"
 		},
-		{
-			"include": "#keyword"
+		"boolean": {
+			"match": "\\b(?:true|false)\\b",
+			"name": "constant.language.$0.shell"
 		},
-		{
-			"include": "#support"
-		}
-	],
-	"repository": {
 		"case-clause": {
 			"patterns": [
 				{
@@ -106,7 +230,7 @@
 							"name": "meta.scope.case-clause-body.shell",
 							"patterns": [
 								{
-									"include": "$self"
+									"include": "#initial_context"
 								}
 							]
 						}
@@ -114,572 +238,323 @@
 				}
 			]
 		},
-		"comment": {
-			"begin": "(^\\s+)?(?<=^|\\W)(?<!-)(?=#)(?!#{)",
-			"beginCaptures": {
-				"1": {
-					"name": "punctuation.whitespace.comment.leading.shell"
-				}
-			},
-			"end": "(?!\\G)",
+		"command_call": {
+			"begin": "(?!^ *+$)(?<=(?:^|;|\\||&|!|\\(|\\{|\\`))\\s*+(?!nocorrect\\W|nocorrect\\$|readonly\\W|readonly\\$|function\\W|function\\$|foreach\\W|foreach\\$|coproc\\W|coproc\\$|logout\\W|logout\\$|export\\W|export\\$|select\\W|select\\$|repeat\\W|repeat\\$|pushd\\W|pushd\\$|until\\W|until\\$|while\\W|while\\$|local\\W|local\\$|case\\W|case\\$|done\\W|done\\$|elif\\W|elif\\$|else\\W|else\\$|esac\\W|esac\\$|popd\\W|popd\\$|then\\W|then\\$|time\\W|time\\$|for\\W|for\\$|end\\W|end\\$|fi\\W|fi\\$|do\\W|do\\$|in\\W|in\\$|if\\W|if\\$)",
+			"end": "(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|#|\\])(?<!\\\\)",
+			"beginCaptures": {},
+			"endCaptures": {},
+			"name": "meta.statement.shell",
 			"patterns": [
 				{
-					"begin": "#!",
+					"begin": "\\s*+(?!(?:!|%|&|\\||\\(|\\)|\\{|\\[|<|>|#|\\n|$|;|\\s))(.+?)(?:(?=\\s)|(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|#|\\])(?<!\\\\))",
+					"end": "(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|#|\\])(?<!\\\\)",
 					"beginCaptures": {
 						"0": {
-							"name": "punctuation.definition.comment.shebang.shell"
-						}
-					},
-					"end": "$",
-					"name": "comment.line.number-sign.shebang.shell"
-				},
-				{
-					"begin": "#",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.comment.shell"
-						}
-					},
-					"end": "$",
-					"name": "comment.line.number-sign.shell"
-				}
-			]
-		},
-		"compound-command": {
-			"patterns": [
-				{
-					"begin": "\\[{1,2}",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.logical-expression.shell"
-						}
-					},
-					"end": "\\]{1,2}",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.logical-expression.shell"
-						}
-					},
-					"name": "meta.scope.logical-expression.shell",
-					"patterns": [
-						{
-							"include": "#logical-expression"
+							"name": "meta.command_name.shell"
 						},
-						{
-							"include": "$self"
-						}
-					]
-				},
-				{
-					"begin": "\\({2}",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.begin.shell"
-						}
-					},
-					"end": "\\){2}",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.end.shell"
-						}
-					},
-					"name": "string.other.math.shell",
-					"patterns": [
-						{
-							"include": "#math"
-						}
-					]
-				},
-				{
-					"begin": "\\(",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.subshell.shell"
-						}
-					},
-					"end": "\\)",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.subshell.shell"
-						}
-					},
-					"name": "meta.scope.subshell.shell",
-					"patterns": [
-						{
-							"include": "$self"
-						}
-					]
-				},
-				{
-					"begin": "(?<=\\s|^){(?=\\s|$)",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.group.shell"
-						}
-					},
-					"end": "(?<=^|;)\\s*(})",
-					"endCaptures": {
 						"1": {
-							"name": "punctuation.definition.group.shell"
+							"name": "entity.name.command.shell",
+							"patterns": [
+								{
+									"match": "(?<!\\w)(?:return|break)(?!\\w)",
+									"name": "keyword.control.$0.shell"
+								},
+								{
+									"match": "(?<!\\w)(?:unfunction|unsetopt|autoload|unlimit|bindkey|builtin|command|getopts|history|declare|unalias|typeset|suspend|return|source|ulimit|unhash|disown|which|alias|break|false|print|shift|times|umask|umask|unset|read|type|exec|eval|wait|echo|dirs|hash|jobs|kill|stat|exit|test|trap|true|pwd|let|set|cd|fg|bg|fc|:|\\.)(?!\\w)",
+									"name": "support.function.builtin.shell"
+								},
+								{
+									"include": "#variable"
+								}
+							]
 						}
 					},
-					"name": "meta.scope.group.shell",
+					"endCaptures": {},
+					"name": "meta.command.shell",
 					"patterns": [
 						{
-							"include": "$self"
-						}
-					]
-				}
-			]
-		},
-		"function-definition": {
-			"patterns": [
-				{
-					"begin": "(?<=^|;|&|\\s)(function)\\s+([^\\s\\\\]+)(?:\\s*(\\(\\)))?",
-					"beginCaptures": {
-						"1": {
-							"name": "storage.type.function.shell"
-						},
-						"2": {
-							"name": "entity.name.function.shell"
+							"include": "#line_continuation"
 						},
-						"3": {
-							"name": "punctuation.definition.arguments.shell"
-						}
-					},
-					"end": ";|&|$",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.function.shell"
-						}
-					},
-					"name": "meta.function.shell",
-					"patterns": [
 						{
-							"include": "$self"
-						}
-					]
-				},
-				{
-					"begin": "(?<=^|;|&|\\s)([^\\s\\\\=]+)\\s*(\\(\\))",
-					"beginCaptures": {
-						"1": {
-							"name": "entity.name.function.shell"
+							"include": "#option"
 						},
-						"2": {
-							"name": "punctuation.definition.arguments.shell"
-						}
-					},
-					"end": ";|&|$",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.function.shell"
-						}
-					},
-					"name": "meta.function.shell",
-					"patterns": [
 						{
-							"include": "$self"
-						}
-					]
-				}
-			]
-		},
-		"heredoc": {
-			"patterns": [
-				{
-					"begin": "(<<)-\\s*(\"|'|)\\s*(RUBY)(?=\\s|;|&|<|\"|')\\2",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.operator.heredoc.shell"
+							"include": "#argument"
 						},
-						"3": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"end": "^\\t*(RUBY)(?=\\s|;|&|$)",
-					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"name": "string.unquoted.heredoc.no-indent.ruby.shell",
-					"contentName": "source.ruby.embedded.shell",
-					"patterns": [
 						{
-							"include": "source.ruby"
+							"include": "#statement_context"
 						}
 					]
 				},
 				{
-					"begin": "(<<)\\s*(\"|'|)\\s*(RUBY)(?=\\s|;|&|<|\"|')\\2",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.operator.heredoc.shell"
-						},
-						"3": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"end": "^(RUBY)(?=\\s|;|&|$)",
-					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"name": "string.unquoted.heredoc.ruby.shell",
-					"contentName": "source.ruby.embedded.shell",
-					"patterns": [
-						{
-							"include": "source.ruby"
-						}
-					]
+					"include": "#line_continuation"
 				},
 				{
-					"begin": "(<<)-\\s*(\"|'|)\\s*(PYTHON)(?=\\s|;|&|<|\"|')\\2",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.operator.heredoc.shell"
-						},
-						"3": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"end": "^\\t*(PYTHON)(?=\\s|;|&|$)",
-					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"name": "string.unquoted.heredoc.no-indent.python.shell",
-					"contentName": "source.python.embedded.shell",
+					"include": "#statement_context"
+				}
+			]
+		},
+		"command_name": {
+			"match": "\\s*+(?!(?:!|%|&|\\||\\(|\\)|\\{|\\[|<|>|#|\\n|$|;|\\s))(.+?)(?:(?=\\s)|(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|#|\\])(?<!\\\\))",
+			"captures": {
+				"1": {
+					"name": "entity.name.command.shell",
 					"patterns": [
 						{
-							"include": "source.python"
-						}
-					]
-				},
-				{
-					"begin": "(<<)\\s*(\"|'|)\\s*(PYTHON)(?=\\s|;|&|<|\"|')\\2",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.operator.heredoc.shell"
+							"match": "(?<!\\w)(?:return|break)(?!\\w)",
+							"name": "keyword.control.$0.shell"
 						},
-						"3": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"end": "^(PYTHON)(?=\\s|;|&|$)",
-					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"name": "string.unquoted.heredoc.python.shell",
-					"contentName": "source.python.embedded.shell",
-					"patterns": [
 						{
-							"include": "source.python"
-						}
-					]
-				},
-				{
-					"begin": "(<<)-\\s*(\"|'|)\\s*(APPLESCRIPT)(?=\\s|;|&|<|\"|')\\2",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.operator.heredoc.shell"
+							"match": "(?<!\\w)(?:unfunction|unsetopt|autoload|unlimit|bindkey|builtin|command|getopts|history|declare|unalias|typeset|suspend|return|source|ulimit|unhash|disown|which|alias|break|false|print|shift|times|umask|umask|unset|read|type|exec|eval|wait|echo|dirs|hash|jobs|kill|stat|exit|test|trap|true|pwd|let|set|cd|fg|bg|fc|:|\\.)(?!\\w)",
+							"name": "support.function.builtin.shell"
 						},
-						"3": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"end": "^\\t*(APPLESCRIPT)(?=\\s|;|&|$)",
-					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"name": "string.unquoted.heredoc.no-indent.applescript.shell",
-					"contentName": "source.applescript.embedded.shell",
-					"patterns": [
 						{
-							"include": "source.applescript"
+							"include": "#variable"
 						}
 					]
+				}
+			},
+			"name": "meta.command_name.shell"
+		},
+		"comment": {
+			"match": "(?<=^|\\s)(?:((#!).*)|((#).*))",
+			"captures": {
+				"1": {
+					"name": "comment.line.number-sign.shell meta.shebang.shell"
 				},
-				{
-					"begin": "(<<)\\s*(\"|'|)\\s*(APPLESCRIPT)(?=\\s|;|&|<|\"|')\\2",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.operator.heredoc.shell"
-						},
-						"3": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"end": "^(APPLESCRIPT)(?=\\s|;|&|$)",
-					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"name": "string.unquoted.heredoc.applescript.shell",
-					"contentName": "source.applescript.embedded.shell",
-					"patterns": [
-						{
-							"include": "source.applescript"
-						}
-					]
+				"2": {
+					"name": "punctuation.definition.comment.shebang.shell"
 				},
-				{
-					"begin": "(<<)-\\s*(\"|'|)\\s*(HTML)(?=\\s|;|&|<|\"|')\\2",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.operator.heredoc.shell"
-						},
-						"3": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"end": "^\\t*(HTML)(?=\\s|;|&|$)",
-					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"name": "string.unquoted.heredoc.no-indent.html.shell",
-					"contentName": "text.html.embedded.shell",
-					"patterns": [
-						{
-							"include": "text.html.basic"
-						}
-					]
+				"3": {
+					"name": "comment.line.number-sign.shell"
 				},
+				"4": {
+					"name": "punctuation.definition.comment.shell"
+				}
+			}
+		},
+		"comments": {
+			"patterns": [
 				{
-					"begin": "(<<)\\s*(\"|'|)\\s*(HTML)(?=\\s|;|&|<|\"|')\\2",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.operator.heredoc.shell"
-						},
-						"3": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"end": "^(HTML)(?=\\s|;|&|$)",
-					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"name": "string.unquoted.heredoc.html.shell",
-					"contentName": "text.html.embedded.shell",
-					"patterns": [
-						{
-							"include": "text.html.basic"
-						}
-					]
+					"include": "#block_comment"
 				},
 				{
-					"begin": "(<<)-\\s*(\"|'|)\\s*(MARKDOWN)(?=\\s|;|&|<|\"|')\\2",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.operator.heredoc.shell"
-						},
-						"3": {
-							"name": "keyword.control.heredoc-token.shell"
+					"include": "#line_comment"
+				}
+			]
+		},
+		"compound-command": {
+			"patterns": [
+				{
+					"begin": "\\[{1,2}",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.logical-expression.shell"
 						}
 					},
-					"end": "^\\t*(MARKDOWN)(?=\\s|;|&|$)",
+					"end": "\\]{1,2}",
 					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
+						"0": {
+							"name": "punctuation.definition.logical-expression.shell"
 						}
 					},
-					"name": "string.unquoted.heredoc.no-indent.markdown.shell",
-					"contentName": "text.html.markdown.embedded.shell",
+					"name": "meta.scope.logical-expression.shell",
 					"patterns": [
 						{
-							"include": "text.html.markdown"
+							"include": "#logical-expression"
+						},
+						{
+							"include": "#initial_context"
 						}
 					]
 				},
 				{
-					"begin": "(<<)\\s*(\"|'|)\\s*(MARKDOWN)(?=\\s|;|&|<|\"|')\\2",
+					"begin": "\\({2}",
 					"beginCaptures": {
-						"1": {
-							"name": "keyword.operator.heredoc.shell"
-						},
-						"3": {
-							"name": "keyword.control.heredoc-token.shell"
+						"0": {
+							"name": "punctuation.definition.string.begin.shell"
 						}
 					},
-					"end": "^(MARKDOWN)(?=\\s|;|&|$)",
+					"end": "\\){2}",
 					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
+						"0": {
+							"name": "punctuation.definition.string.end.shell"
 						}
 					},
-					"name": "string.unquoted.heredoc.markdown.shell",
-					"contentName": "text.html.markdown.embedded.shell",
+					"name": "string.other.math.shell",
 					"patterns": [
 						{
-							"include": "text.html.markdown"
+							"include": "#math"
 						}
 					]
 				},
 				{
-					"begin": "(<<)-\\s*(\"|'|)\\s*(TEXTILE)(?=\\s|;|&|<|\"|')\\2",
+					"begin": "\\(",
 					"beginCaptures": {
-						"1": {
-							"name": "keyword.operator.heredoc.shell"
-						},
-						"3": {
-							"name": "keyword.control.heredoc-token.shell"
+						"0": {
+							"name": "punctuation.definition.subshell.shell"
 						}
 					},
-					"end": "^\\t*(TEXTILE)(?=\\s|;|&|$)",
+					"end": "\\)",
 					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
+						"0": {
+							"name": "punctuation.definition.subshell.shell"
 						}
 					},
-					"name": "string.unquoted.heredoc.no-indent.textile.shell",
-					"contentName": "text.html.textile.embedded.shell",
+					"name": "meta.scope.subshell.shell",
 					"patterns": [
 						{
-							"include": "text.html.textile"
+							"include": "#initial_context"
 						}
 					]
 				},
 				{
-					"begin": "(<<)\\s*(\"|'|)\\s*(TEXTILE)(?=\\s|;|&|<|\"|')\\2",
+					"begin": "(?<=\\s|^){(?=\\s|$)",
 					"beginCaptures": {
-						"1": {
-							"name": "keyword.operator.heredoc.shell"
-						},
-						"3": {
-							"name": "keyword.control.heredoc-token.shell"
+						"0": {
+							"name": "punctuation.definition.group.shell"
 						}
 					},
-					"end": "^(TEXTILE)(?=\\s|;|&|$)",
+					"end": "(?<=^|;)\\s*(})",
 					"endCaptures": {
 						"1": {
-							"name": "keyword.control.heredoc-token.shell"
+							"name": "punctuation.definition.group.shell"
 						}
 					},
-					"name": "string.unquoted.heredoc.textile.shell",
-					"contentName": "text.html.textile.embedded.shell",
+					"name": "meta.scope.group.shell",
 					"patterns": [
 						{
-							"include": "text.html.textile"
+							"include": "#initial_context"
 						}
 					]
-				},
+				}
+			]
+		},
+		"custom_command_names": {
+			"patterns": []
+		},
+		"custom_commands": {
+			"patterns": []
+		},
+		"double_quote_escape_char": {
+			"match": "\\\\[\\$`\"\\\\\\n]",
+			"name": "constant.character.escape.shell"
+		},
+		"function-definition": {
+			"patterns": [
 				{
-					"begin": "(<<)-\\s*(\"|'|)\\s*(SHELL)(?=\\s|;|&|<|\"|')\\2",
+					"begin": "(?:^\\s*|(?<=^|;|&|\\s))(function)\\s+([^\\s\\\\]+)(?:\\s*(\\(\\)))?",
 					"beginCaptures": {
 						"1": {
-							"name": "keyword.operator.heredoc.shell"
+							"name": "storage.type.function.shell"
+						},
+						"2": {
+							"name": "entity.name.function.shell"
 						},
 						"3": {
-							"name": "keyword.control.heredoc-token.shell"
+							"name": "punctuation.definition.arguments.shell"
 						}
 					},
-					"end": "^\\t*(\\3)(?=\\s|;|&|$)",
+					"end": ";|&|$",
 					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
+						"0": {
+							"name": "punctuation.definition.function.shell"
 						}
 					},
-					"contentName": "source.shell.embedded.shell",
-					"name": "string.unquoted.heredoc.no-indent.shell.shell",
+					"name": "meta.function.shell",
 					"patterns": [
 						{
-							"include": "source.shell"
+							"include": "#initial_context"
 						}
 					]
 				},
 				{
-					"begin": "(<<)\\s*(\"|'|)\\s*(SHELL)(?=\\s|;|&|<|\"|')\\2",
+					"begin": "(?:^\\s*|(?<=^|;|&|\\s))([^\\s\\\\=]+)\\s*(\\(\\))",
 					"beginCaptures": {
 						"1": {
-							"name": "keyword.operator.heredoc.shell"
+							"name": "entity.name.function.shell"
 						},
-						"3": {
-							"name": "keyword.control.heredoc-token.shell"
+						"2": {
+							"name": "punctuation.definition.arguments.shell"
 						}
 					},
-					"end": "^(\\3)(?=\\s|;|&|$)",
+					"end": ";|&|$",
 					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
+						"0": {
+							"name": "punctuation.definition.function.shell"
 						}
 					},
-					"name": "string.unquoted.heredoc.shell.shell",
-					"contentName": "source.shell.embedded.shell",
+					"name": "meta.function.shell",
 					"patterns": [
 						{
-							"include": "source.shell"
+							"include": "#initial_context"
 						}
 					]
-				},
+				}
+			]
+		},
+		"heredoc": {
+			"patterns": [
 				{
-					"begin": "(<<)-\\s*(\"|')\\s*\\\\?([^;&<\\s]+)\\2",
+					"begin": "(<<-)\\s*+(\"|')\\s*+((?<!\\w)[a-zA-Z_][a-zA-Z_0-9]*(?!\\w))(?=\\s|;|&|<|\"|')\\2",
+					"end": "^\\t*\\3(?=\\s|;|&|$)",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.operator.heredoc.shell"
 						},
+						"2": {},
 						"3": {
-							"name": "keyword.control.heredoc-token.shell"
+							"name": "punctuation.definition.string.heredoc.shell"
 						}
 					},
-					"end": "^\\t*(\\3)(?=\\s|;|&|$)",
 					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
+						"0": {
+							"name": "punctuation.definition.string.heredoc.shell"
 						}
 					},
-					"name": "string.unquoted.heredoc.no-indent.shell"
+					"name": "string.quoted.heredoc.indent.shell",
+					"patterns": []
 				},
 				{
-					"begin": "(<<)\\s*(\"|')\\s*\\\\?([^;&<\\s]+)\\2",
+					"begin": "(<<)\\s*+(\"|')\\s*+((?<!\\w)[a-zA-Z_][a-zA-Z_0-9]*(?!\\w))(?=\\s|;|&|<|\"|')\\2",
+					"end": "^\\3(?=\\s|;|&|$)",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.operator.heredoc.shell"
 						},
+						"2": {},
 						"3": {
-							"name": "keyword.control.heredoc-token.shell"
+							"name": "punctuation.definition.string.heredoc.shell"
 						}
 					},
-					"end": "^(\\3)(?=\\s|;|&|$)",
 					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
+						"0": {
+							"name": "punctuation.definition.string.heredoc.shell"
 						}
 					},
-					"name": "string.unquoted.heredoc.shell"
+					"name": "string.quoted.heredoc.no-indent.shell",
+					"patterns": []
 				},
 				{
-					"begin": "(<<)-\\s*\\\\?([^;&<\\s]+)",
+					"begin": "(<<-)\\s*+((?<!\\w)[a-zA-Z_][a-zA-Z_0-9]*(?!\\w))(?=\\s|;|&|<|\"|')",
+					"end": "^\\t*\\2(?=\\s|;|&|$)",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.operator.heredoc.shell"
 						},
 						"2": {
-							"name": "keyword.control.heredoc-token.shell"
+							"name": "punctuation.definition.string.heredoc.shell"
 						}
 					},
-					"end": "^\\t*(\\2)(?=\\s|;|&|$)",
 					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
+						"0": {
+							"name": "punctuation.definition.string.heredoc.shell"
 						}
 					},
-					"name": "string.unquoted.heredoc.expanded.no-indent.shell",
+					"name": "string.unquoted.heredoc.indent.shell",
 					"patterns": [
 						{
-							"match": "\\\\[\\$`\\\\\\n]",
-							"name": "constant.character.escape.shell"
+							"include": "#double_quote_escape_char"
 						},
 						{
 							"include": "#variable"
@@ -690,26 +565,25 @@
 					]
 				},
 				{
-					"begin": "(<<)\\s*\\\\?([^;&<\\s]+)",
+					"begin": "(<<)\\s*+((?<!\\w)[a-zA-Z_][a-zA-Z_0-9]*(?!\\w))(?=\\s|;|&|<|\"|')",
+					"end": "^\\2(?=\\s|;|&|$)",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.operator.heredoc.shell"
 						},
 						"2": {
-							"name": "keyword.control.heredoc-token.shell"
+							"name": "punctuation.definition.string.heredoc.shell"
 						}
 					},
-					"end": "^(\\2)(?=\\s|;|&|$)",
 					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
+						"0": {
+							"name": "punctuation.definition.string.heredoc.shell"
 						}
 					},
-					"name": "string.unquoted.heredoc.expanded.shell",
+					"name": "string.unquoted.heredoc.no-indent.shell",
 					"patterns": [
 						{
-							"match": "\\\\[\\$`\\\\\\n]",
-							"name": "constant.character.escape.shell"
+							"include": "#double_quote_escape_char"
 						},
 						{
 							"include": "#variable"
@@ -782,7 +656,7 @@
 							"name": "string.unquoted.herestring.shell",
 							"patterns": [
 								{
-									"include": "$self"
+									"include": "#initial_context"
 								}
 							]
 						}
@@ -792,19 +666,112 @@
 				}
 			]
 		},
+		"initial_context": {
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#boolean"
+				},
+				{
+					"include": "#numeric_literal"
+				},
+				{
+					"include": "#pipeline"
+				},
+				{
+					"include": "#statement_seperator"
+				},
+				{
+					"include": "#logical_expression_double"
+				},
+				{
+					"include": "#logical_expression_single"
+				},
+				{
+					"include": "#misc_ranges"
+				},
+				{
+					"include": "#loop"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#function-definition"
+				},
+				{
+					"include": "#variable"
+				},
+				{
+					"include": "#interpolation"
+				},
+				{
+					"include": "#heredoc"
+				},
+				{
+					"include": "#herestring"
+				},
+				{
+					"include": "#redirection"
+				},
+				{
+					"include": "#pathname"
+				},
+				{
+					"include": "#keyword"
+				},
+				{
+					"include": "#alias_statement"
+				},
+				{
+					"include": "#assignment"
+				},
+				{
+					"include": "#command_call"
+				},
+				{
+					"include": "#support"
+				}
+			]
+		},
+		"inline_comment": {
+			"match": "(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/))",
+			"captures": {
+				"1": {
+					"name": "comment.block.shell punctuation.definition.comment.begin.shell"
+				},
+				"2": {
+					"name": "comment.block.shell"
+				},
+				"3": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.shell punctuation.definition.comment.end.shell"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.shell"
+						}
+					]
+				}
+			}
+		},
 		"interpolation": {
 			"patterns": [
 				{
 					"begin": "\\$\\({2}",
 					"beginCaptures": {
 						"0": {
-							"name": "punctuation.definition.string.begin.shell"
+							"name": "punctuation.definition.evaluation.arithmetic.begin.shell"
 						}
 					},
-					"end": "\\){2}",
+					"end": "\\)\\s*\\)",
 					"endCaptures": {
 						"0": {
-							"name": "punctuation.definition.string.end.shell"
+							"name": "punctuation.definition.evaluation.arithmetic.end.shell"
 						}
 					},
 					"name": "string.other.math.shell",
@@ -818,13 +785,13 @@
 					"begin": "`",
 					"beginCaptures": {
 						"0": {
-							"name": "punctuation.definition.string.begin.shell"
+							"name": "punctuation.definition.evaluation.backticks.shell"
 						}
 					},
 					"end": "`",
 					"endCaptures": {
 						"0": {
-							"name": "punctuation.definition.string.end.shell"
+							"name": "punctuation.definition.evaluation.backticks.shell"
 						}
 					},
 					"name": "string.interpolated.backtick.shell",
@@ -855,7 +822,7 @@
 							]
 						},
 						{
-							"include": "$self"
+							"include": "#initial_context"
 						}
 					]
 				},
@@ -863,19 +830,19 @@
 					"begin": "\\$\\(",
 					"beginCaptures": {
 						"0": {
-							"name": "punctuation.definition.string.begin.shell"
+							"name": "punctuation.definition.evaluation.parens.begin.shell"
 						}
 					},
 					"end": "\\)",
 					"endCaptures": {
 						"0": {
-							"name": "punctuation.definition.string.end.shell"
+							"name": "punctuation.definition.evaluation.parens.end.shell"
 						}
 					},
 					"name": "string.interpolated.dollar.shell",
 					"patterns": [
 						{
-							"include": "$self"
+							"include": "#initial_context"
 						}
 					]
 				}
@@ -884,33 +851,236 @@
 		"keyword": {
 			"patterns": [
 				{
-					"match": "(?<=^|;|&|\\s)(then|else|elif|fi|for|in|do|done|select|case|continue|esac|while|until|return)(?=\\s|;|&|$)",
-					"name": "keyword.control.shell"
+					"match": "(?<=^|;|&|\\s)(?:then|else|elif|fi|for|in|do|done|select|case|continue|esac|while|until|return)(?=\\s|;|&|$)",
+					"name": "keyword.control.$0.shell"
+				},
+				{
+					"match": "(?<=^|;|&|\\s)(?:export|declare|typeset|local|readonly)(?=\\s|;|&|$)",
+					"name": "storage.modifier.$0.shell"
+				}
+			]
+		},
+		"line_comment": {
+			"begin": "\\s*+(\\/\\/)",
+			"end": "(?<=\\n)(?<!\\\\\\n)",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.definition.comment.shell"
+				}
+			},
+			"endCaptures": {},
+			"name": "comment.line.double-slash.shell",
+			"patterns": [
+				{
+					"include": "#line_continuation_character"
+				}
+			]
+		},
+		"line_continuation": {
+			"match": "\\\\(?=\\n)",
+			"name": "constant.character.escape.line-continuation.shell"
+		},
+		"logical-expression": {
+			"patterns": [
+				{
+					"comment": "do we want a special rule for ( expr )?",
+					"match": "=[=~]?|!=?|<|>|&&|\\|\\|",
+					"name": "keyword.operator.logical.shell"
+				},
+				{
+					"match": "(?<!\\S)-(nt|ot|ef|eq|ne|l[te]|g[te]|[a-hknoprstuwxzOGLSN])\\b",
+					"name": "keyword.operator.logical.shell"
+				}
+			]
+		},
+		"logical_expression_context": {
+			"patterns": [
+				{
+					"include": "#regex_comparison"
+				},
+				{
+					"include": "#logical-expression"
+				},
+				{
+					"include": "#logical_expression_single"
+				},
+				{
+					"include": "#logical_expression_double"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#boolean"
+				},
+				{
+					"include": "#numeric_literal"
+				},
+				{
+					"include": "#pipeline"
+				},
+				{
+					"include": "#statement_seperator"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#variable"
+				},
+				{
+					"include": "#interpolation"
+				},
+				{
+					"include": "#heredoc"
+				},
+				{
+					"include": "#herestring"
+				},
+				{
+					"include": "#pathname"
+				},
+				{
+					"include": "#keyword"
+				},
+				{
+					"include": "#support"
+				}
+			]
+		},
+		"logical_expression_double": {
+			"begin": "\\[\\[",
+			"end": "\\]\\]",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.logical-expression.shell"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.logical-expression.shell"
+				}
+			},
+			"name": "meta.scope.logical-expression.shell",
+			"patterns": [
+				{
+					"include": "#regex_comparison"
+				},
+				{
+					"include": "#logical-expression"
+				},
+				{
+					"include": "#logical_expression_single"
+				},
+				{
+					"include": "#logical_expression_double"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#boolean"
+				},
+				{
+					"include": "#numeric_literal"
+				},
+				{
+					"include": "#pipeline"
+				},
+				{
+					"include": "#statement_seperator"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#variable"
+				},
+				{
+					"include": "#interpolation"
+				},
+				{
+					"include": "#heredoc"
 				},
 				{
-					"match": "(?<=^|;|&|\\s)(?:export|declare|typeset|local|readonly)(?=\\s|;|&|$)",
-					"name": "storage.modifier.shell"
-				}
-			]
-		},
-		"list": {
-			"patterns": [
+					"include": "#herestring"
+				},
+				{
+					"include": "#pathname"
+				},
+				{
+					"include": "#keyword"
+				},
 				{
-					"match": ";|&&|&|\\|\\|",
-					"name": "keyword.operator.list.shell"
+					"include": "#support"
 				}
 			]
 		},
-		"logical-expression": {
+		"logical_expression_single": {
+			"begin": "\\[",
+			"end": "\\]",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.logical-expression.shell"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.logical-expression.shell"
+				}
+			},
+			"name": "meta.scope.logical-expression.shell",
 			"patterns": [
 				{
-					"comment": "do we want a special rule for ( expr )?",
-					"match": "=[=~]?|!=?|<|>|&&|\\|\\|",
-					"name": "keyword.operator.logical.shell"
+					"include": "#regex_comparison"
 				},
 				{
-					"match": "(?<!\\S)-(nt|ot|ef|eq|ne|l[te]|g[te]|[a-hknoprstuwxzOGLSN])",
-					"name": "keyword.operator.logical.shell"
+					"include": "#logical-expression"
+				},
+				{
+					"include": "#logical_expression_single"
+				},
+				{
+					"include": "#logical_expression_double"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#boolean"
+				},
+				{
+					"include": "#numeric_literal"
+				},
+				{
+					"include": "#pipeline"
+				},
+				{
+					"include": "#statement_seperator"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#variable"
+				},
+				{
+					"include": "#interpolation"
+				},
+				{
+					"include": "#heredoc"
+				},
+				{
+					"include": "#herestring"
+				},
+				{
+					"include": "#pathname"
+				},
+				{
+					"include": "#keyword"
+				},
+				{
+					"include": "#support"
 				}
 			]
 		},
@@ -923,7 +1093,7 @@
 							"name": "keyword.control.shell"
 						}
 					},
-					"end": "(?<=^|;|&|\\s)done(?=\\s|;|&|$)",
+					"end": "(?<=^|;|&|\\s)done(?=\\s|;|&|$|\\))",
 					"endCaptures": {
 						"0": {
 							"name": "keyword.control.shell"
@@ -932,7 +1102,7 @@
 					"name": "meta.scope.for-loop.shell",
 					"patterns": [
 						{
-							"include": "$self"
+							"include": "#initial_context"
 						}
 					]
 				},
@@ -954,7 +1124,7 @@
 							"name": "keyword.control.shell"
 						}
 					},
-					"end": "(?<=^|;|&|\\s)done(?=\\s|;|&|$)",
+					"end": "(?<=^|;|&|\\s)done(?=\\s|;|&|$|\\))",
 					"endCaptures": {
 						"0": {
 							"name": "keyword.control.shell"
@@ -963,7 +1133,7 @@
 					"name": "meta.scope.for-in-loop.shell",
 					"patterns": [
 						{
-							"include": "$self"
+							"include": "#initial_context"
 						}
 					]
 				},
@@ -974,7 +1144,7 @@
 							"name": "keyword.control.shell"
 						}
 					},
-					"end": "(?<=^|;|&|\\s)done(?=\\s|;|&|$)",
+					"end": "(?<=^|;|&|\\s)done(?=\\s|;|&|$|\\))",
 					"endCaptures": {
 						"0": {
 							"name": "keyword.control.shell"
@@ -983,7 +1153,7 @@
 					"name": "meta.scope.while-loop.shell",
 					"patterns": [
 						{
-							"include": "$self"
+							"include": "#initial_context"
 						}
 					]
 				},
@@ -997,7 +1167,7 @@
 							"name": "variable.other.loop.shell"
 						}
 					},
-					"end": "(?<=^|;|&|\\s)(done)(?=\\s|;|&|$)",
+					"end": "(?<=^|;|&|\\s)(done)(?=\\s|;|&|$|\\))",
 					"endCaptures": {
 						"1": {
 							"name": "keyword.control.shell"
@@ -1006,7 +1176,7 @@
 					"name": "meta.scope.select-block.shell",
 					"patterns": [
 						{
-							"include": "$self"
+							"include": "#initial_context"
 						}
 					]
 				},
@@ -1040,14 +1210,11 @@
 								},
 								{
 									"include": "#case-clause"
-								},
-								{
-									"include": "$self"
 								}
 							]
 						},
 						{
-							"include": "$self"
+							"include": "#initial_context"
 						}
 					]
 				},
@@ -1067,7 +1234,7 @@
 					"name": "meta.scope.if-block.shell",
 					"patterns": [
 						{
-							"include": "$self"
+							"include": "#initial_context"
 						}
 					]
 				}
@@ -1100,6 +1267,380 @@
 				}
 			]
 		},
+		"misc_ranges": {
+			"patterns": [
+				{
+					"include": "#logical_expression_single"
+				},
+				{
+					"include": "#logical_expression_double"
+				},
+				{
+					"begin": "\\(\\(",
+					"end": "\\)\\)",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.section.arithmetic.shell"
+						}
+					},
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.arithmetic.shell"
+						}
+					},
+					"name": "meta.arithmetic.shell",
+					"patterns": [
+						{
+							"include": "#math"
+						}
+					]
+				},
+				{
+					"begin": "(?<!=)\\(",
+					"end": "\\)",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.subshell"
+						}
+					},
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.subshell"
+						}
+					},
+					"name": "meta.scope.subshell",
+					"patterns": [
+						{
+							"include": "#initial_context"
+						}
+					]
+				},
+				{
+					"begin": "{",
+					"end": "}",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.group.shell"
+						}
+					},
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.group.shell"
+						}
+					},
+					"name": "meta.scope.group.shell",
+					"patterns": [
+						{
+							"include": "#initial_context"
+						}
+					]
+				}
+			]
+		},
+		"numeric_literal": {
+			"match": "(?<!\\w)((?<!\\w)\\.?\\d(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])*)(?!\\w)",
+			"captures": {
+				"1": {
+					"patterns": [
+						{
+							"begin": "(?=.)",
+							"end": "$",
+							"beginCaptures": {},
+							"endCaptures": {},
+							"patterns": [
+								{
+									"match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F])))([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?(?:(?<!')([pP])((?:\\+)?)((?:\\-)?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?([lLfF](?!\\w))?$",
+									"captures": {
+										"1": {
+											"name": "keyword.other.unit.hexadecimal.shell"
+										},
+										"2": {
+											"name": "constant.numeric.hexadecimal.shell",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.shell"
+												}
+											]
+										},
+										"3": {
+											"name": "punctuation.separator.constant.numeric.shell"
+										},
+										"4": {
+											"name": "constant.numeric.hexadecimal.shell"
+										},
+										"5": {
+											"name": "constant.numeric.hexadecimal.shell",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.shell"
+												}
+											]
+										},
+										"6": {
+											"name": "punctuation.separator.constant.numeric.shell"
+										},
+										"7": {
+											"name": "keyword.other.unit.exponent.hexadecimal.shell"
+										},
+										"8": {
+											"name": "keyword.operator.plus.exponent.hexadecimal.shell"
+										},
+										"9": {
+											"name": "keyword.operator.minus.exponent.hexadecimal.shell"
+										},
+										"10": {
+											"name": "constant.numeric.exponent.hexadecimal.shell",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.shell"
+												}
+											]
+										},
+										"11": {
+											"name": "keyword.other.unit.suffix.floating-point.shell"
+										}
+									}
+								},
+								{
+									"match": "\\G(?=[0-9.])(?!0[xXbB])([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?(?:(?<!')([eE])((?:\\+)?)((?:\\-)?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?([lLfF](?!\\w))?$",
+									"captures": {
+										"1": {
+											"name": "constant.numeric.decimal.shell",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.shell"
+												}
+											]
+										},
+										"2": {
+											"name": "punctuation.separator.constant.numeric.shell"
+										},
+										"3": {
+											"name": "constant.numeric.decimal.point.shell"
+										},
+										"4": {
+											"name": "constant.numeric.decimal.shell",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.shell"
+												}
+											]
+										},
+										"5": {
+											"name": "punctuation.separator.constant.numeric.shell"
+										},
+										"6": {
+											"name": "keyword.other.unit.exponent.decimal.shell"
+										},
+										"7": {
+											"name": "keyword.operator.plus.exponent.decimal.shell"
+										},
+										"8": {
+											"name": "keyword.operator.minus.exponent.decimal.shell"
+										},
+										"9": {
+											"name": "constant.numeric.exponent.decimal.shell",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.shell"
+												}
+											]
+										},
+										"10": {
+											"name": "keyword.other.unit.suffix.floating-point.shell"
+										}
+									}
+								},
+								{
+									"match": "(\\G0[bB])([01](?:[01]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?$",
+									"captures": {
+										"1": {
+											"name": "keyword.other.unit.binary.shell"
+										},
+										"2": {
+											"name": "constant.numeric.binary.shell",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.shell"
+												}
+											]
+										},
+										"3": {
+											"name": "punctuation.separator.constant.numeric.shell"
+										},
+										"4": {
+											"name": "keyword.other.unit.suffix.integer.shell"
+										}
+									}
+								},
+								{
+									"match": "(\\G0)((?:[0-7]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))+)((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?$",
+									"captures": {
+										"1": {
+											"name": "keyword.other.unit.octal.shell"
+										},
+										"2": {
+											"name": "constant.numeric.octal.shell",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.shell"
+												}
+											]
+										},
+										"3": {
+											"name": "punctuation.separator.constant.numeric.shell"
+										},
+										"4": {
+											"name": "keyword.other.unit.suffix.integer.shell"
+										}
+									}
+								},
+								{
+									"match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)(?:(?<!')([pP])((?:\\+)?)((?:\\-)?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?$",
+									"captures": {
+										"1": {
+											"name": "keyword.other.unit.hexadecimal.shell"
+										},
+										"2": {
+											"name": "constant.numeric.hexadecimal.shell",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.shell"
+												}
+											]
+										},
+										"3": {
+											"name": "punctuation.separator.constant.numeric.shell"
+										},
+										"4": {
+											"name": "keyword.other.unit.exponent.hexadecimal.shell"
+										},
+										"5": {
+											"name": "keyword.operator.plus.exponent.hexadecimal.shell"
+										},
+										"6": {
+											"name": "keyword.operator.minus.exponent.hexadecimal.shell"
+										},
+										"7": {
+											"name": "constant.numeric.exponent.hexadecimal.shell",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.shell"
+												}
+											]
+										},
+										"8": {
+											"name": "keyword.other.unit.suffix.integer.shell"
+										}
+									}
+								},
+								{
+									"match": "\\G(?=[0-9.])(?!0[xXbB])([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)(?:(?<!')([eE])((?:\\+)?)((?:\\-)?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?$",
+									"captures": {
+										"1": {
+											"name": "constant.numeric.decimal.shell",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.shell"
+												}
+											]
+										},
+										"2": {
+											"name": "punctuation.separator.constant.numeric.shell"
+										},
+										"3": {
+											"name": "keyword.other.unit.exponent.decimal.shell"
+										},
+										"4": {
+											"name": "keyword.operator.plus.exponent.decimal.shell"
+										},
+										"5": {
+											"name": "keyword.operator.minus.exponent.decimal.shell"
+										},
+										"6": {
+											"name": "constant.numeric.exponent.decimal.shell",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.shell"
+												}
+											]
+										},
+										"7": {
+											"name": "keyword.other.unit.suffix.integer.shell"
+										}
+									}
+								}
+							]
+						}
+					]
+				}
+			}
+		},
+		"option": {
+			"begin": "\\s++(-)((?!(?:!|%|&|\\||\\(|\\)|\\{|\\[|<|>|#|\\n|$|;|\\s)))",
+			"end": "(?:(?=\\s)|(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|#|\\])(?<!\\\\))",
+			"beginCaptures": {
+				"1": {
+					"name": "string.unquoted.argument.shell constant.other.option.dash.shell"
+				},
+				"2": {
+					"name": "string.unquoted.argument.shell constant.other.option.shell"
+				}
+			},
+			"endCaptures": {},
+			"contentName": "string.unquoted.argument constant.other.option",
+			"patterns": [
+				{
+					"include": "#option_context"
+				}
+			]
+		},
+		"option_context": {
+			"patterns": [
+				{
+					"include": "#misc_ranges"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#variable"
+				},
+				{
+					"include": "#interpolation"
+				},
+				{
+					"include": "#heredoc"
+				},
+				{
+					"include": "#herestring"
+				},
+				{
+					"include": "#redirection"
+				},
+				{
+					"include": "#pathname"
+				},
+				{
+					"include": "#keyword"
+				},
+				{
+					"include": "#support"
+				}
+			]
+		},
 		"pathname": {
 			"patterns": [
 				{
@@ -1129,7 +1670,7 @@
 					"name": "meta.structure.extglob.shell",
 					"patterns": [
 						{
-							"include": "$self"
+							"include": "#initial_context"
 						}
 					]
 				}
@@ -1165,7 +1706,7 @@
 					"name": "string.interpolated.process-substitution.shell",
 					"patterns": [
 						{
-							"include": "$self"
+							"include": "#initial_context"
 						}
 					]
 				},
@@ -1175,6 +1716,97 @@
 				}
 			]
 		},
+		"regex_comparison": {
+			"match": "\\=~",
+			"name": "keyword.operator.logical.regex.shell"
+		},
+		"regexp": {
+			"patterns": [
+				{
+					"match": ".+"
+				}
+			]
+		},
+		"simple_options": {
+			"match": "(?:\\s++\\-\\w+)*",
+			"captures": {
+				"0": {
+					"patterns": [
+						{
+							"match": "\\s++(\\-)(\\w+)",
+							"captures": {
+								"1": {
+									"name": "string.unquoted.argument.shell constant.other.option.dash.shell"
+								},
+								"2": {
+									"name": "string.unquoted.argument.shell constant.other.option.shell"
+								}
+							}
+						}
+					]
+				}
+			}
+		},
+		"statement_context": {
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#pipeline"
+				},
+				{
+					"include": "#statement_seperator"
+				},
+				{
+					"include": "#misc_ranges"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#variable"
+				},
+				{
+					"include": "#interpolation"
+				},
+				{
+					"include": "#heredoc"
+				},
+				{
+					"include": "#herestring"
+				},
+				{
+					"include": "#redirection"
+				},
+				{
+					"include": "#pathname"
+				},
+				{
+					"include": "#keyword"
+				},
+				{
+					"include": "#support"
+				}
+			]
+		},
+		"statement_seperator": {
+			"match": "(?:(?:(?:(?:(;)|(&&))|(\\|\\|))|(&))|\\n)",
+			"captures": {
+				"1": {
+					"name": "punctuation.terminator.statement.semicolon.shell"
+				},
+				"2": {
+					"name": "punctuation.separator.statement.and.shell"
+				},
+				"3": {
+					"name": "punctuation.separator.statement.or.shell"
+				},
+				"4": {
+					"name": "punctuation.separator.statement.background.shell"
+				}
+			}
+		},
 		"string": {
 			"patterns": [
 				{
@@ -1197,7 +1829,7 @@
 					"name": "string.quoted.single.shell"
 				},
 				{
-					"begin": "\\$?\"",
+					"begin": " *\\$?\"",
 					"beginCaptures": {
 						"0": {
 							"name": "punctuation.definition.string.begin.shell"
@@ -1258,76 +1890,83 @@
 				}
 			]
 		},
-		"support": {
+		"variable": {
 			"patterns": [
 				{
-					"match": "(?<=^|;|&|\\s)(?::|\\.)(?=\\s|;|&|$)",
-					"name": "support.function.builtin.shell"
+					"match": "(\\$)(\\@(?!\\w))",
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.variable.shell variable.parameter.positional.all.shell"
+						},
+						"2": {
+							"name": "variable.parameter.positional.all.shell"
+						}
+					}
 				},
 				{
-					"match": "(?<=^|;|&|\\s)(?:alias|bg|bind|break|builtin|caller|cd|command|compgen|complete|dirs|disown|echo|enable|eval|exec|exit|false|fc|fg|getopts|hash|help|history|jobs|kill|let|logout|popd|printf|pushd|pwd|read|readonly|set|shift|shopt|source|suspend|test|times|trap|true|type|ulimit|umask|unalias|unset|wait)(?=\\s|;|&|$)",
-					"name": "support.function.builtin.shell"
-				}
-			]
-		},
-		"variable": {
-			"patterns": [
-				{
+					"match": "(\\$)([0-9](?!\\w))",
 					"captures": {
 						"1": {
-							"name": "punctuation.definition.variable.shell"
+							"name": "punctuation.definition.variable.shell variable.parameter.positional.shell"
+						},
+						"2": {
+							"name": "variable.parameter.positional.shell"
 						}
-					},
-					"match": "(\\$)[a-zA-Z_][a-zA-Z0-9_]*",
-					"name": "variable.other.normal.shell"
+					}
 				},
 				{
+					"match": "(\\$)(\\{[0-9]+\\}(?!\\w))",
 					"captures": {
 						"1": {
-							"name": "punctuation.definition.variable.shell"
+							"name": "punctuation.definition.variable.shell variable.parameter.positional.shell"
+						},
+						"2": {
+							"name": "variable.parameter.positional.shell"
 						}
-					},
-					"match": "(\\$)[-*@#?$!0_]",
-					"name": "variable.other.special.shell"
+					}
 				},
 				{
+					"match": "(\\$)([-*#?$!0_](?!\\w))",
 					"captures": {
 						"1": {
-							"name": "punctuation.definition.variable.shell"
+							"name": "punctuation.definition.variable.shell variable.language.special.shell"
+						},
+						"2": {
+							"name": "variable.language.special.shell"
 						}
-					},
-					"match": "(\\$)[1-9]",
-					"name": "variable.other.positional.shell"
+					}
 				},
 				{
-					"begin": "\\${",
+					"begin": "(\\$)(\\{)",
+					"end": "\\}",
 					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.variable.shell"
+						"1": {
+							"name": "punctuation.definition.variable.shell punctuation.section.bracket.curly.variable.begin.shell"
+						},
+						"2": {
+							"name": "punctuation.section.bracket.curly.variable.begin.shell"
 						}
 					},
-					"end": "}",
 					"endCaptures": {
 						"0": {
-							"name": "punctuation.definition.variable.shell"
+							"name": "punctuation.section.bracket.curly.variable.end.shell"
 						}
 					},
-					"name": "variable.other.bracket.shell",
 					"patterns": [
 						{
-							"match": "!|:[-=?]?|\\*|@|#{1,2}|%{1,2}|/",
+							"match": "!|:[-=?]?|\\*|@|##|#|%%|%|\\/",
 							"name": "keyword.operator.expansion.shell"
 						},
 						{
+							"match": "(\\[)[^\\]]+(\\])",
 							"captures": {
 								"1": {
 									"name": "punctuation.section.array.shell"
 								},
-								"3": {
+								"2": {
 									"name": "punctuation.section.array.shell"
 								}
-							},
-							"match": "(\\[)([^\\]]+)(\\])"
+							}
 						},
 						{
 							"include": "#variable"
@@ -1336,6 +1975,17 @@
 							"include": "#string"
 						}
 					]
+				},
+				{
+					"match": "(\\$)(\\w+(?!\\w))",
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.variable.shell variable.other.normal.shell"
+						},
+						"2": {
+							"name": "variable.other.normal.shell"
+						}
+					}
 				}
 			]
 		}
diff --git a/extensions/simple-browser/package.json b/extensions/simple-browser/package.json
index b92c71f3ed7a1b..120c9a343f431b 100644
--- a/extensions/simple-browser/package.json
+++ b/extensions/simple-browser/package.json
@@ -68,7 +68,7 @@
     "watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose"
   },
   "dependencies": {
-    "@vscode/extension-telemetry": "0.7.1-preview"
+    "@vscode/extension-telemetry": "0.7.3-preview"
   },
   "devDependencies": {
     "@types/vscode-webview": "^1.57.0",
diff --git a/extensions/simple-browser/yarn.lock b/extensions/simple-browser/yarn.lock
index 62d89019431dd6..3aa44143117296 100644
--- a/extensions/simple-browser/yarn.lock
+++ b/extensions/simple-browser/yarn.lock
@@ -191,10 +191,10 @@
   resolved "https://registry.yarnpkg.com/@types/vscode-webview/-/vscode-webview-1.57.0.tgz#bad5194d45ae8d03afc1c0f67f71ff5e7a243bbf"
   integrity sha512-x3Cb/SMa1IwRHfSvKaZDZOTh4cNoG505c3NjTqGlMC082m++x/ETUmtYniDsw6SSmYzZXO8KBNhYxR0+VqymqA==
 
-"@vscode/extension-telemetry@0.7.1-preview":
-  version "0.7.1-preview"
-  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.7.1-preview.tgz#1b954b8932b7f27a3993abda25299b8ba7f97233"
-  integrity sha512-7GdA8lMrcMhRfFxVpk7KBNbx+Bh/OpG702C1uPcyOQqp5lH1txJ/8SZAacFqFMKLRnBdGlJRKBREQe/Fs1X/eQ==
+"@vscode/extension-telemetry@0.7.3-preview":
+  version "0.7.3-preview"
+  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.7.3-preview.tgz#3e45609c862022e7eec52e47fe45176149d82b6c"
+  integrity sha512-V+TanZXj8jhCX8mwGHbRDOTJ5YSWCmngHKs7ZrRoR7sXc4vZYQX+1syp07hDX2BVnPpuBHJiovZ8GZ4zbmQvYw==
   dependencies:
     "@microsoft/1ds-core-js" "^3.2.8"
     "@microsoft/1ds-post-js" "^3.2.8"
diff --git a/extensions/theme-defaults/package.json b/extensions/theme-defaults/package.json
index a05e93a6393d6b..c7e4d25aeaf980 100644
--- a/extensions/theme-defaults/package.json
+++ b/extensions/theme-defaults/package.json
@@ -19,12 +19,24 @@
         "uiTheme": "vs-dark",
         "path": "./themes/dark_plus.json"
       },
+      {
+        "id": "Default Dark+ Experimental",
+        "label": "%darkPlusExperimentalColorThemeLabel%",
+        "uiTheme": "vs-dark",
+        "path": "./themes/dark_plus_experimental.json"
+      },
       {
         "id": "Default Light+",
         "label": "%lightPlusColorThemeLabel%",
         "uiTheme": "vs",
         "path": "./themes/light_plus.json"
       },
+      {
+        "id": "Default Light+ Experimental",
+        "label": "%lightPlusExperimentalColorThemeLabel%",
+        "uiTheme": "vs",
+        "path": "./themes/light_plus_experimental.json"
+      },
       {
         "id": "Visual Studio Dark",
         "label": "%darkColorThemeLabel%",
diff --git a/extensions/theme-defaults/package.nls.json b/extensions/theme-defaults/package.nls.json
index b98bd7fb5bde4f..bcb5691a95b2d4 100644
--- a/extensions/theme-defaults/package.nls.json
+++ b/extensions/theme-defaults/package.nls.json
@@ -2,7 +2,9 @@
 	"displayName": "Default Themes",
 	"description": "The default Visual Studio light and dark themes",
 	"darkPlusColorThemeLabel": "Dark+ (default dark)",
+	"darkPlusExperimentalColorThemeLabel": "Dark+ V2 (Experimental)",
 	"lightPlusColorThemeLabel": "Light+ (default light)",
+	"lightPlusExperimentalColorThemeLabel": "Light+ V2 (Experimental)",
 	"darkColorThemeLabel": "Dark (Visual Studio)",
 	"lightColorThemeLabel": "Light (Visual Studio)",
 	"hcColorThemeLabel": "Dark High Contrast",
diff --git a/extensions/theme-defaults/themes/dark_plus_experimental.json b/extensions/theme-defaults/themes/dark_plus_experimental.json
new file mode 100644
index 00000000000000..cb9f3f02dbbb98
--- /dev/null
+++ b/extensions/theme-defaults/themes/dark_plus_experimental.json
@@ -0,0 +1,140 @@
+{
+	"$schema": "vscode://schemas/color-theme",
+	"name": "Dark+ (Experimental)",
+	"include": "./dark_plus.json",
+	"colors": {
+		"activityBar.activeBorder": "#2488d8",
+		"activityBar.background": "#181818",
+		"activityBar.border": "#ffffff15",
+		"activityBar.foreground": "#ffffffc5",
+		"activityBar.inactiveForeground": "#ffffff80",
+		"activityBarBadge.background": "#2488d8",
+		"activityBarBadge.foreground": "#000000",
+		"badge.background": "#2488d8",
+		"badge.foreground": "#000000",
+		"button.background": "#2488d8",
+		"button.border": "#ffffff12",
+		"button.foreground": "#000000",
+		"button.hoverBackground": "#2488d8e6",
+		"button.secondaryBackground": "#FFFFFF0F",
+		"button.secondaryForeground": "#ffffffc5",
+		"button.secondaryHoverBackground": "#ffffff15",
+		"checkbox.background": "#313131",
+		"checkbox.border": "#ffffff15",
+		"debugToolBar.background": "#181818",
+		"descriptionForeground": "#8b949e",
+		"diffEditor.insertedLineBackground": "#23863633",
+		"diffEditor.insertedTextBackground": "#2386364d",
+		"diffEditor.removedLineBackground": "#da363333",
+		"diffEditor.removedTextBackground": "#da36334d",
+		"dropdown.background": "#313131",
+		"dropdown.border": "#ffffff17",
+		"dropdown.foreground": "#ffffffc5",
+		"dropdown.listBackground": "#313131",
+		"editor.background": "#1f1f1f",
+		"editor.findMatchBackground": "#9e6a03",
+		"editor.foreground": "#ffffffd3",
+		"editorCursor.foreground": "#2488d8",
+		"editorGroup.border": "#ffffff17",
+		"editorGroupHeader.tabsBackground": "#181818",
+		"editorGroupHeader.tabsBorder": "#ffffff15",
+		"editorGutter.addedBackground": "#2ea043",
+		"editorGutter.deletedBackground": "#f85149",
+		"editorGutter.modifiedBackground": "#2488d8",
+		"editorInlayHint.background": "#8b949e33",
+		"editorInlayHint.foreground": "#8b949e",
+		"editorInlayHint.typeBackground": "#8b949e33",
+		"editorInlayHint.typeForeground": "#8b949e",
+		"editorLineNumber.activeForeground": "#ffffffc5",
+		"editorLineNumber.foreground": "#6e7681",
+		"editorOverviewRuler.border": "#010409",
+		"editorWidget.background": "#1f1f1f",
+		"errorForeground": "#f85149",
+		"focusBorder": "#2488d8",
+		"foreground": "#ffffffc5",
+		"icon.foreground": "#ffffffc5",
+		"input.background": "#ffffff0f",
+		"input.border": "#ffffff17",
+		"input.foreground": "#ffffffc5",
+		"input.placeholderForeground": "#ffffff79",
+		"inputOption.activeBackground": "#2489db82",
+		"inputOption.activeBorder": "#2488db",
+		"keybindingLabel.foreground": "#ffffffc5",
+		"list.activeSelectionBackground": "#ffffff0f",
+		"list.activeSelectionIconForeground": "#ffffff",
+		"list.activeSelectionForeground": "#ffffff",
+		"menu.background": "#1f1f1f",
+		"notificationCenterHeader.background": "#1f1f1f",
+		"notificationCenterHeader.foreground": "#ffffffc5",
+		"notifications.background": "#1f1f1f",
+		"notifications.border": "#ffffff15",
+		"notifications.foreground": "#ffffffc5",
+		"panel.background": "#181818",
+		"panel.border": "#ffffff15",
+		"panelInput.border": "#ffffff15",
+		"panelTitle.activeBorder": "#2488d8",
+		"panelTitle.activeForeground": "#ffffffc5",
+		"panelTitle.inactiveForeground": "#8b949e",
+		"peekViewEditor.background": "#1f1f1f",
+		"peekViewEditor.matchHighlightBackground": "#bb800966",
+		"peekViewResult.background": "#1f1f1f",
+		"peekViewResult.matchHighlightBackground": "#bb800966",
+		"pickerGroup.border": "#ffffff15",
+		"pickerGroup.foreground": "#8b949e",
+		"progressBar.background": "#2488d8",
+		"quickInput.background": "#1f1f1f",
+		"quickInput.foreground": "#ffffffc5",
+		"scrollbar.shadow": "#484f5833",
+		"scrollbarSlider.activeBackground": "#6e768187",
+		"scrollbarSlider.background": "#6e768133",
+		"scrollbarSlider.hoverBackground": "#6e768145",
+		"settings.dropdownBackground": "#313131",
+		"settings.dropdownBorder": "#ffffff17",
+		"settings.headerForeground": "#ffffff",
+		"settings.modifiedItemIndicator": "#bb800966",
+		"sideBar.background": "#181818",
+		"sideBar.border": "#ffffff15",
+		"sideBar.foreground": "#ffffffc5",
+		"sideBarSectionHeader.background": "#181818",
+		"sideBarSectionHeader.border": "#ffffff15",
+		"sideBarSectionHeader.foreground": "#ffffffc5",
+		"sideBarTitle.foreground": "#ffffffc5",
+		"statusBar.background": "#181818",
+		"statusBar.border": "#ffffff15",
+		"statusBar.debuggingBackground": "#fd716c",
+		"statusBar.debuggingForeground": "#000000",
+		"statusBar.foreground": "#ffffffc5",
+		"statusBar.noFolderBackground": "#1f1f1f",
+		"statusBarItem.focusBorder": "#2488d8",
+		"statusBarItem.prominentBackground": "#6e768166",
+		"statusBarItem.remoteBackground": "#2488d8",
+		"statusBarItem.remoteForeground": "#000000",
+		"tab.activeBackground": "#1f1f1f",
+		"tab.activeBorder": "#1f1f1f",
+		"tab.activeBorderTop": "#2488d8",
+		"tab.activeForeground": "#ffffffc5",
+		"tab.border": "#ffffff15",
+		"tab.hoverBackground": "#1f1f1f",
+		"tab.inactiveBackground": "#181818",
+		"tab.inactiveForeground": "#ffffff80",
+		"tab.unfocusedActiveBorder": "#1f1f1f",
+		"tab.unfocusedActiveBorderTop": "#ffffff15",
+		"tab.unfocusedHoverBackground": "#6e76811a",
+		"terminal.foreground": "#ffffffc5",
+		"terminal.tab.activeBorder": "#2488d8",
+		"textBlockQuote.background": "#010409",
+		"textBlockQuote.border": "#ffffff14",
+		"textCodeBlock.background": "#6e768166",
+		"textLink.activeForeground": "#8bb6f7",
+		"textLink.foreground": "#8bb6f7",
+		"textPreformat.foreground": "#8b949e",
+		"textSeparator.foreground": "#21262d",
+		"titleBar.activeBackground": "#181818",
+		"titleBar.activeForeground": "#ffffffc5",
+		"titleBar.border": "#ffffff15",
+		"titleBar.inactiveBackground": "#1f1f1f",
+		"titleBar.inactiveForeground": "#8b949e",
+		"welcomePage.tileBackground": "#ffffff0f",
+		"widgetBorder": "#ffffff15",
+	},
+}
diff --git a/extensions/theme-defaults/themes/dark_vs.json b/extensions/theme-defaults/themes/dark_vs.json
index ab05161619f1d5..38af44cd2c164b 100644
--- a/extensions/theme-defaults/themes/dark_vs.json
+++ b/extensions/theme-defaults/themes/dark_vs.json
@@ -2,6 +2,7 @@
 	"$schema": "vscode://schemas/color-theme",
 	"name": "Dark (Visual Studio)",
 	"colors": {
+		"checkbox.border": "#6B6B6B",
 		"editor.background": "#1E1E1E",
 		"editor.foreground": "#D4D4D4",
 		"editor.inactiveSelectionBackground": "#3A3D41",
@@ -24,6 +25,7 @@
 		"tab.lastPinnedBorder": "#ccc3",
 		"list.activeSelectionIconForeground": "#FFF",
 		"terminal.inactiveSelectionBackground": "#3A3D41",
+		"widget.border": "#303031",
 	},
 	"tokenColors": [
 		{
diff --git a/extensions/theme-defaults/themes/light_plus_experimental.json b/extensions/theme-defaults/themes/light_plus_experimental.json
new file mode 100644
index 00000000000000..c84e2c1020331c
--- /dev/null
+++ b/extensions/theme-defaults/themes/light_plus_experimental.json
@@ -0,0 +1,154 @@
+{
+	"$schema": "vscode://schemas/color-theme",
+	"name": "Light+ (Experimental)",
+	"include": "./light_plus.json",
+	"colors": {
+		"activityBar.activeBorder": "#005FB8",
+		"activityBar.background": "#f8f8f8",
+		"activityBar.border": "#0000001a",
+		"activityBar.foreground": "#000000e4",
+		"activityBar.inactiveForeground": "#0000009e",
+		"activityBarBadge.background": "#005FB8",
+		"activityBarBadge.foreground": "#ffffff",
+		"badge.background": "#005FB8",
+		"badge.foreground": "#ffffff",
+		"button.background": "#005FB8",
+		"button.border": "#0000001a",
+		"button.foreground": "#ffffff",
+		"button.hoverBackground": "#005FB8e6",
+		"button.secondaryBackground": "#0000001a",
+		"button.secondaryForeground": "#000000e4",
+		"button.secondaryHoverBackground": "#00000034",
+		"checkbox.background": "#f8f8f8",
+		"checkbox.border": "#0000001a",
+		"descriptionForeground": "#000000e4",
+		"diffEditor.insertedLineBackground": "#23863633",
+		"diffEditor.insertedTextBackground": "#2386364d",
+		"diffEditor.removedLineBackground": "#da363333",
+		"diffEditor.removedTextBackground": "#da36334d",
+		"dropdown.background": "#ffffff",
+		"dropdown.border": "#0000001a",
+		"dropdown.foreground": "#000000e4",
+		"dropdown.listBackground": "#ffffff",
+		"editor.background": "#ffffff",
+		"editor.findMatchBackground": "#9e6a03",
+		"editor.foreground": "#000000e4",
+		"editor.inactiveSelectionBackground": "#E5EBF1",
+		"editor.selectionHighlightBackground": "#ADD6FF80",
+		"editorCursor.foreground": "#005FB8",
+		"editorGroup.border": "#0000001a",
+		"editorGroupHeader.tabsBackground": "#f8f8f8",
+		"editorGroupHeader.tabsBorder": "#0000001a",
+		"editorGutter.addedBackground": "#2ea043",
+		"editorGutter.deletedBackground": "#f85149",
+		"editorGutter.modifiedBackground": "#005FB8",
+		"editorIndentGuide.background": "#D3D3D3",
+		"editorInlayHint.background": "#8b949e33",
+		"editorInlayHint.foreground": "#8b949e",
+		"editorInlayHint.typeBackground": "#8b949e33",
+		"editorInlayHint.typeForeground": "#8b949e",
+		"editorLineNumber.activeForeground": "#ffffffc5",
+		"editorLineNumber.foreground": "#6e7681",
+		"editorOverviewRuler.border": "#0000001a",
+		"editorSuggestWidget.background": "#f8f8f8",
+		"editorWidget.background": "#ffffff",
+		"errorForeground": "#f85149",
+		"focusBorder": "#005FB8",
+		"foreground": "#000000e4",
+		"icon.foreground": "#000000e4",
+		"input.background": "#ffffff",
+		"input.border": "#0000001a",
+		"input.foreground": "#000000e4",
+		"input.placeholderForeground": "#00000079",
+		"inputOption.activeBackground": "#005fb841",
+		"inputOption.activeBorder": "#005FB8",
+		"inputOption.activeForeground": "#000000",
+		"keybindingLabel.foreground": "#000000e4",
+		"list.activeSelectionBackground": "#e8e8e8",
+		"list.activeSelectionForeground": "#000000",
+		"list.activeSelectionIconForeground": "#000000",
+		"list.hoverBackground": "#f2f2f2",
+		"menu.border": "#D4D4D4",
+		"notebook.cellBorderColor": "#E8E8E8",
+		"notebook.selectedCellBackground": "#c8ddf150",
+		"notificationCenterHeader.background": "#ffffff",
+		"notificationCenterHeader.foreground": "#000000e4",
+		"notifications.background": "#ffffff",
+		"notifications.border": "#0000001a",
+		"notifications.foreground": "#000000e4",
+		"panel.background": "#f8f8f8",
+		"panel.border": "#0000001a",
+		"panelInput.border": "#0000001a",
+		"panelTitle.activeBorder": "#005FB8",
+		"panelTitle.activeForeground": "#000000e4",
+		"panelTitle.inactiveForeground": "#000000e4",
+		"peekViewEditor.matchHighlightBackground": "#bb800966",
+		"peekViewResult.background": "#ffffff",
+		"peekViewResult.matchHighlightBackground": "#bb800966",
+		"pickerGroup.border": "#0000001a",
+		"pickerGroup.foreground": "#8b949e",
+		"ports.iconRunningProcessForeground": "#369432",
+		"progressBar.background": "#005FB8",
+		"quickInput.background": "#ffffff",
+		"quickInput.foreground": "#000000e4",
+		"scrollbar.shadow": "#484f5833",
+		"scrollbarSlider.activeBackground": "#6e768187",
+		"scrollbarSlider.background": "#6e768133",
+		"scrollbarSlider.hoverBackground": "#6e768145",
+		"searchEditor.textInputBorder": "#CECECE",
+		"settings.dropdownBackground": "#ffffff",
+		"settings.dropdownBorder": "#0000001a",
+		"settings.headerForeground": "#000000e4",
+		"settings.modifiedItemIndicator": "#bb800966",
+		"settings.numberInputBorder": "#CECECE",
+		"settings.textInputBorder": "#CECECE",
+		"sideBar.background": "#f8f8f8",
+		"sideBar.border": "#0000001a",
+		"sideBar.foreground": "#000000e4",
+		"sideBarSectionHeader.background": "#f8f8f8",
+		"sideBarSectionHeader.border": "#0000001a",
+		"sideBarSectionHeader.foreground": "#000000e4",
+		"sideBarTitle.foreground": "#000000e4",
+		"statusBar.background": "#f8f8f8",
+		"statusBar.foreground": "#000000e4",
+		"statusBar.border": "#0000001a",
+		"statusBar.debuggingBackground": "#fd716c",
+		"statusBar.debuggingForeground": "#000000",
+		"statusBar.focusBorder": "#005FB8",
+		"statusBar.noFolderBackground": "#f8f8f8",
+		"statusBarItem.errorBackground": "#c72e0f",
+		"statusBarItem.focusBorder": "#005FB8",
+		"statusBarItem.prominentBackground": "#6e768166",
+		"statusBarItem.remoteBackground": "#005FB8",
+		"statusBarItem.remoteForeground": "#ffffff",
+		"tab.activeBackground": "#ffffff",
+		"tab.activeBorder": "#f8f8f8",
+		"tab.activeBorderTop": "#005FB8",
+		"tab.activeForeground": "#000000e4",
+		"tab.border": "#0000001a",
+		"tab.hoverBackground": "#ffffff",
+		"tab.inactiveBackground": "#f8f8f8",
+		"tab.inactiveForeground": "#00000080",
+		"tab.lastPinnedBorder": "#61616130",
+		"tab.unfocusedActiveBorder": "#f8f8f8",
+		"tab.unfocusedActiveBorderTop": "#00000015",
+		"tab.unfocusedHoverBackground": "#6e76811a",
+		"terminal.foreground": "#ffffffc5",
+		"terminal.inactiveSelectionBackground": "#E5EBF1",
+		"terminal.tab.activeBorder": "#005fb8",
+		"textBlockQuote.background": "#f8f8f8",
+		"textBlockQuote.border": "#0000001a",
+		"textCodeBlock.background": "#6e768166",
+		"textLink.activeForeground": "#005FB8",
+		"textLink.foreground": "#005FB8",
+		"textPreformat.foreground": "#8b949e",
+		"textSeparator.foreground": "#21262d",
+		"titleBar.activeBackground": "#f8f8f8",
+		"titleBar.activeForeground": "#1e1e1e",
+		"titleBar.border": "#0000001a",
+		"titleBar.inactiveBackground": "#f8f8f8",
+		"titleBar.inactiveForeground": "#8b949e",
+		"welcomePage.tileBackground": "#f3f3f3",
+		"wdgetBorder": "#0000001a",
+	},
+}
diff --git a/extensions/theme-defaults/themes/light_vs.json b/extensions/theme-defaults/themes/light_vs.json
index 9e894251ed4f63..89589bb0e74ff7 100644
--- a/extensions/theme-defaults/themes/light_vs.json
+++ b/extensions/theme-defaults/themes/light_vs.json
@@ -2,7 +2,7 @@
 	"$schema": "vscode://schemas/color-theme",
 	"name": "Light (Visual Studio)",
 	"colors": {
-		"activityBarItem.profilesBackground": "#4d4d4d",
+		"checkbox.border": "#919191",
 		"editor.background": "#FFFFFF",
 		"editor.foreground": "#000000",
 		"editor.inactiveSelectionBackground": "#E5EBF1",
@@ -30,6 +30,7 @@
 		"list.activeSelectionIconForeground": "#FFF",
 		"list.focusAndSelectionOutline": "#90C2F9",
 		"terminal.inactiveSelectionBackground": "#E5EBF1",
+		"widget.border": "#d4d4d4"
 	},
 	"tokenColors": [
 		{
diff --git a/extensions/theme-monokai/themes/monokai-color-theme.json b/extensions/theme-monokai/themes/monokai-color-theme.json
index fccdf7cd60014e..6489b0dd39c336 100644
--- a/extensions/theme-monokai/themes/monokai-color-theme.json
+++ b/extensions/theme-monokai/themes/monokai-color-theme.json
@@ -61,7 +61,7 @@
 		"pickerGroup.foreground": "#75715E",
 		"input.background": "#414339",
 		"inputOption.activeBorder": "#75715E",
-		"focusBorder": "#75715E",
+		"focusBorder": "#99947c",
 		"editorWidget.background": "#1e1f1c",
 		"debugToolBar.background": "#1e1f1c",
 		"diffEditor.insertedTextBackground": "#4b661680", // middle of #272822 and #a6e22e
diff --git a/extensions/theme-quietlight/themes/quietlight-color-theme.json b/extensions/theme-quietlight/themes/quietlight-color-theme.json
index 30615a91f03047..e53088149f2940 100644
--- a/extensions/theme-quietlight/themes/quietlight-color-theme.json
+++ b/extensions/theme-quietlight/themes/quietlight-color-theme.json
@@ -476,7 +476,7 @@
       	}
 	],
 	"colors": {
-		"focusBorder": "#A6B39B",
+		"focusBorder": "#9769dc",
 		"pickerGroup.foreground": "#A6B39B",
 		"pickerGroup.border": "#749351",
 		"list.activeSelectionForeground": "#6c6c6c",
diff --git a/extensions/theme-solarized-light/themes/solarized-light-color-theme.json b/extensions/theme-solarized-light/themes/solarized-light-color-theme.json
index e5f8e5b5ee5c36..8b4074c9a072de 100644
--- a/extensions/theme-solarized-light/themes/solarized-light-color-theme.json
+++ b/extensions/theme-solarized-light/themes/solarized-light-color-theme.json
@@ -327,7 +327,7 @@
 	"colors": {
 		// Base
 		// "foreground": "",
-		"focusBorder": "#D3AF86",
+		"focusBorder": "#b49471",
 		// "contrastActiveBorder": "",
 		// "contrastBorder": "",
 		// "widget.shadow": "",
diff --git a/extensions/typescript-basics/build/update-grammars.mjs b/extensions/typescript-basics/build/update-grammars.mjs
index 82f6ab3107aacb..175f83f0ba3d91 100644
--- a/extensions/typescript-basics/build/update-grammars.mjs
+++ b/extensions/typescript-basics/build/update-grammars.mjs
@@ -50,7 +50,7 @@ function removeNodeTypes(grammar) {
 
 function patchJsdoctype(grammar) {
 	grammar.repository['jsdoctype'].patterns = grammar.repository['jsdoctype'].patterns.filter(pattern => {
-		if (pattern.name && pattern.name.indexOf('illegal') >= -1) {
+		if (pattern.name && pattern.name.includes('illegal')) {
 			return false;
 		}
 		return true;
diff --git a/extensions/typescript-basics/cgmanifest.json b/extensions/typescript-basics/cgmanifest.json
index 7e93b3d9ab0139..a3720065d645c3 100644
--- a/extensions/typescript-basics/cgmanifest.json
+++ b/extensions/typescript-basics/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "TypeScript-TmLanguage",
 					"repositoryUrl": "https://github.com/microsoft/TypeScript-TmLanguage",
-					"commitHash": "c2744520e325330d0608fc1d1993d7fe98e66202"
+					"commitHash": "359e091c0a83a45e20aefc13111ed4a19e201f97"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/typescript-basics/package.json b/extensions/typescript-basics/package.json
index fef8f0221f086f..76e921fcee489b 100644
--- a/extensions/typescript-basics/package.json
+++ b/extensions/typescript-basics/package.json
@@ -31,6 +31,7 @@
       {
         "id": "typescriptreact",
         "aliases": [
+          "TypeScript JSX",
           "TypeScript React",
           "tsx"
         ],
diff --git a/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json b/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
index 636fad5e441d46..d2d8494c6a109d 100644
--- a/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
+++ b/extensions/typescript-basics/syntaxes/TypeScript.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/TypeScript-TmLanguage/commit/c2744520e325330d0608fc1d1993d7fe98e66202",
+	"version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/359e091c0a83a45e20aefc13111ed4a19e201f97",
 	"name": "TypeScript",
 	"scopeName": "source.ts",
 	"patterns": [
@@ -1859,7 +1859,7 @@
 		},
 		"property-accessor": {
 			"name": "storage.type.property.ts",
-			"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(get|set)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+			"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(accessor|get|set)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
 		},
 		"async-modifier": {
 			"name": "storage.modifier.async.ts",
diff --git a/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json b/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
index c74c76d077de5d..88e45992533dd3 100644
--- a/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
+++ b/extensions/typescript-basics/syntaxes/TypeScriptReact.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/TypeScript-TmLanguage/commit/c2744520e325330d0608fc1d1993d7fe98e66202",
+	"version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/359e091c0a83a45e20aefc13111ed4a19e201f97",
 	"name": "TypeScriptReact",
 	"scopeName": "source.tsx",
 	"patterns": [
@@ -1862,7 +1862,7 @@
 		},
 		"property-accessor": {
 			"name": "storage.type.property.tsx",
-			"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(get|set)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+			"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(accessor|get|set)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
 		},
 		"async-modifier": {
 			"name": "storage.modifier.async.tsx",
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index 2ddaf3d6a1cf1e..9fdb1baf28b876 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -9,7 +9,6 @@
   "aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255",
   "enabledApiProposals": [
     "telemetryLogger",
-    "resolvers",
     "workspaceTrust"
   ],
   "capabilities": {
@@ -35,7 +34,7 @@
     "Programming Languages"
   ],
   "dependencies": {
-    "@vscode/extension-telemetry": "0.7.1-preview",
+    "@vscode/extension-telemetry": "0.7.3-preview",
     "jsonc-parser": "^3.2.0",
     "semver": "5.5.1",
     "vscode-tas-client": "^0.1.63",
diff --git a/extensions/typescript-language-features/src/languageFeatures/completions.ts b/extensions/typescript-language-features/src/languageFeatures/completions.ts
index fa04ed1fa5bfbf..ceb5ea572348d5 100644
--- a/extensions/typescript-language-features/src/languageFeatures/completions.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/completions.ts
@@ -904,35 +904,6 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider<
 		position: vscode.Position,
 		configuration: CompletionConfiguration,
 	): boolean {
-		if (context.triggerCharacter && this.client.apiVersion.lt(API.v290)) {
-			if ((context.triggerCharacter === '"' || context.triggerCharacter === '\'')) {
-				// make sure we are in something that looks like the start of an import
-				const pre = line.text.slice(0, position.character);
-				if (!/\b(from|import)\s*["']$/.test(pre) && !/\b(import|require)\(['"]$/.test(pre)) {
-					return false;
-				}
-			}
-
-			if (context.triggerCharacter === '/') {
-				// make sure we are in something that looks like an import path
-				const pre = line.text.slice(0, position.character);
-				if (!/\b(from|import)\s*["'][^'"]*$/.test(pre) && !/\b(import|require)\(['"][^'"]*$/.test(pre)) {
-					return false;
-				}
-			}
-
-			if (context.triggerCharacter === '@') {
-				// make sure we are in something that looks like the start of a jsdoc comment
-				const pre = line.text.slice(0, position.character);
-				if (!/^\s*\*[ ]?@/.test(pre) && !/\/\*\*+[ ]?@/.test(pre)) {
-					return false;
-				}
-			}
-
-			if (context.triggerCharacter === '<') {
-				return false;
-			}
-		}
 		if (context.triggerCharacter === ' ') {
 			if (!configuration.importStatementSuggestions || this.client.apiVersion.lt(API.v430)) {
 				return false;
diff --git a/extensions/typescript-language-features/src/languageFeatures/definitions.ts b/extensions/typescript-language-features/src/languageFeatures/definitions.ts
index 6d6e4fc2851f31..38807f9008aba9 100644
--- a/extensions/typescript-language-features/src/languageFeatures/definitions.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/definitions.ts
@@ -5,57 +5,47 @@
 
 import * as vscode from 'vscode';
 import { ClientCapability, ITypeScriptServiceClient } from '../typescriptService';
-import API from '../utils/api';
 import { conditionalRegistration, requireSomeCapability } from '../utils/dependentRegistration';
 import { DocumentSelector } from '../utils/documentSelector';
 import * as typeConverters from '../utils/typeConverters';
 import DefinitionProviderBase from './definitionProviderBase';
 
 export default class TypeScriptDefinitionProvider extends DefinitionProviderBase implements vscode.DefinitionProvider {
-	constructor(
-		client: ITypeScriptServiceClient
-	) {
-		super(client);
-	}
 
 	public async provideDefinition(
 		document: vscode.TextDocument,
 		position: vscode.Position,
 		token: vscode.CancellationToken
 	): Promise<vscode.DefinitionLink[] | vscode.Definition | undefined> {
-		if (this.client.apiVersion.gte(API.v270)) {
-			const filepath = this.client.toOpenedFilePath(document);
-			if (!filepath) {
-				return undefined;
-			}
+		const filepath = this.client.toOpenedFilePath(document);
+		if (!filepath) {
+			return undefined;
+		}
 
-			const args = typeConverters.Position.toFileLocationRequestArgs(filepath, position);
-			const response = await this.client.execute('definitionAndBoundSpan', args, token);
-			if (response.type !== 'response' || !response.body) {
-				return undefined;
-			}
+		const args = typeConverters.Position.toFileLocationRequestArgs(filepath, position);
+		const response = await this.client.execute('definitionAndBoundSpan', args, token);
+		if (response.type !== 'response' || !response.body) {
+			return undefined;
+		}
 
-			const span = response.body.textSpan ? typeConverters.Range.fromTextSpan(response.body.textSpan) : undefined;
-			return response.body.definitions
-				.map((location): vscode.DefinitionLink => {
-					const target = typeConverters.Location.fromTextSpan(this.client.toResource(location.file), location);
-					if (location.contextStart && location.contextEnd) {
-						return {
-							originSelectionRange: span,
-							targetRange: typeConverters.Range.fromLocations(location.contextStart, location.contextEnd),
-							targetUri: target.uri,
-							targetSelectionRange: target.range,
-						};
-					}
+		const span = response.body.textSpan ? typeConverters.Range.fromTextSpan(response.body.textSpan) : undefined;
+		return response.body.definitions
+			.map((location): vscode.DefinitionLink => {
+				const target = typeConverters.Location.fromTextSpan(this.client.toResource(location.file), location);
+				if (location.contextStart && location.contextEnd) {
 					return {
 						originSelectionRange: span,
-						targetRange: target.range,
-						targetUri: target.uri
+						targetRange: typeConverters.Range.fromLocations(location.contextStart, location.contextEnd),
+						targetUri: target.uri,
+						targetSelectionRange: target.range,
 					};
-				});
-		}
-
-		return this.getSymbolLocations('definition', document, position, token);
+				}
+				return {
+					originSelectionRange: span,
+					targetRange: target.range,
+					targetUri: target.uri
+				};
+			});
 	}
 }
 
diff --git a/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts b/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts
index 9986e0fb004f87..3cdc3ede1cd824 100644
--- a/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts
@@ -165,10 +165,6 @@ export default class FileConfigurationManager extends Disposable {
 	}
 
 	private getPreferences(document: vscode.TextDocument): Proto.UserPreferences {
-		if (this.client.apiVersion.lt(API.v290)) {
-			return {};
-		}
-
 		const config = vscode.workspace.getConfiguration(
 			isTypeScriptDocument(document) ? 'typescript' : 'javascript',
 			document);
diff --git a/extensions/typescript-language-features/src/languageFeatures/folding.ts b/extensions/typescript-language-features/src/languageFeatures/folding.ts
index b7c8087d7409f2..5cec7d8e618657 100644
--- a/extensions/typescript-language-features/src/languageFeatures/folding.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/folding.ts
@@ -6,14 +6,11 @@
 import * as vscode from 'vscode';
 import type * as Proto from '../protocol';
 import { ITypeScriptServiceClient } from '../typescriptService';
-import API from '../utils/api';
 import { coalesce } from '../utils/arrays';
-import { conditionalRegistration, requireMinVersion } from '../utils/dependentRegistration';
 import { DocumentSelector } from '../utils/documentSelector';
 import * as typeConverters from '../utils/typeConverters';
 
 class TypeScriptFoldingProvider implements vscode.FoldingRangeProvider {
-	public static readonly minVersion = API.v280;
 
 	public constructor(
 		private readonly client: ITypeScriptServiceClient
@@ -87,10 +84,6 @@ export function register(
 	selector: DocumentSelector,
 	client: ITypeScriptServiceClient,
 ): vscode.Disposable {
-	return conditionalRegistration([
-		requireMinVersion(client, TypeScriptFoldingProvider.minVersion),
-	], () => {
-		return vscode.languages.registerFoldingRangeProvider(selector.syntax,
-			new TypeScriptFoldingProvider(client));
-	});
+	return vscode.languages.registerFoldingRangeProvider(selector.syntax,
+		new TypeScriptFoldingProvider(client));
 }
diff --git a/extensions/typescript-language-features/src/languageFeatures/organizeImports.ts b/extensions/typescript-language-features/src/languageFeatures/organizeImports.ts
index ca04e5c7353564..0e5ad2098eeb12 100644
--- a/extensions/typescript-language-features/src/languageFeatures/organizeImports.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/organizeImports.ts
@@ -20,14 +20,13 @@ import FileConfigurationManager from './fileConfigurationManager';
 interface OrganizeImportsCommandMetadata {
 	readonly ids: readonly string[];
 	readonly title: string;
-	readonly minVersion: API;
+	readonly minVersion?: API;
 	readonly kind: vscode.CodeActionKind;
 	readonly mode: OrganizeImportsMode;
 }
 
 const organizeImportsCommand: OrganizeImportsCommandMetadata = {
 	ids: ['typescript.organizeImports'],
-	minVersion: API.v280,
 	title: vscode.l10n.t("Organize Imports"),
 	kind: vscode.CodeActionKind.SourceOrganizeImports,
 	mode: OrganizeImportsMode.All,
@@ -157,7 +156,7 @@ export function register(
 
 	for (const command of [organizeImportsCommand, sortImportsCommand, removeUnusedImportsCommand]) {
 		disposables.push(conditionalRegistration([
-			requireMinVersion(client, command.minVersion),
+			requireMinVersion(client, command.minVersion ?? API.defaultVersion),
 			requireSomeCapability(client, ClientCapability.Semantic),
 		], () => {
 			const provider = new ImportsCodeActionProvider(client, command, commandManager, fileConfigurationManager, telemetryReporter);
diff --git a/extensions/typescript-language-features/src/languageFeatures/quickFix.ts b/extensions/typescript-language-features/src/languageFeatures/quickFix.ts
index decd9c912a68e8..e4ba4d80c5d9f8 100644
--- a/extensions/typescript-language-features/src/languageFeatures/quickFix.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/quickFix.ts
@@ -7,7 +7,6 @@ import * as vscode from 'vscode';
 import { Command, CommandManager } from '../commands/commandManager';
 import type * as Proto from '../protocol';
 import { ClientCapability, ITypeScriptServiceClient } from '../typescriptService';
-import API from '../utils/api';
 import { nulToken } from '../utils/cancellation';
 import { applyCodeActionCommands, getEditForCodeAction } from '../utils/codeAction';
 import { conditionalRegistration, requireSomeCapability } from '../utils/dependentRegistration';
@@ -342,7 +341,7 @@ class TypeScriptQuickFixProvider implements vscode.CodeActionProvider<VsCodeCode
 		diagnostic: vscode.Diagnostic,
 		tsAction: Proto.CodeFixAction,
 	): CodeActionSet {
-		if (!tsAction.fixId || this.client.apiVersion.lt(API.v270) || results.hasFixAllAction(tsAction.fixId)) {
+		if (!tsAction.fixId || results.hasFixAllAction(tsAction.fixId)) {
 			return results;
 		}
 
diff --git a/extensions/typescript-language-features/src/languageFeatures/refactor.ts b/extensions/typescript-language-features/src/languageFeatures/refactor.ts
index 4465fe1b415e94..550daa8689224c 100644
--- a/extensions/typescript-language-features/src/languageFeatures/refactor.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/refactor.ts
@@ -10,7 +10,7 @@ import type * as Proto from '../protocol';
 import { ClientCapability, ITypeScriptServiceClient } from '../typescriptService';
 import API from '../utils/api';
 import { nulToken } from '../utils/cancellation';
-import { conditionalRegistration, requireMinVersion, requireSomeCapability } from '../utils/dependentRegistration';
+import { conditionalRegistration, requireSomeCapability } from '../utils/dependentRegistration';
 import { DocumentSelector } from '../utils/documentSelector';
 import * as fileSchemes from '../utils/fileSchemes';
 import { TelemetryReporter } from '../utils/telemetry';
@@ -249,7 +249,6 @@ class SelectCodeAction extends vscode.CodeAction {
 type TsCodeAction = InlinedCodeAction | SelectCodeAction;
 
 class TypeScriptRefactorProvider implements vscode.CodeActionProvider<TsCodeAction> {
-	public static readonly minVersion = API.v240;
 
 	constructor(
 		private readonly client: ITypeScriptServiceClient,
@@ -505,7 +504,6 @@ export function register(
 	telemetryReporter: TelemetryReporter,
 ) {
 	return conditionalRegistration([
-		requireMinVersion(client, TypeScriptRefactorProvider.minVersion),
 		requireSomeCapability(client, ClientCapability.Semantic),
 	], () => {
 		return vscode.languages.registerCodeActionsProvider(selector.semantic,
diff --git a/extensions/typescript-language-features/src/languageFeatures/updatePathsOnRename.ts b/extensions/typescript-language-features/src/languageFeatures/updatePathsOnRename.ts
index 9a7bcd7bbd6dcc..3c149baf6eed8d 100644
--- a/extensions/typescript-language-features/src/languageFeatures/updatePathsOnRename.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/updatePathsOnRename.ts
@@ -155,11 +155,11 @@ class UpdateImportsOnFileRenameHandler extends Disposable {
 		};
 
 		const alwaysItem: vscode.MessageItem = {
-			title: vscode.l10n.t("Always automatically update imports"),
+			title: vscode.l10n.t("Always"),
 		};
 
 		const neverItem: vscode.MessageItem = {
-			title: vscode.l10n.t("Never automatically update imports"),
+			title: vscode.l10n.t("Never"),
 		};
 
 		const response = await vscode.window.showInformationMessage(
@@ -185,15 +185,14 @@ class UpdateImportsOnFileRenameHandler extends Disposable {
 					this.getConfigTargetScope(config, updateImportsOnFileMoveName));
 				return true;
 			}
-			case neverItem:
-				{
-					const config = this.getConfiguration(newResources[0]);
-					config.update(
-						updateImportsOnFileMoveName,
-						UpdateImportsOnFileMoveSetting.Never,
-						this.getConfigTargetScope(config, updateImportsOnFileMoveName));
-					return false;
-				}
+			case neverItem: {
+				const config = this.getConfiguration(newResources[0]);
+				config.update(
+					updateImportsOnFileMoveName,
+					UpdateImportsOnFileMoveSetting.Never,
+					this.getConfigTargetScope(config, updateImportsOnFileMoveName));
+				return false;
+			}
 			default: {
 				return false;
 			}
diff --git a/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts b/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts
index 27b41948f759c3..32557b1628c8a0 100644
--- a/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts
+++ b/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts
@@ -211,13 +211,11 @@ class SyncedBuffer {
 			args.scriptKindName = scriptKind;
 		}
 
-		if (this.client.apiVersion.gte(API.v240)) {
-			const tsPluginsForDocument = this.client.pluginManager.plugins
-				.filter(x => x.languages.indexOf(this.document.languageId) >= 0);
+		const tsPluginsForDocument = this.client.pluginManager.plugins
+			.filter(x => x.languages.indexOf(this.document.languageId) >= 0);
 
-			if (tsPluginsForDocument.length) {
-				(args as any).plugins = tsPluginsForDocument.map(plugin => plugin.name);
-			}
+		if (tsPluginsForDocument.length) {
+			(args as any).plugins = tsPluginsForDocument.map(plugin => plugin.name);
 		}
 
 		this.synchronizer.open(this.resource, args);
diff --git a/extensions/typescript-language-features/src/tsServer/serverProcess.electron.ts b/extensions/typescript-language-features/src/tsServer/serverProcess.electron.ts
index 4501166258984a..f4a0a6042a85b0 100644
--- a/extensions/typescript-language-features/src/tsServer/serverProcess.electron.ts
+++ b/extensions/typescript-language-features/src/tsServer/serverProcess.electron.ts
@@ -257,7 +257,7 @@ export class ElectronServiceProcessFactory implements TsServerProcessFactory {
 		let tsServerPath = version.tsServerPath;
 
 		if (!fs.existsSync(tsServerPath)) {
-			vscode.window.showWarningMessage(vscode.l10n.t("The path {0} doesn\'t point to a valid tsserver install. Falling back to bundled TypeScript version.', tsServerPath"));
+			vscode.window.showWarningMessage(vscode.l10n.t("The path {0} doesn\'t point to a valid tsserver install. Falling back to bundled TypeScript version.", tsServerPath));
 			versionManager.reset();
 			tsServerPath = versionManager.currentVersion.tsServerPath;
 		}
diff --git a/extensions/typescript-language-features/src/tsServer/spawner.ts b/extensions/typescript-language-features/src/tsServer/spawner.ts
index c1716e6886216f..abb909cc4b60ba 100644
--- a/extensions/typescript-language-features/src/tsServer/spawner.ts
+++ b/extensions/typescript-language-features/src/tsServer/spawner.ts
@@ -199,11 +199,7 @@ export class TypeScriptServerSpawner {
 			}
 		}
 
-		if (apiVersion.gte(API.v250)) {
-			args.push('--useInferredProjectPerProjectRoot');
-		} else {
-			args.push('--useSingleInferredProject');
-		}
+		args.push('--useInferredProjectPerProjectRoot');
 
 		if (configuration.disableAutomaticTypeAcquisition || kind === TsServerProcessKind.Syntax || kind === TsServerProcessKind.Diagnostics) {
 			args.push('--disableAutomaticTypingAcquisition');
diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts
index 89aeb3f8359494..891d7e4c21f1fa 100644
--- a/extensions/typescript-language-features/src/typescriptServiceClient.ts
+++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts
@@ -643,7 +643,6 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 								detail: vscode.l10n.t(
 									"The workspace is using an old version of TypeScript ({0}).\n\nBefore reporting an issue, please update the workspace to use the latest stable TypeScript release to make sure the bug has not already been fixed.",
 									(previousState.type === ServerState.Type.Errored && previousState.error instanceof TypeScriptServerError ? previousState.error.version.apiVersion?.displayName : undefined) + ''),
-								useCustom: true
 							});
 					} else {
 						const args = previousState.type === ServerState.Type.Errored && previousState.error instanceof TypeScriptServerError
diff --git a/extensions/typescript-language-features/src/ui/intellisenseStatus.ts b/extensions/typescript-language-features/src/ui/intellisenseStatus.ts
index 0fee1f00f68bd6..c7358d7956db24 100644
--- a/extensions/typescript-language-features/src/ui/intellisenseStatus.ts
+++ b/extensions/typescript-language-features/src/ui/intellisenseStatus.ts
@@ -46,7 +46,7 @@ namespace IntellisenseState {
 export class IntellisenseStatus extends Disposable {
 
 	public readonly openOpenConfigCommandId = '_typescript.openConfig';
-	public readonly createConfigCommandId = '_typescript.createConfig';
+	public readonly createOrOpenConfigCommandId = '_typescript.createOrOpenConfig';
 
 	private _statusItem?: vscode.LanguageStatusItem;
 
@@ -71,7 +71,7 @@ export class IntellisenseStatus extends Disposable {
 			},
 		});
 		commandManager.register({
-			id: this.createConfigCommandId,
+			id: this.createOrOpenConfigCommandId,
 			execute: async (rootPath: string, projectType: ProjectType) => {
 				await openOrCreateConfig(projectType, rootPath, this._client.configuration);
 			},
@@ -178,10 +178,10 @@ export class IntellisenseStatus extends Disposable {
 					statusItem.text = noConfigFileText;
 					statusItem.detail = undefined;
 					statusItem.command = {
-						command: this.createConfigCommandId,
+						command: this.createOrOpenConfigCommandId,
 						title: this._state.projectType === ProjectType.TypeScript
-							? vscode.l10n.t("Create tsconfig")
-							: vscode.l10n.t("Create jsconfig"),
+							? vscode.l10n.t("Configure tsconfig")
+							: vscode.l10n.t("Configure jsconfig"),
 						arguments: [rootPath],
 					};
 				} else {
diff --git a/extensions/typescript-language-features/src/utils/api.ts b/extensions/typescript-language-features/src/utils/api.ts
index fd519013f290a7..fbf74fe993d887 100644
--- a/extensions/typescript-language-features/src/utils/api.ts
+++ b/extensions/typescript-language-features/src/utils/api.ts
@@ -13,13 +13,6 @@ export default class API {
 	}
 
 	public static readonly defaultVersion = API.fromSimpleString('1.0.0');
-	public static readonly v240 = API.fromSimpleString('2.4.0');
-	public static readonly v250 = API.fromSimpleString('2.5.0');
-	public static readonly v260 = API.fromSimpleString('2.6.0');
-	public static readonly v270 = API.fromSimpleString('2.7.0');
-	public static readonly v280 = API.fromSimpleString('2.8.0');
-	public static readonly v290 = API.fromSimpleString('2.9.0');
-	public static readonly v291 = API.fromSimpleString('2.9.1');
 	public static readonly v300 = API.fromSimpleString('3.0.0');
 	public static readonly v310 = API.fromSimpleString('3.1.0');
 	public static readonly v314 = API.fromSimpleString('3.1.4');
diff --git a/extensions/typescript-language-features/src/utils/previewer.ts b/extensions/typescript-language-features/src/utils/previewer.ts
index 1564cdd92dd9a2..cc8125fc7782c0 100644
--- a/extensions/typescript-language-features/src/utils/previewer.ts
+++ b/extensions/typescript-language-features/src/utils/previewer.ts
@@ -94,9 +94,21 @@ function getTagDocumentation(
 				}
 				return label + (doc.match(/\r\n|\n/g) ? '  \n' + processInlineTags(doc) : ` \u2014 ${processInlineTags(doc)}`);
 			}
+			break;
+		}
+
+		case 'return':
+		case 'returns': {
+			// For return(s), we require a non-empty body
+			if (!tag.text?.length) {
+				return undefined;
+			}
+
+			break;
 		}
 	}
 
+
 	// Generic tag
 	const label = `*@${tag.name}*`;
 	const text = getTagBodyText(tag, filePathConverter);
@@ -208,8 +220,8 @@ export function tagsMarkdownPreview(
 }
 
 export function markdownDocumentation(
-	documentation: Proto.SymbolDisplayPart[] | string,
-	tags: Proto.JSDocTagInfo[],
+	documentation: readonly Proto.SymbolDisplayPart[] | string,
+	tags: readonly Proto.JSDocTagInfo[],
 	filePathConverter: IFilePathToResourceConverter,
 	baseUri: vscode.Uri | undefined,
 ): vscode.MarkdownString {
@@ -221,8 +233,8 @@ export function markdownDocumentation(
 
 export function addMarkdownDocumentation(
 	out: vscode.MarkdownString,
-	documentation: Proto.SymbolDisplayPart[] | string | undefined,
-	tags: Proto.JSDocTagInfo[] | undefined,
+	documentation: readonly Proto.SymbolDisplayPart[] | string | undefined,
+	tags: readonly Proto.JSDocTagInfo[] | undefined,
 	converter: IFilePathToResourceConverter,
 ): vscode.MarkdownString {
 	if (documentation) {
diff --git a/extensions/typescript-language-features/tsconfig.json b/extensions/typescript-language-features/tsconfig.json
index 769e79a9072c2e..dbed493cc43bbe 100644
--- a/extensions/typescript-language-features/tsconfig.json
+++ b/extensions/typescript-language-features/tsconfig.json
@@ -10,7 +10,6 @@
 	"include": [
 		"src/**/*",
 		"../../src/vscode-dts/vscode.d.ts",
-		"../../src/vscode-dts/vscode.proposed.resolvers.d.ts",
 		"../../src/vscode-dts/vscode.proposed.workspaceTrust.d.ts",
 	]
 }
diff --git a/extensions/typescript-language-features/yarn.lock b/extensions/typescript-language-features/yarn.lock
index c765571b9fa2af..ba9178eab1821d 100644
--- a/extensions/typescript-language-features/yarn.lock
+++ b/extensions/typescript-language-features/yarn.lock
@@ -196,10 +196,10 @@
   dependencies:
     "@types/node" "*"
 
-"@vscode/extension-telemetry@0.7.1-preview":
-  version "0.7.1-preview"
-  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.7.1-preview.tgz#1b954b8932b7f27a3993abda25299b8ba7f97233"
-  integrity sha512-7GdA8lMrcMhRfFxVpk7KBNbx+Bh/OpG702C1uPcyOQqp5lH1txJ/8SZAacFqFMKLRnBdGlJRKBREQe/Fs1X/eQ==
+"@vscode/extension-telemetry@0.7.3-preview":
+  version "0.7.3-preview"
+  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.7.3-preview.tgz#3e45609c862022e7eec52e47fe45176149d82b6c"
+  integrity sha512-V+TanZXj8jhCX8mwGHbRDOTJ5YSWCmngHKs7ZrRoR7sXc4vZYQX+1syp07hDX2BVnPpuBHJiovZ8GZ4zbmQvYw==
   dependencies:
     "@microsoft/1ds-core-js" "^3.2.8"
     "@microsoft/1ds-post-js" "^3.2.8"
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/index.ts b/extensions/vscode-api-tests/src/singlefolder-tests/index.ts
index de9ebf3616548f..6798fc5a1e031b 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/index.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/index.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-const path = require('path');
-const testRunner = require('../../../../test/integration/electron/testrunner');
+import * as path from 'path';
+import * as testRunner from '../../../../test/integration/electron/testrunner';
 
 const options: any = {
 	ui: 'tdd',
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/notebook.api.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/notebook.api.test.ts
index 373321d9bf4274..4990e30af59058 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/notebook.api.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/notebook.api.test.ts
@@ -183,7 +183,6 @@ const apiTestSerializer: vscode.NotebookSerializer = {
 
 		// opening a cell-uri opens a notebook editor
 		await vscode.window.showTextDocument(cell.document, { viewColumn: vscode.ViewColumn.Active });
-		// await vscode.commands.executeCommand('vscode.open', cell.document.uri, vscode.ViewColumn.Active);
 
 		assert.strictEqual(!!vscode.window.activeNotebookEditor, true);
 		assert.strictEqual(vscode.window.activeNotebookEditor!.notebook.uri.toString(), document.uri.toString());
@@ -224,7 +223,8 @@ const apiTestSerializer: vscode.NotebookSerializer = {
 	});
 
 	test('#102411 - untitled notebook creation failed', async function () {
-		await vscode.commands.executeCommand('workbench.action.files.newUntitledFile', { viewType: notebookType });
+		const document = await vscode.workspace.openNotebookDocument(notebookType, undefined);
+		await vscode.window.showNotebookDocument(document);
 		assert.notStrictEqual(vscode.window.activeNotebookEditor, undefined, 'untitled notebook editor is not undefined');
 
 		await closeAllEditors();
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/notebook.editor.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/notebook.editor.test.ts
index f182631930f75e..ad89096d704c54 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/notebook.editor.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/notebook.editor.test.ts
@@ -7,7 +7,7 @@ import * as assert from 'assert';
 import * as vscode from 'vscode';
 import * as utils from '../utils';
 
-(vscode.env.uiKind === vscode.UIKind.Web ? suite.skip : suite.skip)('Notebook Editor', function () {
+(vscode.env.uiKind === vscode.UIKind.Web ? suite.skip : suite)('Notebook Editor', function () {
 
 	const contentSerializer = new class implements vscode.NotebookSerializer {
 		deserializeNotebook() {
@@ -66,14 +66,14 @@ import * as utils from '../utils';
 	});
 
 	// #138683
-	test('Opening a notebook should fire activeNotebook event changed only once', async function () {
+	test('Opening a notebook should fire activeNotebook event changed only once', utils.withVerboseLogs(async function () {
 		const openedEditor = onDidOpenNotebookEditor();
 		const resource = await utils.createRandomFile(undefined, undefined, '.nbdtest');
 		const document = await vscode.workspace.openNotebookDocument(resource);
 		const editor = await vscode.window.showNotebookDocument(document);
 		assert.ok(await openedEditor);
 		assert.strictEqual(editor.notebook.uri.toString(), resource.toString());
-	});
+	}));
 
 	test('Active/Visible Editor', async function () {
 		const firstEditorOpen = onDidOpenNotebookEditor();
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/notebook.kernel.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/notebook.kernel.test.ts
index 75b1b6fb4e0b16..58297eb4e5bc9d 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/notebook.kernel.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/notebook.kernel.test.ts
@@ -178,7 +178,8 @@ const apiTestSerializer: vscode.NotebookSerializer = {
 		});
 
 		const secondResource = await createRandomNotebookFile();
-		await vscode.commands.executeCommand('vscode.openWith', secondResource, 'notebookCoreTest');
+		const secondDocument = await vscode.workspace.openNotebookDocument(secondResource);
+		await vscode.window.showNotebookDocument(secondDocument);
 
 		await withEvent<vscode.NotebookDocumentChangeEvent>(vscode.workspace.onDidChangeNotebookDocument, async event => {
 			await vscode.commands.executeCommand('notebook.cell.execute', { start: 0, end: 1 }, notebook.uri);
diff --git a/extensions/vscode-api-tests/src/utils.ts b/extensions/vscode-api-tests/src/utils.ts
index 301aec20b7e1c5..28cd422ce40fd3 100644
--- a/extensions/vscode-api-tests/src/utils.ts
+++ b/extensions/vscode-api-tests/src/utils.ts
@@ -66,10 +66,10 @@ export function delay(ms: number) {
 	return new Promise(resolve => setTimeout(resolve, ms));
 }
 
-export function withLogDisabled(runnable: () => Promise<any>): () => Promise<void> {
+function withLogLevel(level: string, runnable: () => Promise<any>): () => Promise<void> {
 	return async (): Promise<void> => {
 		const logLevel = await vscode.commands.executeCommand('_extensionTests.getLogLevel');
-		await vscode.commands.executeCommand('_extensionTests.setLogLevel', 'off');
+		await vscode.commands.executeCommand('_extensionTests.setLogLevel', level);
 
 		try {
 			await runnable();
@@ -79,6 +79,14 @@ export function withLogDisabled(runnable: () => Promise<any>): () => Promise<voi
 	};
 }
 
+export function withLogDisabled(runnable: () => Promise<any>): () => Promise<void> {
+	return withLogLevel('off', runnable);
+}
+
+export function withVerboseLogs(runnable: () => Promise<any>): () => Promise<void> {
+	return withLogLevel('trace', runnable);
+}
+
 export function assertNoRpc() {
 	assertNoRpcFromEntry([vscode, 'vscode']);
 }
diff --git a/extensions/vscode-api-tests/src/workspace-tests/index.ts b/extensions/vscode-api-tests/src/workspace-tests/index.ts
index 9c23f586b146bd..314a2e0d8f4957 100644
--- a/extensions/vscode-api-tests/src/workspace-tests/index.ts
+++ b/extensions/vscode-api-tests/src/workspace-tests/index.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-const path = require('path');
-const testRunner = require('../../../../test/integration/electron/testrunner');
+import * as path from 'path';
+import * as testRunner from '../../../../test/integration/electron/testrunner';
 
 const options: any = {
 	ui: 'tdd',
diff --git a/extensions/vscode-colorize-tests/src/index.ts b/extensions/vscode-colorize-tests/src/index.ts
index 4dcda1af3f9f4b..51634213040317 100644
--- a/extensions/vscode-colorize-tests/src/index.ts
+++ b/extensions/vscode-colorize-tests/src/index.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-const path = require('path');
-const testRunner = require('../../../test/integration/electron/testrunner');
+import * as path from 'path';
+import * as testRunner from '../../../test/integration/electron/testrunner';
 
 const suite = 'Integration Colorize Tests';
 
-const options: any = {
+const options: import('mocha').MochaOptions = {
 	ui: 'tdd',
 	color: true,
 	timeout: 60000
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 3989f39d0218f2..9995b89e0ceb24 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/12750_html.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/12750_html.json
@@ -8,7 +8,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "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 e765d4303218c8..ebe403925c7c48 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/13448_html.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/13448_html.json
@@ -8,7 +8,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "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 b7b57e957c9e77..6871c303e88e4c 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/14119_less.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/14119_less.json
@@ -8,7 +8,9 @@
 			"dark_vs": "source.css.less entity.other.attribute-name.id: #D7BA7D",
 			"light_vs": "source.css.less entity.other.attribute-name.id: #800000",
 			"hc_black": "source.css.less entity.other.attribute-name.id: #D7BA7D",
-			"hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85"
+			"dark_plus_experimental": "source.css.less entity.other.attribute-name.id: #D7BA7D",
+			"hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85",
+			"light_plus_experimental": "source.css.less entity.other.attribute-name.id: #800000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "source.css.less entity.other.attribute-name.id: #D7BA7D",
 			"light_vs": "source.css.less entity.other.attribute-name.id: #800000",
 			"hc_black": "source.css.less entity.other.attribute-name.id: #D7BA7D",
-			"hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85"
+			"dark_plus_experimental": "source.css.less entity.other.attribute-name.id: #D7BA7D",
+			"hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85",
+			"light_plus_experimental": "source.css.less entity.other.attribute-name.id: #800000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
-]
+]
\ 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 ed95595fd581d8..aa677897eb0fbb 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/25920_html.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/25920_html.json
@@ -8,7 +8,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "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 a3310a9c1d2b6f..d730dac8fd5e80 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/COMMIT_EDITMSG.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/COMMIT_EDITMSG.json
@@ -8,7 +8,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "markup.deleted: #CE9178",
 			"light_vs": "markup.deleted: #A31515",
 			"hc_black": "markup.deleted: #CE9178",
-			"hc_light": "markup.deleted: #5A5A5A"
+			"dark_plus_experimental": "markup.deleted: #CE9178",
+			"hc_light": "markup.deleted: #5A5A5A",
+			"light_plus_experimental": "markup.deleted: #A31515"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "markup.changed: #569CD6",
 			"light_vs": "markup.changed: #0451A5",
 			"hc_black": "markup.changed: #569CD6",
-			"hc_light": "markup.changed: #0451A5"
+			"dark_plus_experimental": "markup.changed: #569CD6",
+			"hc_light": "markup.changed: #0451A5",
+			"light_plus_experimental": "markup.changed: #0451A5"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "markup.inserted: #B5CEA8",
 			"light_vs": "markup.inserted: #098658",
 			"hc_black": "markup.inserted: #B5CEA8",
-			"hc_light": "markup.inserted: #096D48"
+			"dark_plus_experimental": "markup.inserted: #B5CEA8",
+			"hc_light": "markup.inserted: #096D48",
+			"light_plus_experimental": "markup.inserted: #098658"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	}
 ]
\ 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 ee9e706f6668cb..c03c720d611aa9 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/Dockerfile.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/Dockerfile.json
@@ -8,7 +8,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 10ddf2073b5b0b..0172bb89efe3cc 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/basic_java.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/basic_java.json
@@ -8,7 +8,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "storage.modifier.package.java: #D4D4D4",
 			"light_vs": "storage.modifier.package.java: #000000",
 			"hc_black": "storage.modifier.package.java: #D4D4D4",
-			"hc_light": "storage.modifier.package.java: #000000"
+			"dark_plus_experimental": "storage.modifier.package.java: #D4D4D4",
+			"hc_light": "storage.modifier.package.java: #000000",
+			"light_plus_experimental": "storage.modifier.package.java: #000000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "storage.modifier.import.java: #D4D4D4",
 			"light_vs": "storage.modifier.import.java: #000000",
 			"hc_black": "storage.modifier.import.java: #D4D4D4",
-			"hc_light": "storage.modifier.import.java: #000000"
+			"dark_plus_experimental": "storage.modifier.import.java: #D4D4D4",
+			"hc_light": "storage.modifier.import.java: #000000",
+			"light_plus_experimental": "storage.modifier.import.java: #000000"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "storage.modifier.import.java: #D4D4D4",
 			"light_vs": "storage.modifier.import.java: #000000",
 			"hc_black": "storage.modifier.import.java: #D4D4D4",
-			"hc_light": "storage.modifier.import.java: #000000"
+			"dark_plus_experimental": "storage.modifier.import.java: #D4D4D4",
+			"hc_light": "storage.modifier.import.java: #000000",
+			"light_plus_experimental": "storage.modifier.import.java: #000000"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "storage.modifier.import.java: #D4D4D4",
 			"light_vs": "storage.modifier.import.java: #000000",
 			"hc_black": "storage.modifier.import.java: #D4D4D4",
-			"hc_light": "storage.modifier.import.java: #000000"
+			"dark_plus_experimental": "storage.modifier.import.java: #D4D4D4",
+			"hc_light": "storage.modifier.import.java: #000000",
+			"light_plus_experimental": "storage.modifier.import.java: #000000"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "storage.modifier.import.java: #D4D4D4",
 			"light_vs": "storage.modifier.import.java: #000000",
 			"hc_black": "storage.modifier.import.java: #D4D4D4",
-			"hc_light": "storage.modifier.import.java: #000000"
+			"dark_plus_experimental": "storage.modifier.import.java: #D4D4D4",
+			"hc_light": "storage.modifier.import.java: #000000",
+			"light_plus_experimental": "storage.modifier.import.java: #000000"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "storage.modifier.import.java: #D4D4D4",
 			"light_vs": "storage.modifier.import.java: #000000",
 			"hc_black": "storage.modifier.import.java: #D4D4D4",
-			"hc_light": "storage.modifier.import.java: #000000"
+			"dark_plus_experimental": "storage.modifier.import.java: #D4D4D4",
+			"hc_light": "storage.modifier.import.java: #000000",
+			"light_plus_experimental": "storage.modifier.import.java: #000000"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "storage.modifier.import.java: #D4D4D4",
 			"light_vs": "storage.modifier.import.java: #000000",
 			"hc_black": "storage.modifier.import.java: #D4D4D4",
-			"hc_light": "storage.modifier.import.java: #000000"
+			"dark_plus_experimental": "storage.modifier.import.java: #D4D4D4",
+			"hc_light": "storage.modifier.import.java: #000000",
+			"light_plus_experimental": "storage.modifier.import.java: #000000"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "storage.modifier.import.java: #D4D4D4",
 			"light_vs": "storage.modifier.import.java: #000000",
 			"hc_black": "storage.modifier.import.java: #D4D4D4",
-			"hc_light": "storage.modifier.import.java: #000000"
+			"dark_plus_experimental": "storage.modifier.import.java: #D4D4D4",
+			"hc_light": "storage.modifier.import.java: #000000",
+			"light_plus_experimental": "storage.modifier.import.java: #000000"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "storage.modifier.import.java: #D4D4D4",
 			"light_vs": "storage.modifier.import.java: #000000",
 			"hc_black": "storage.modifier.import.java: #D4D4D4",
-			"hc_light": "storage.modifier.import.java: #000000"
+			"dark_plus_experimental": "storage.modifier.import.java: #D4D4D4",
+			"hc_light": "storage.modifier.import.java: #000000",
+			"light_plus_experimental": "storage.modifier.import.java: #000000"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "storage.modifier.import.java: #D4D4D4",
 			"light_vs": "storage.modifier.import.java: #000000",
 			"hc_black": "storage.modifier.import.java: #D4D4D4",
-			"hc_light": "storage.modifier.import.java: #000000"
+			"dark_plus_experimental": "storage.modifier.import.java: #D4D4D4",
+			"hc_light": "storage.modifier.import.java: #000000",
+			"light_plus_experimental": "storage.modifier.import.java: #000000"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "storage.modifier.import.java: #D4D4D4",
 			"light_vs": "storage.modifier.import.java: #000000",
 			"hc_black": "storage.modifier.import.java: #D4D4D4",
-			"hc_light": "storage.modifier.import.java: #000000"
+			"dark_plus_experimental": "storage.modifier.import.java: #D4D4D4",
+			"hc_light": "storage.modifier.import.java: #000000",
+			"light_plus_experimental": "storage.modifier.import.java: #000000"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "storage.modifier.import.java: #D4D4D4",
 			"light_vs": "storage.modifier.import.java: #000000",
 			"hc_black": "storage.modifier.import.java: #D4D4D4",
-			"hc_light": "storage.modifier.import.java: #000000"
+			"dark_plus_experimental": "storage.modifier.import.java: #D4D4D4",
+			"hc_light": "storage.modifier.import.java: #000000",
+			"light_plus_experimental": "storage.modifier.import.java: #000000"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "variable.language.wildcard.java: #D4D4D4",
 			"light_vs": "variable.language.wildcard.java: #000000",
 			"hc_black": "variable.language.wildcard.java: #D4D4D4",
-			"hc_light": "variable.language.wildcard.java: #000000"
+			"dark_plus_experimental": "variable.language.wildcard.java: #D4D4D4",
+			"hc_light": "variable.language.wildcard.java: #000000",
+			"light_plus_experimental": "variable.language.wildcard.java: #000000"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.java: #4EC9B0",
-			"hc_light": "storage.type.java: #185E73"
+			"dark_plus_experimental": "storage.type.java: #4EC9B0",
+			"hc_light": "storage.type.java: #185E73",
+			"light_plus_experimental": "storage.type.java: #267F99"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.primitive.java: #4EC9B0",
-			"hc_light": "storage.type.primitive.java: #185E73"
+			"dark_plus_experimental": "storage.type.primitive.java: #4EC9B0",
+			"hc_light": "storage.type.primitive.java: #185E73",
+			"light_plus_experimental": "storage.type.primitive.java: #267F99"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.primitive.java: #4EC9B0",
-			"hc_light": "storage.type.primitive.java: #185E73"
+			"dark_plus_experimental": "storage.type.primitive.java: #4EC9B0",
+			"hc_light": "storage.type.primitive.java: #185E73",
+			"light_plus_experimental": "storage.type.primitive.java: #267F99"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.primitive.java: #4EC9B0",
-			"hc_light": "storage.type.primitive.java: #185E73"
+			"dark_plus_experimental": "storage.type.primitive.java: #4EC9B0",
+			"hc_light": "storage.type.primitive.java: #185E73",
+			"light_plus_experimental": "storage.type.primitive.java: #267F99"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.primitive.java: #4EC9B0",
-			"hc_light": "storage.type.primitive.java: #185E73"
+			"dark_plus_experimental": "storage.type.primitive.java: #4EC9B0",
+			"hc_light": "storage.type.primitive.java: #185E73",
+			"light_plus_experimental": "storage.type.primitive.java: #267F99"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.primitive.java: #4EC9B0",
-			"hc_light": "storage.type.primitive.java: #185E73"
+			"dark_plus_experimental": "storage.type.primitive.java: #4EC9B0",
+			"hc_light": "storage.type.primitive.java: #185E73",
+			"light_plus_experimental": "storage.type.primitive.java: #267F99"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.annotation.java: #4EC9B0",
-			"hc_light": "storage.type.annotation.java: #185E73"
+			"dark_plus_experimental": "storage.type.annotation.java: #4EC9B0",
+			"hc_light": "storage.type.annotation.java: #185E73",
+			"light_plus_experimental": "storage.type.annotation.java: #267F99"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.primitive.java: #4EC9B0",
-			"hc_light": "storage.type.primitive.java: #185E73"
+			"dark_plus_experimental": "storage.type.primitive.java: #4EC9B0",
+			"hc_light": "storage.type.primitive.java: #185E73",
+			"light_plus_experimental": "storage.type.primitive.java: #267F99"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.primitive.java: #4EC9B0",
-			"hc_light": "storage.type.primitive.java: #185E73"
+			"dark_plus_experimental": "storage.type.primitive.java: #4EC9B0",
+			"hc_light": "storage.type.primitive.java: #185E73",
+			"light_plus_experimental": "storage.type.primitive.java: #267F99"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.primitive.java: #4EC9B0",
-			"hc_light": "storage.type.primitive.java: #185E73"
+			"dark_plus_experimental": "storage.type.primitive.java: #4EC9B0",
+			"hc_light": "storage.type.primitive.java: #185E73",
+			"light_plus_experimental": "storage.type.primitive.java: #267F99"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.annotation.java: #4EC9B0",
-			"hc_light": "storage.type.annotation.java: #185E73"
+			"dark_plus_experimental": "storage.type.annotation.java: #4EC9B0",
+			"hc_light": "storage.type.annotation.java: #185E73",
+			"light_plus_experimental": "storage.type.annotation.java: #267F99"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.primitive.java: #4EC9B0",
-			"hc_light": "storage.type.primitive.java: #185E73"
+			"dark_plus_experimental": "storage.type.primitive.java: #4EC9B0",
+			"hc_light": "storage.type.primitive.java: #185E73",
+			"light_plus_experimental": "storage.type.primitive.java: #267F99"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2168,7 +2528,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2180,7 +2542,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2192,7 +2556,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2204,7 +2570,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.primitive.java: #4EC9B0",
-			"hc_light": "storage.type.primitive.java: #185E73"
+			"dark_plus_experimental": "storage.type.primitive.java: #4EC9B0",
+			"hc_light": "storage.type.primitive.java: #185E73",
+			"light_plus_experimental": "storage.type.primitive.java: #267F99"
 		}
 	},
 	{
@@ -2216,7 +2584,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2228,7 +2598,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2240,7 +2612,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2252,7 +2626,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2264,7 +2640,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2276,7 +2654,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2288,7 +2668,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2300,7 +2682,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2312,7 +2696,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.java: #4EC9B0",
-			"hc_light": "storage.type.java: #185E73"
+			"dark_plus_experimental": "storage.type.java: #4EC9B0",
+			"hc_light": "storage.type.java: #185E73",
+			"light_plus_experimental": "storage.type.java: #267F99"
 		}
 	},
 	{
@@ -2324,7 +2710,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2336,7 +2724,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.generic.java: #4EC9B0",
-			"hc_light": "storage.type.generic.java: #185E73"
+			"dark_plus_experimental": "storage.type.generic.java: #4EC9B0",
+			"hc_light": "storage.type.generic.java: #185E73",
+			"light_plus_experimental": "storage.type.generic.java: #267F99"
 		}
 	},
 	{
@@ -2348,7 +2738,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2360,7 +2752,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2372,7 +2766,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2384,7 +2780,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2396,7 +2794,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2408,7 +2808,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2420,7 +2822,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2432,7 +2836,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2444,7 +2850,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2456,7 +2864,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2468,7 +2878,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2480,7 +2892,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2492,7 +2906,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2504,7 +2920,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2516,7 +2934,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 fcfd8c30f982ca..b815141fa4c5ef 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
@@ -8,7 +8,9 @@
 			"dark_vs": "support.function.git-rebase: #9CDCFE",
 			"light_vs": "support.function.git-rebase: #0451A5",
 			"hc_black": "support.function.git-rebase: #D4D4D4",
-			"hc_light": "support.function.git-rebase: #0451A5"
+			"dark_plus_experimental": "support.function.git-rebase: #9CDCFE",
+			"hc_light": "support.function.git-rebase: #0451A5",
+			"light_plus_experimental": "support.function.git-rebase: #0451A5"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "constant.sha.git-rebase: #B5CEA8",
 			"light_vs": "constant.sha.git-rebase: #098658",
 			"hc_black": "constant.sha.git-rebase: #B5CEA8",
-			"hc_light": "constant.sha.git-rebase: #096D48"
+			"dark_plus_experimental": "constant.sha.git-rebase: #B5CEA8",
+			"hc_light": "constant.sha.git-rebase: #096D48",
+			"light_plus_experimental": "constant.sha.git-rebase: #098658"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "support.function.git-rebase: #9CDCFE",
 			"light_vs": "support.function.git-rebase: #0451A5",
 			"hc_black": "support.function.git-rebase: #D4D4D4",
-			"hc_light": "support.function.git-rebase: #0451A5"
+			"dark_plus_experimental": "support.function.git-rebase: #9CDCFE",
+			"hc_light": "support.function.git-rebase: #0451A5",
+			"light_plus_experimental": "support.function.git-rebase: #0451A5"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "constant.sha.git-rebase: #B5CEA8",
 			"light_vs": "constant.sha.git-rebase: #098658",
 			"hc_black": "constant.sha.git-rebase: #B5CEA8",
-			"hc_light": "constant.sha.git-rebase: #096D48"
+			"dark_plus_experimental": "constant.sha.git-rebase: #B5CEA8",
+			"hc_light": "constant.sha.git-rebase: #096D48",
+			"light_plus_experimental": "constant.sha.git-rebase: #098658"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "support.function.git-rebase: #9CDCFE",
 			"light_vs": "support.function.git-rebase: #0451A5",
 			"hc_black": "support.function.git-rebase: #D4D4D4",
-			"hc_light": "support.function.git-rebase: #0451A5"
+			"dark_plus_experimental": "support.function.git-rebase: #9CDCFE",
+			"hc_light": "support.function.git-rebase: #0451A5",
+			"light_plus_experimental": "support.function.git-rebase: #0451A5"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "constant.sha.git-rebase: #B5CEA8",
 			"light_vs": "constant.sha.git-rebase: #098658",
 			"hc_black": "constant.sha.git-rebase: #B5CEA8",
-			"hc_light": "constant.sha.git-rebase: #096D48"
+			"dark_plus_experimental": "constant.sha.git-rebase: #B5CEA8",
+			"hc_light": "constant.sha.git-rebase: #096D48",
+			"light_plus_experimental": "constant.sha.git-rebase: #098658"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "support.function.git-rebase: #9CDCFE",
 			"light_vs": "support.function.git-rebase: #0451A5",
 			"hc_black": "support.function.git-rebase: #D4D4D4",
-			"hc_light": "support.function.git-rebase: #0451A5"
+			"dark_plus_experimental": "support.function.git-rebase: #9CDCFE",
+			"hc_light": "support.function.git-rebase: #0451A5",
+			"light_plus_experimental": "support.function.git-rebase: #0451A5"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "constant.sha.git-rebase: #B5CEA8",
 			"light_vs": "constant.sha.git-rebase: #098658",
 			"hc_black": "constant.sha.git-rebase: #B5CEA8",
-			"hc_light": "constant.sha.git-rebase: #096D48"
+			"dark_plus_experimental": "constant.sha.git-rebase: #B5CEA8",
+			"hc_light": "constant.sha.git-rebase: #096D48",
+			"light_plus_experimental": "constant.sha.git-rebase: #098658"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "support.function.git-rebase: #9CDCFE",
 			"light_vs": "support.function.git-rebase: #0451A5",
 			"hc_black": "support.function.git-rebase: #D4D4D4",
-			"hc_light": "support.function.git-rebase: #0451A5"
+			"dark_plus_experimental": "support.function.git-rebase: #9CDCFE",
+			"hc_light": "support.function.git-rebase: #0451A5",
+			"light_plus_experimental": "support.function.git-rebase: #0451A5"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "constant.sha.git-rebase: #B5CEA8",
 			"light_vs": "constant.sha.git-rebase: #098658",
 			"hc_black": "constant.sha.git-rebase: #B5CEA8",
-			"hc_light": "constant.sha.git-rebase: #096D48"
+			"dark_plus_experimental": "constant.sha.git-rebase: #B5CEA8",
+			"hc_light": "constant.sha.git-rebase: #096D48",
+			"light_plus_experimental": "constant.sha.git-rebase: #098658"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "support.function.git-rebase: #9CDCFE",
 			"light_vs": "support.function.git-rebase: #0451A5",
 			"hc_black": "support.function.git-rebase: #D4D4D4",
-			"hc_light": "support.function.git-rebase: #0451A5"
+			"dark_plus_experimental": "support.function.git-rebase: #9CDCFE",
+			"hc_light": "support.function.git-rebase: #0451A5",
+			"light_plus_experimental": "support.function.git-rebase: #0451A5"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "constant.sha.git-rebase: #B5CEA8",
 			"light_vs": "constant.sha.git-rebase: #098658",
 			"hc_black": "constant.sha.git-rebase: #B5CEA8",
-			"hc_light": "constant.sha.git-rebase: #096D48"
+			"dark_plus_experimental": "constant.sha.git-rebase: #B5CEA8",
+			"hc_light": "constant.sha.git-rebase: #096D48",
+			"light_plus_experimental": "constant.sha.git-rebase: #098658"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "support.function.git-rebase: #9CDCFE",
 			"light_vs": "support.function.git-rebase: #0451A5",
 			"hc_black": "support.function.git-rebase: #D4D4D4",
-			"hc_light": "support.function.git-rebase: #0451A5"
+			"dark_plus_experimental": "support.function.git-rebase: #9CDCFE",
+			"hc_light": "support.function.git-rebase: #0451A5",
+			"light_plus_experimental": "support.function.git-rebase: #0451A5"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "constant.sha.git-rebase: #B5CEA8",
 			"light_vs": "constant.sha.git-rebase: #098658",
 			"hc_black": "constant.sha.git-rebase: #B5CEA8",
-			"hc_light": "constant.sha.git-rebase: #096D48"
+			"dark_plus_experimental": "constant.sha.git-rebase: #B5CEA8",
+			"hc_light": "constant.sha.git-rebase: #096D48",
+			"light_plus_experimental": "constant.sha.git-rebase: #098658"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	}
 ]
\ 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 98aaf4fee70505..e98c8a0d9519ee 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
@@ -8,7 +8,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.unquoted.plain.out.yaml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
+			"light_plus_experimental": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.unquoted.plain.out.yaml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
+			"light_plus_experimental": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.unquoted.plain.out.yaml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
+			"light_plus_experimental": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.unquoted.plain.out.yaml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
+			"light_plus_experimental": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	}
 ]
\ 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 46ec108af9ce3f..c66c80829e37bb 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
@@ -8,7 +8,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "punctuation.section.embedded.begin.php: #569CD6",
 			"light_vs": "punctuation.section.embedded.begin.php: #800000",
 			"hc_black": "punctuation.section.embedded: #569CD6",
-			"hc_light": "punctuation.section.embedded.begin.php: #0F4A85"
+			"dark_plus_experimental": "punctuation.section.embedded.begin.php: #569CD6",
+			"hc_light": "punctuation.section.embedded.begin.php: #0F4A85",
+			"light_plus_experimental": "punctuation.section.embedded.begin.php: #800000"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "punctuation.section.embedded.end.php: #569CD6",
 			"light_vs": "punctuation.section.embedded.end.php: #800000",
 			"hc_black": "punctuation.section.embedded: #569CD6",
-			"hc_light": "punctuation.section.embedded.end.php: #0F4A85"
+			"dark_plus_experimental": "punctuation.section.embedded.end.php: #569CD6",
+			"hc_light": "punctuation.section.embedded.end.php: #0F4A85",
+			"light_plus_experimental": "punctuation.section.embedded.end.php: #800000"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "punctuation.section.embedded.end.php: #569CD6",
 			"light_vs": "punctuation.section.embedded.end.php: #800000",
 			"hc_black": "punctuation.section.embedded: #569CD6",
-			"hc_light": "punctuation.section.embedded.end.php: #0F4A85"
+			"dark_plus_experimental": "punctuation.section.embedded.end.php: #569CD6",
+			"hc_light": "punctuation.section.embedded.end.php: #0F4A85",
+			"light_plus_experimental": "punctuation.section.embedded.end.php: #800000"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "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 8e305434daddb5..a30c09c1b6f1ee 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
@@ -8,7 +8,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.unquoted.plain.out.yaml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
+			"light_plus_experimental": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.unquoted.plain.out.yaml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
+			"light_plus_experimental": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.unquoted.plain.out.yaml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
+			"light_plus_experimental": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "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 f6c84cbbc1fc98..109358db8af77a 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
@@ -8,7 +8,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.yaml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.yaml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.yaml: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.yaml: #0000FF"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.yaml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.yaml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.yaml: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.yaml: #0000FF"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.yaml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.yaml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.yaml: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.yaml: #0000FF"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.yaml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.yaml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.yaml: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.yaml: #0000FF"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.yaml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.yaml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.yaml: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.yaml: #0000FF"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.yaml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.yaml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.yaml: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.yaml: #0000FF"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.yaml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.yaml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.yaml: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.yaml: #0000FF"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.yaml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.yaml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.yaml: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.yaml: #0000FF"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.yaml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.yaml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.yaml: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.yaml: #0000FF"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.unquoted.plain.out.yaml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
+			"light_plus_experimental": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.unquoted.plain.out.yaml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
+			"light_plus_experimental": "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 0284a7f7c95455..12846f594f60b0 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
@@ -8,7 +8,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "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 ecaa0f003733fc..b0c4ea27bf0cba 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/makefile.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/makefile.json
@@ -8,7 +8,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2168,7 +2528,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2180,7 +2542,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2192,7 +2556,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2204,7 +2570,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2216,7 +2584,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2228,7 +2598,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2240,7 +2612,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2252,7 +2626,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2264,7 +2640,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2276,7 +2654,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2288,7 +2668,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2300,7 +2682,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2312,7 +2696,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2324,7 +2710,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2336,7 +2724,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2348,7 +2738,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2360,7 +2752,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2372,7 +2766,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2384,7 +2780,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2396,7 +2794,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2408,7 +2808,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2420,7 +2822,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2432,7 +2836,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2444,7 +2850,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2456,7 +2864,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2468,7 +2878,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2480,7 +2892,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2492,7 +2906,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2504,7 +2920,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2516,7 +2934,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2528,7 +2948,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -2540,7 +2962,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2552,7 +2976,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2564,7 +2990,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2576,7 +3004,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2588,7 +3018,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2600,7 +3032,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2612,7 +3046,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2624,7 +3060,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2636,7 +3074,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2648,7 +3088,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2660,7 +3102,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2672,7 +3116,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2684,7 +3130,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2696,7 +3144,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2708,7 +3158,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2720,7 +3172,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2732,7 +3186,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2744,7 +3200,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2756,7 +3214,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2768,7 +3228,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2780,7 +3242,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2792,7 +3256,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2804,7 +3270,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2816,7 +3284,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2828,7 +3298,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2840,7 +3312,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2852,7 +3326,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2864,7 +3340,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2876,7 +3354,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2888,7 +3368,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2900,7 +3382,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2912,7 +3396,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2924,7 +3410,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2936,7 +3424,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2948,7 +3438,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2960,7 +3452,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2972,7 +3466,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2984,7 +3480,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2996,7 +3494,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3008,7 +3508,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3020,7 +3522,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3032,7 +3536,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3044,7 +3550,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3056,7 +3564,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3068,7 +3578,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3080,7 +3592,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3092,7 +3606,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3104,7 +3620,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3116,7 +3634,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -3128,7 +3648,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3140,7 +3662,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3152,7 +3676,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3164,7 +3690,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3176,7 +3704,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -3188,7 +3718,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3200,7 +3732,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3212,7 +3746,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3224,7 +3760,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3236,7 +3774,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3248,7 +3788,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3260,7 +3802,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3272,7 +3816,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3284,7 +3830,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3296,7 +3844,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3308,7 +3858,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3320,7 +3872,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3332,7 +3886,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3344,7 +3900,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3356,7 +3914,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3368,7 +3928,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3380,7 +3942,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3392,7 +3956,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3404,7 +3970,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3416,7 +3984,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3428,7 +3998,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3440,7 +4012,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3452,7 +4026,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -3464,7 +4040,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3476,7 +4054,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3488,7 +4068,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3500,7 +4082,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3512,7 +4096,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3524,7 +4110,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3536,7 +4124,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3548,7 +4138,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3560,7 +4152,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3572,7 +4166,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3584,7 +4180,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3596,7 +4194,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3608,7 +4208,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3620,7 +4222,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3632,7 +4236,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3644,7 +4250,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3656,7 +4264,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3668,7 +4278,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3680,7 +4292,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3692,7 +4306,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3704,7 +4320,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3716,7 +4334,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3728,7 +4348,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3740,7 +4362,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3752,7 +4376,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3764,7 +4390,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3776,7 +4404,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3788,7 +4418,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3800,7 +4432,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3812,7 +4446,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3824,7 +4460,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3836,7 +4474,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3848,7 +4488,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3860,7 +4502,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3872,7 +4516,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -3884,7 +4530,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3896,7 +4544,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3908,7 +4558,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3920,7 +4572,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3932,7 +4586,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -3944,7 +4600,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3956,7 +4614,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3968,7 +4628,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3980,7 +4642,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3992,7 +4656,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -4004,7 +4670,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -4016,7 +4684,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4028,7 +4698,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -4040,7 +4712,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4052,7 +4726,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4064,7 +4740,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 2d1e8abfed7992..53a5e869276d93 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
@@ -8,7 +8,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2168,7 +2528,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2180,7 +2542,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2192,7 +2556,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2204,7 +2570,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2216,7 +2584,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2228,7 +2598,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2240,7 +2612,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2252,7 +2626,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2264,7 +2640,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2276,7 +2654,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2288,7 +2668,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2300,7 +2682,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2312,7 +2696,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2324,7 +2710,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2336,7 +2724,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2348,7 +2738,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2360,7 +2752,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -2372,7 +2766,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -2384,7 +2780,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2396,7 +2794,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2408,7 +2808,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2420,7 +2822,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2432,7 +2836,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2444,7 +2850,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2456,7 +2864,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2468,7 +2878,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2480,7 +2892,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2492,7 +2906,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2504,7 +2920,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2516,7 +2934,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -2528,7 +2948,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -2540,7 +2962,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2552,7 +2976,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2564,7 +2990,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2576,7 +3004,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2588,7 +3018,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2600,7 +3032,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2612,7 +3046,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2624,7 +3060,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2636,7 +3074,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2648,7 +3088,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2660,7 +3102,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2672,7 +3116,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2684,7 +3130,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2696,7 +3144,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2708,7 +3158,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2720,7 +3172,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2732,7 +3186,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2744,7 +3200,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2756,7 +3214,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2768,7 +3228,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2780,7 +3242,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2792,7 +3256,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2804,7 +3270,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2816,7 +3284,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2828,7 +3298,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2840,7 +3312,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2852,7 +3326,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2864,7 +3340,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2876,7 +3354,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2888,7 +3368,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2900,7 +3382,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2912,7 +3396,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2924,7 +3410,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2936,7 +3424,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -2948,7 +3438,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -2960,7 +3452,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -2972,7 +3466,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -2984,7 +3480,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2996,7 +3494,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -3008,7 +3508,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -3020,7 +3522,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3032,7 +3536,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3044,7 +3550,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3056,7 +3564,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -3068,7 +3578,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -3080,7 +3592,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3092,7 +3606,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -3104,7 +3620,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -3116,7 +3634,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3128,7 +3648,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3140,7 +3662,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3152,7 +3676,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3164,7 +3690,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3176,7 +3704,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3188,7 +3718,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3200,7 +3732,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3212,7 +3746,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -3224,7 +3760,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -3236,7 +3774,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -3248,7 +3788,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3260,7 +3802,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3272,7 +3816,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3284,7 +3830,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -3296,7 +3844,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -3308,7 +3858,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3320,7 +3872,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3332,7 +3886,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3344,7 +3900,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -3356,7 +3914,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -3368,7 +3928,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -3380,7 +3942,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3392,7 +3956,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -3404,7 +3970,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -3416,7 +3984,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -3428,7 +3998,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3440,7 +4012,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3452,7 +4026,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3464,7 +4040,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -3476,7 +4054,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -3488,7 +4068,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3500,7 +4082,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3512,7 +4096,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3524,7 +4110,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -3536,7 +4124,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -3548,7 +4138,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -3560,7 +4152,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3572,7 +4166,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3584,7 +4180,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -3596,7 +4194,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -3608,7 +4208,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3620,7 +4222,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3632,7 +4236,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3644,7 +4250,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3656,7 +4264,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3668,7 +4278,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3680,7 +4292,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -3692,7 +4306,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -3704,7 +4320,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3716,7 +4334,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3728,7 +4348,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3740,7 +4362,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3752,7 +4376,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3764,7 +4390,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3776,7 +4404,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3788,7 +4418,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3800,7 +4432,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3812,7 +4446,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3824,7 +4460,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -3836,7 +4474,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -3848,7 +4488,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -3860,7 +4502,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3872,7 +4516,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -3884,7 +4530,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -3896,7 +4544,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -3908,7 +4558,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -3920,7 +4572,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -3932,7 +4586,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -3944,7 +4600,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3956,7 +4614,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -3968,7 +4628,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -3980,7 +4642,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -3992,7 +4656,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4004,7 +4670,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -4016,7 +4684,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -4028,7 +4698,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -4040,7 +4712,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4052,7 +4726,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -4064,7 +4740,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -4076,7 +4754,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -4088,7 +4768,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4100,7 +4782,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -4112,7 +4796,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -4124,7 +4810,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -4136,7 +4824,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4148,7 +4838,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4160,7 +4852,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4172,7 +4866,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4184,7 +4880,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4196,7 +4894,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4208,7 +4908,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4220,7 +4922,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4232,7 +4936,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4244,7 +4950,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4256,7 +4964,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4268,7 +4978,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4280,7 +4992,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4292,7 +5006,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4304,7 +5020,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4316,7 +5034,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4328,7 +5048,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4340,7 +5062,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4352,7 +5076,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4364,7 +5090,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4376,7 +5104,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4388,7 +5118,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4400,7 +5132,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4412,7 +5146,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4424,7 +5160,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4436,7 +5174,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4448,7 +5188,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4460,7 +5202,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4472,7 +5216,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4484,7 +5230,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4496,7 +5244,9 @@
 			"dark_vs": "punctuation.definition.list.begin.markdown: #6796E6",
 			"light_vs": "punctuation.definition.list.begin.markdown: #0451A5",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5"
+			"dark_plus_experimental": "punctuation.definition.list.begin.markdown: #6796E6",
+			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5",
+			"light_plus_experimental": "punctuation.definition.list.begin.markdown: #0451A5"
 		}
 	},
 	{
@@ -4508,7 +5258,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4520,7 +5272,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4532,7 +5286,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4544,7 +5300,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -4556,7 +5314,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -4568,7 +5328,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -4580,7 +5342,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4592,7 +5356,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4604,7 +5370,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4616,7 +5384,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -4628,7 +5398,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -4640,7 +5412,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4652,7 +5426,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4664,7 +5440,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4676,7 +5454,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4688,7 +5468,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4700,7 +5482,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -4712,7 +5496,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -4724,7 +5510,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4736,7 +5524,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4748,7 +5538,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4760,7 +5552,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4772,7 +5566,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4784,7 +5580,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4796,7 +5594,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4808,7 +5608,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4820,7 +5622,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -4832,7 +5636,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -4844,7 +5650,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4856,7 +5664,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4868,7 +5678,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4880,7 +5692,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4892,7 +5706,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4904,7 +5720,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -4916,7 +5734,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -4928,7 +5748,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4940,7 +5762,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4952,7 +5776,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4964,7 +5790,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4976,7 +5804,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4988,7 +5818,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5000,7 +5832,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -5012,7 +5846,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -5024,7 +5860,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -5036,7 +5874,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -5048,7 +5888,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -5060,7 +5902,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -5072,7 +5916,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5084,7 +5930,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -5096,7 +5944,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -5108,7 +5958,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5120,7 +5972,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5132,7 +5986,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5144,7 +6000,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -5156,7 +6014,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -5168,7 +6028,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5180,7 +6042,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5192,7 +6056,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5204,7 +6070,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5216,7 +6084,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5228,7 +6098,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -5240,7 +6112,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -5252,7 +6126,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -5264,7 +6140,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5276,7 +6154,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5288,7 +6168,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5300,7 +6182,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -5312,7 +6196,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -5324,7 +6210,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -5336,7 +6224,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5348,7 +6238,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5360,7 +6252,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -5372,7 +6266,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -5384,7 +6280,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5396,7 +6294,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5408,7 +6308,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5420,7 +6322,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -5432,7 +6336,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -5444,7 +6350,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5456,7 +6364,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5468,7 +6378,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5480,7 +6392,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -5492,7 +6406,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -5504,7 +6420,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5516,7 +6434,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5528,7 +6448,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5540,7 +6462,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5552,7 +6476,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5564,7 +6490,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -5576,7 +6504,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -5588,7 +6518,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -5600,7 +6532,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5612,7 +6546,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5624,7 +6560,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -5636,7 +6574,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -5648,7 +6588,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5660,7 +6602,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5672,7 +6616,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5684,7 +6630,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -5696,7 +6644,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -5708,7 +6658,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5720,7 +6672,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5732,7 +6686,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5744,7 +6700,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -5756,7 +6714,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -5768,7 +6728,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5780,7 +6742,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5792,7 +6756,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5804,7 +6770,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5816,7 +6784,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5828,7 +6798,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -5840,7 +6812,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -5852,7 +6826,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -5864,7 +6840,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5876,7 +6854,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -5888,7 +6868,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -5900,7 +6882,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -5912,7 +6896,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5924,7 +6910,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5936,7 +6924,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -5948,7 +6938,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -5960,7 +6952,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5972,7 +6966,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5984,7 +6980,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5996,7 +6994,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -6008,7 +7008,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -6020,7 +7022,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6032,7 +7036,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6044,7 +7050,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6056,7 +7064,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6068,7 +7078,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6080,7 +7092,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6092,7 +7106,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6104,7 +7120,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6116,7 +7134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6128,7 +7148,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -6140,7 +7162,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -6152,7 +7176,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -6164,7 +7190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6176,7 +7204,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -6188,7 +7218,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -6200,7 +7232,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -6212,7 +7246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6224,7 +7260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6236,7 +7274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6248,7 +7288,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6260,7 +7302,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6272,7 +7316,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6284,7 +7330,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -6296,7 +7344,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -6308,7 +7358,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -6320,7 +7372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6332,7 +7386,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -6344,7 +7400,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -6356,7 +7414,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -6368,7 +7428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6380,7 +7442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6392,7 +7456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6404,7 +7470,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -6416,7 +7484,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -6428,7 +7498,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6440,7 +7512,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6452,7 +7526,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6464,7 +7540,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6476,7 +7554,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6488,7 +7568,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6500,7 +7582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6512,7 +7596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6524,7 +7610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6536,7 +7624,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -6548,7 +7638,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -6560,7 +7652,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -6572,7 +7666,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -6584,7 +7680,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -6596,7 +7694,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -6608,7 +7708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6620,7 +7722,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -6632,7 +7736,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -6644,7 +7750,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -6656,7 +7764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6668,7 +7778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6680,7 +7792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6692,7 +7806,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -6704,7 +7820,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -6716,7 +7834,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6728,7 +7848,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6740,7 +7862,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6752,7 +7876,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6764,7 +7890,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6776,7 +7904,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6788,7 +7918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6800,7 +7932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6812,7 +7946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6824,7 +7960,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -6836,7 +7974,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -6848,7 +7988,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -6860,7 +8002,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -6872,7 +8016,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -6884,7 +8030,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -6896,7 +8044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6908,7 +8058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6920,7 +8072,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -6932,7 +8086,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -6944,7 +8100,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6956,7 +8114,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6968,7 +8128,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6980,7 +8142,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6992,7 +8156,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7004,7 +8170,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -7016,7 +8184,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7028,7 +8198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7040,7 +8212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7052,7 +8226,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7064,7 +8240,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -7076,7 +8254,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -7088,7 +8268,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -7100,7 +8282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7112,7 +8296,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7124,7 +8310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7136,7 +8324,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -7148,7 +8338,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -7160,7 +8352,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -7172,7 +8366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7184,7 +8380,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -7196,7 +8394,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 2842992040223b..aa1541412cb6aa 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
@@ -8,7 +8,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	}
 ]
\ 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 ea8d69f845fa08..910afdc82bd87b 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
@@ -8,7 +8,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "entity.name.function.preprocessor: #569CD6",
 			"light_vs": "entity.name.function.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function.preprocessor: #0F4A85"
+			"dark_plus_experimental": "entity.name.function.preprocessor: #569CD6",
+			"hc_light": "entity.name.function.preprocessor: #0F4A85",
+			"light_plus_experimental": "entity.name.function.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "entity.name.function.preprocessor: #569CD6",
 			"light_vs": "entity.name.function.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function.preprocessor: #0F4A85"
+			"dark_plus_experimental": "entity.name.function.preprocessor: #569CD6",
+			"hc_light": "entity.name.function.preprocessor: #0F4A85",
+			"light_plus_experimental": "entity.name.function.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "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 3563a6875e0c0a..042f4559315683 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
@@ -8,7 +8,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "entity.name.function.preprocessor: #569CD6",
 			"light_vs": "entity.name.function.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function.preprocessor: #0F4A85"
+			"dark_plus_experimental": "entity.name.function.preprocessor: #569CD6",
+			"hc_light": "entity.name.function.preprocessor: #0F4A85",
+			"light_plus_experimental": "entity.name.function.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "entity.name.function.preprocessor: #569CD6",
 			"light_vs": "entity.name.function.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function.preprocessor: #0F4A85"
+			"dark_plus_experimental": "entity.name.function.preprocessor: #569CD6",
+			"hc_light": "entity.name.function.preprocessor: #0F4A85",
+			"light_plus_experimental": "entity.name.function.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	}
 ]
\ 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 8f194e667bf098..f9648fb7a10433 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
@@ -8,7 +8,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	}
 ]
\ 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 4ec8289167ea38..0b4101aa160b7d 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
@@ -8,7 +8,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.comment.buffered.block.pug: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.comment.buffered.block.pug: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.comment.buffered.block.pug: #0F4A85",
+			"light_plus_experimental": "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 9539b2d2c3cf71..508fc2508aae45 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
@@ -8,7 +8,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 e2b4189dbc2f4a..4a05dba3edfcc1 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
@@ -8,7 +8,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "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 e792747ea22348..384ab0f8b35e9e 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
@@ -8,7 +8,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "entity.name.function.preprocessor: #569CD6",
 			"light_vs": "entity.name.function.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function.preprocessor: #0F4A85"
+			"dark_plus_experimental": "entity.name.function.preprocessor: #569CD6",
+			"hc_light": "entity.name.function.preprocessor: #0F4A85",
+			"light_plus_experimental": "entity.name.function.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "entity.name.scope-resolution: #4EC9B0",
-			"hc_light": "entity.name.scope-resolution: #185E73"
+			"dark_plus_experimental": "entity.name.scope-resolution: #4EC9B0",
+			"hc_light": "entity.name.scope-resolution: #185E73",
+			"light_plus_experimental": "entity.name.scope-resolution: #267F99"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "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 93dbc59e59c3b6..e7b9a0c7fbcade 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
@@ -8,7 +8,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.scope-resolution: #4EC9B0",
-			"hc_light": "entity.name.scope-resolution: #185E73"
+			"dark_plus_experimental": "entity.name.scope-resolution: #4EC9B0",
+			"hc_light": "entity.name.scope-resolution: #185E73",
+			"light_plus_experimental": "entity.name.scope-resolution: #267F99"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 68d125d472d21d..0475c7631e2418 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
@@ -8,7 +8,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 419443b11de55d..827764c694d878 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
@@ -8,7 +8,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-class.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-class.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 ee81512b5ca036..1578d167e72b43 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
@@ -8,7 +8,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-class.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-class.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 b22ea1d7793f75..529003d766728c 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
@@ -8,7 +8,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -476,19 +554,23 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
 		"c": "\"",
-		"t": "text.html.derivative meta.tag.inline.a.start.html meta.attribute.event-handler.blur.html meta.embedded.line.js string.quoted.double.html punctuation.definition.string.end.html source.js-ignored-vscode",
+		"t": "text.html.derivative meta.tag.inline.a.start.html meta.attribute.event-handler.blur.html meta.embedded.line.js string.quoted.double.html punctuation.definition.string.end.html source.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.html: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -560,19 +652,23 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
 		"c": "'",
-		"t": "text.html.derivative meta.tag.inline.a.start.html meta.attribute.event-handler.click.html meta.embedded.line.js string.quoted.single.html punctuation.definition.string.end.html source.js-ignored-vscode",
+		"t": "text.html.derivative meta.tag.inline.a.start.html meta.attribute.event-handler.click.html meta.embedded.line.js string.quoted.single.html punctuation.definition.string.end.html source.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.unquoted.html: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.unquoted.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.unquoted.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.unquoted.html: #0F4A85",
+			"light_plus_experimental": "string.unquoted.html: #0000FF"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -764,19 +890,23 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
 		"c": "\"",
-		"t": "text.html.derivative meta.tag.structure.div.start.html meta.attribute.style.html meta.embedded.line.css string.quoted.double.html punctuation.definition.string.end.html source.css-ignored-vscode",
+		"t": "text.html.derivative meta.tag.structure.div.start.html meta.attribute.style.html meta.embedded.line.css string.quoted.double.html punctuation.definition.string.end.html source.css",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -908,19 +1058,23 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
 		"c": "'",
-		"t": "text.html.derivative meta.tag.structure.div.start.html meta.attribute.style.html meta.embedded.line.css string.quoted.single.html punctuation.definition.string.end.html source.css-ignored-vscode",
+		"t": "text.html.derivative meta.tag.structure.div.start.html meta.attribute.style.html meta.embedded.line.css string.quoted.single.html punctuation.definition.string.end.html source.css",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.unquoted.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.unquoted.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.unquoted.html: #0F4A85",
+			"light_plus_experimental": "string.unquoted.html: #0000FF"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	}
 ]
\ 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 e2afd8c19d92ca..f0ecf0249e1741 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
@@ -8,7 +8,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	}
 ]
\ 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 3018568e86278a..a0dbd32ec6fd3d 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
@@ -8,7 +8,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "keyword.operator.new: #569CD6",
 			"light_vs": "keyword.operator.new: #0000FF",
 			"hc_black": "keyword.operator.new: #569CD6",
-			"hc_light": "keyword.operator.new: #0F4A85"
+			"dark_plus_experimental": "keyword.operator.new: #569CD6",
+			"hc_light": "keyword.operator.new: #0F4A85",
+			"light_plus_experimental": "keyword.operator.new: #0000FF"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 cd27c4b2e75108..3c34f987e49e9d 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
@@ -8,7 +8,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2168,7 +2528,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2180,7 +2542,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2192,7 +2556,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2204,7 +2570,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2216,7 +2584,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2228,7 +2598,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -2240,7 +2612,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2252,7 +2626,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2264,7 +2640,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2276,7 +2654,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2288,7 +2668,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2300,7 +2682,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2312,7 +2696,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2324,7 +2710,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2336,7 +2724,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2348,7 +2738,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2360,7 +2752,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2372,7 +2766,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2384,7 +2780,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2396,7 +2794,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2408,7 +2808,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2420,7 +2822,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2432,7 +2836,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2444,7 +2850,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2456,7 +2864,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2468,7 +2878,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2480,7 +2892,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2492,7 +2906,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2504,7 +2920,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2516,7 +2934,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2528,7 +2948,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2540,7 +2962,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2552,7 +2976,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2564,7 +2990,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2576,7 +3004,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2588,7 +3018,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2600,7 +3032,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2612,7 +3046,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2624,7 +3060,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2636,7 +3074,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2648,7 +3088,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2660,7 +3102,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2672,7 +3116,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2684,7 +3130,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2696,7 +3144,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2708,7 +3158,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2720,7 +3172,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2732,7 +3186,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2744,7 +3200,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2756,7 +3214,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2768,7 +3228,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2780,7 +3242,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2792,7 +3256,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2804,7 +3270,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2816,7 +3284,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2828,7 +3298,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -2840,7 +3312,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2852,7 +3326,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2864,7 +3340,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2876,7 +3354,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2888,7 +3368,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -2900,7 +3382,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2912,7 +3396,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2924,7 +3410,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2936,7 +3424,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2948,7 +3438,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2960,7 +3452,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2972,7 +3466,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2984,7 +3480,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2996,7 +3494,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3008,7 +3508,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3020,7 +3522,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -3032,7 +3536,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3044,7 +3550,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -3056,7 +3564,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3068,7 +3578,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3080,7 +3592,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3092,7 +3606,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -3104,7 +3620,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3116,7 +3634,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3128,7 +3648,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -3140,7 +3662,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3152,7 +3676,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3164,7 +3690,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3176,7 +3704,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -3188,7 +3718,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3200,7 +3732,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3212,7 +3746,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -3224,7 +3760,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3236,7 +3774,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable.other.constant: #02715D"
+			"dark_plus_experimental": "variable.other.constant: #4FC1FF",
+			"hc_light": "variable.other.constant: #02715D",
+			"light_plus_experimental": "variable.other.constant: #0070C1"
 		}
 	},
 	{
@@ -3248,7 +3788,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3260,7 +3802,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3272,7 +3816,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3284,7 +3830,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3296,7 +3844,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3308,7 +3858,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3320,7 +3872,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3332,7 +3886,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3344,7 +3900,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3356,7 +3914,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3368,7 +3928,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3380,7 +3942,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3392,7 +3956,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3404,7 +3970,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3416,7 +3984,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3428,7 +3998,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3440,7 +4012,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3452,7 +4026,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3464,7 +4040,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3476,7 +4054,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3488,7 +4068,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3500,7 +4082,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3512,7 +4096,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3524,7 +4110,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -3536,7 +4124,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3548,7 +4138,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3560,7 +4152,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3572,7 +4166,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3584,7 +4180,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3596,7 +4194,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3608,7 +4208,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3620,7 +4222,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3632,7 +4236,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3644,7 +4250,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -3656,7 +4264,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3668,7 +4278,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -3680,7 +4292,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3692,7 +4306,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3704,7 +4320,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 946d12d1861fb8..401e6d5eed4dc4 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
@@ -8,7 +8,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable.other.constant: #02715D"
+			"dark_plus_experimental": "variable.other.constant: #4FC1FF",
+			"hc_light": "variable.other.constant: #02715D",
+			"light_plus_experimental": "variable.other.constant: #0070C1"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "punctuation.definition.template-expression.begin: #569CD6",
 			"light_vs": "punctuation.definition.template-expression.begin: #0000FF",
 			"hc_black": "punctuation.definition.template-expression.begin: #569CD6",
-			"hc_light": "punctuation.definition.template-expression.begin: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.template-expression.begin: #569CD6",
+			"hc_light": "punctuation.definition.template-expression.begin: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.template-expression.begin: #0000FF"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "punctuation.definition.template-expression.end: #569CD6",
 			"light_vs": "punctuation.definition.template-expression.end: #0000FF",
 			"hc_black": "punctuation.definition.template-expression.end: #569CD6",
-			"hc_light": "punctuation.definition.template-expression.end: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.template-expression.end: #569CD6",
+			"hc_light": "punctuation.definition.template-expression.end: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.template-expression.end: #0000FF"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "punctuation.definition.template-expression.begin: #569CD6",
 			"light_vs": "punctuation.definition.template-expression.begin: #0000FF",
 			"hc_black": "punctuation.definition.template-expression.begin: #569CD6",
-			"hc_light": "punctuation.definition.template-expression.begin: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.template-expression.begin: #569CD6",
+			"hc_light": "punctuation.definition.template-expression.begin: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.template-expression.begin: #0000FF"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "punctuation.definition.template-expression.end: #569CD6",
 			"light_vs": "punctuation.definition.template-expression.end: #0000FF",
 			"hc_black": "punctuation.definition.template-expression.end: #569CD6",
-			"hc_light": "punctuation.definition.template-expression.end: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.template-expression.end: #569CD6",
+			"hc_light": "punctuation.definition.template-expression.end: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.template-expression.end: #0000FF"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 1c494336ceeb59..ff21ceeb57b030 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
@@ -8,7 +8,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 a57c35177add5f..1a395807ed0edd 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
@@ -8,7 +8,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 82d29cb81776ec..5829f7eaf7d305 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
@@ -8,7 +8,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 5152613d440b5f..8b455abb89c103 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
@@ -8,7 +8,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "keyword.operator.new: #569CD6",
 			"light_vs": "keyword.operator.new: #0000FF",
 			"hc_black": "keyword.operator.new: #569CD6",
-			"hc_light": "keyword.operator.new: #0F4A85"
+			"dark_plus_experimental": "keyword.operator.new: #569CD6",
+			"hc_light": "keyword.operator.new: #0F4A85",
+			"light_plus_experimental": "keyword.operator.new: #0000FF"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 be33af8cae2472..8133afd312b699 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
@@ -8,7 +8,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.other.inherited-class: #4EC9B0",
-			"hc_light": "entity.other.inherited-class: #185E73"
+			"dark_plus_experimental": "entity.other.inherited-class: #4EC9B0",
+			"hc_light": "entity.other.inherited-class: #185E73",
+			"light_plus_experimental": "entity.other.inherited-class: #267F99"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 22c86e82de85db..0cb35481f6d63c 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
@@ -8,7 +8,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 e05badae2cf07a..dfd94b23d87cd0 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
@@ -8,7 +8,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "punctuation.definition.group.regexp: #D16969"
+			"dark_plus_experimental": "punctuation.definition.group.regexp: #CE9178",
+			"hc_light": "punctuation.definition.group.regexp: #D16969",
+			"light_plus_experimental": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.character-class.regexp: #811F3F"
+			"dark_plus_experimental": "constant.character.character-class.regexp: #D16969",
+			"hc_light": "constant.character.character-class.regexp: #811F3F",
+			"light_plus_experimental": "constant.character.character-class.regexp: #811F3F"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator.quantifier.regexp: #000000"
+			"dark_plus_experimental": "keyword.operator.quantifier.regexp: #D7BA7D",
+			"hc_light": "keyword.operator.quantifier.regexp: #000000",
+			"light_plus_experimental": "keyword.operator.quantifier.regexp: #000000"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "punctuation.definition.group.regexp: #D16969"
+			"dark_plus_experimental": "punctuation.definition.group.regexp: #CE9178",
+			"hc_light": "punctuation.definition.group.regexp: #D16969",
+			"light_plus_experimental": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "punctuation.section.embedded: #569CD6",
 			"light_vs": "punctuation.section.embedded: #0000FF",
 			"hc_black": "punctuation.section.embedded: #569CD6",
-			"hc_light": "punctuation.section.embedded: #0F4A85"
+			"dark_plus_experimental": "punctuation.section.embedded: #569CD6",
+			"hc_light": "punctuation.section.embedded: #0F4A85",
+			"light_plus_experimental": "punctuation.section.embedded: #0000FF"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "source.coffee.embedded: #9CDCFE",
 			"light_vs": "source.coffee.embedded: #E50000",
 			"hc_black": "source.coffee.embedded: #D4D4D4",
-			"hc_light": "source.coffee.embedded: #264F78"
+			"dark_plus_experimental": "source.coffee.embedded: #9CDCFE",
+			"hc_light": "source.coffee.embedded: #264F78",
+			"light_plus_experimental": "source.coffee.embedded: #E50000"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "punctuation.section.embedded: #569CD6",
 			"light_vs": "punctuation.section.embedded: #0000FF",
 			"hc_black": "punctuation.section.embedded: #569CD6",
-			"hc_light": "punctuation.section.embedded: #0F4A85"
+			"dark_plus_experimental": "punctuation.section.embedded: #569CD6",
+			"hc_light": "punctuation.section.embedded: #0F4A85",
+			"light_plus_experimental": "punctuation.section.embedded: #0000FF"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	}
 ]
\ 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 1280ce172b2c3a..00b25c94638033 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
@@ -8,7 +8,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "punctuation.definition.template-expression.begin: #569CD6",
 			"light_vs": "punctuation.definition.template-expression.begin: #0000FF",
 			"hc_black": "punctuation.definition.template-expression.begin: #569CD6",
-			"hc_light": "punctuation.definition.template-expression.begin: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.template-expression.begin: #569CD6",
+			"hc_light": "punctuation.definition.template-expression.begin: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.template-expression.begin: #0000FF"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "punctuation.definition.template-expression.end: #569CD6",
 			"light_vs": "punctuation.definition.template-expression.end: #0000FF",
 			"hc_black": "punctuation.definition.template-expression.end: #569CD6",
-			"hc_light": "punctuation.definition.template-expression.end: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.template-expression.end: #569CD6",
+			"hc_light": "punctuation.definition.template-expression.end: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.template-expression.end: #0000FF"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "punctuation.definition.template-expression.begin: #569CD6",
 			"light_vs": "punctuation.definition.template-expression.begin: #0000FF",
 			"hc_black": "punctuation.definition.template-expression.begin: #569CD6",
-			"hc_light": "punctuation.definition.template-expression.begin: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.template-expression.begin: #569CD6",
+			"hc_light": "punctuation.definition.template-expression.begin: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.template-expression.begin: #0000FF"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "punctuation.definition.template-expression.end: #569CD6",
 			"light_vs": "punctuation.definition.template-expression.end: #0000FF",
 			"hc_black": "punctuation.definition.template-expression.end: #569CD6",
-			"hc_light": "punctuation.definition.template-expression.end: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.template-expression.end: #569CD6",
+			"hc_light": "punctuation.definition.template-expression.end: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.template-expression.end: #0000FF"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "punctuation.definition.template-expression.begin: #569CD6",
 			"light_vs": "punctuation.definition.template-expression.begin: #0000FF",
 			"hc_black": "punctuation.definition.template-expression.begin: #569CD6",
-			"hc_light": "punctuation.definition.template-expression.begin: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.template-expression.begin: #569CD6",
+			"hc_light": "punctuation.definition.template-expression.begin: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.template-expression.begin: #0000FF"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "punctuation.definition.template-expression.end: #569CD6",
 			"light_vs": "punctuation.definition.template-expression.end: #0000FF",
 			"hc_black": "punctuation.definition.template-expression.end: #569CD6",
-			"hc_light": "punctuation.definition.template-expression.end: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.template-expression.end: #569CD6",
+			"hc_light": "punctuation.definition.template-expression.end: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.template-expression.end: #0000FF"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 429f61f1a9a48f..459dd01710dfaf 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
@@ -8,7 +8,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 f2bb411df60a8c..4f3dc47f54b9c0 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
@@ -8,7 +8,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-class.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-class.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "variable.css: #9CDCFE",
 			"light_vs": "variable.css: #E50000",
 			"hc_black": "variable.css: #D4D4D4",
-			"hc_light": "variable.css: #264F78"
+			"dark_plus_experimental": "variable.css: #9CDCFE",
+			"hc_light": "variable.css: #264F78",
+			"light_plus_experimental": "variable.css: #E50000"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "variable.css: #9CDCFE",
 			"light_vs": "variable.css: #E50000",
 			"hc_black": "variable.css: #D4D4D4",
-			"hc_light": "variable.css: #264F78"
+			"dark_plus_experimental": "variable.css: #9CDCFE",
+			"hc_light": "variable.css: #264F78",
+			"light_plus_experimental": "variable.css: #E50000"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 6bd4c697614789..267f2e7bda31e1 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test2_pl.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test2_pl.json
@@ -8,7 +8,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2168,7 +2528,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2180,7 +2542,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2192,7 +2556,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2204,7 +2570,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2216,7 +2584,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2228,7 +2598,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2240,7 +2612,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2252,7 +2626,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2264,7 +2640,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2276,7 +2654,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2288,7 +2668,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2300,7 +2682,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2312,7 +2696,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2324,7 +2710,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2336,7 +2724,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2348,7 +2738,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2360,7 +2752,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -2372,7 +2766,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2384,7 +2780,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2396,7 +2794,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2408,7 +2808,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2420,7 +2822,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2432,7 +2836,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2444,7 +2850,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2456,7 +2864,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2468,7 +2878,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2480,7 +2892,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2492,7 +2906,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2504,7 +2920,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2516,7 +2934,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2528,7 +2948,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2540,7 +2962,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2552,7 +2976,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2564,7 +2990,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2576,7 +3004,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2588,7 +3018,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2600,7 +3032,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2612,7 +3046,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2624,7 +3060,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2636,7 +3074,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2648,7 +3088,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2660,7 +3102,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2672,7 +3116,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2684,7 +3130,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2696,7 +3144,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2708,7 +3158,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2720,7 +3172,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2732,7 +3186,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2744,7 +3200,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2756,7 +3214,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2768,7 +3228,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2780,7 +3242,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2792,7 +3256,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2804,7 +3270,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2816,7 +3284,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2828,7 +3298,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2840,7 +3312,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2852,7 +3326,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2864,7 +3340,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2876,7 +3354,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2888,7 +3368,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2900,7 +3382,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2912,7 +3396,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2924,7 +3410,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2936,7 +3424,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2948,7 +3438,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2960,7 +3452,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2972,7 +3466,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2984,7 +3480,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2996,7 +3494,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3008,7 +3508,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3020,7 +3522,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3032,7 +3536,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3044,7 +3550,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3056,7 +3564,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3068,7 +3578,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3080,7 +3592,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3092,7 +3606,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3104,7 +3620,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3116,7 +3634,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3128,7 +3648,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3140,7 +3662,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3152,7 +3676,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3164,7 +3690,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3176,7 +3704,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3188,7 +3718,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3200,7 +3732,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3212,7 +3746,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3224,7 +3760,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3236,7 +3774,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3248,7 +3788,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3260,7 +3802,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3272,7 +3816,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3284,7 +3830,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3296,7 +3844,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3308,7 +3858,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3320,7 +3872,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3332,7 +3886,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3344,7 +3900,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3356,7 +3914,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3368,7 +3928,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3380,7 +3942,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3392,7 +3956,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3404,7 +3970,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3416,7 +3984,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3428,7 +3998,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3440,7 +4012,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3452,7 +4026,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3464,7 +4040,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3476,7 +4054,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3488,7 +4068,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3500,7 +4082,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3512,7 +4096,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3524,7 +4110,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3536,7 +4124,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3548,7 +4138,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3560,7 +4152,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3572,7 +4166,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3584,7 +4180,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3596,7 +4194,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3608,7 +4208,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 a9ee86c5912f1b..ea384df5159ad7 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test6916_js.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test6916_js.json
@@ -8,7 +8,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 4414d7776bc5da..0261cb6a7e5495 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_bat.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_bat.json
@@ -8,7 +8,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	}
 ]
\ 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 5cce8c92d752f0..e9d4c0f2c9794e 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_bib.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_bib.json
@@ -8,7 +8,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	}
 ]
\ 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 df2c5f0b3f4b7d..7d1db607b7288f 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_c.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_c.json
@@ -8,7 +8,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "constant.other.placeholder: #001080"
+			"dark_plus_experimental": "constant.other.placeholder: #9CDCFE",
+			"hc_light": "constant.other.placeholder: #001080",
+			"light_plus_experimental": "constant.other.placeholder: #001080"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "constant.other.placeholder: #001080"
+			"dark_plus_experimental": "constant.other.placeholder: #9CDCFE",
+			"hc_light": "constant.other.placeholder: #001080",
+			"light_plus_experimental": "constant.other.placeholder: #001080"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "constant.other.placeholder: #001080"
+			"dark_plus_experimental": "constant.other.placeholder: #9CDCFE",
+			"hc_light": "constant.other.placeholder: #001080",
+			"light_plus_experimental": "constant.other.placeholder: #001080"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "constant.other.placeholder: #001080"
+			"dark_plus_experimental": "constant.other.placeholder: #9CDCFE",
+			"hc_light": "constant.other.placeholder: #001080",
+			"light_plus_experimental": "constant.other.placeholder: #001080"
 		}
 	},
 	{
@@ -2168,7 +2528,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2180,7 +2542,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "constant.other.placeholder: #001080"
+			"dark_plus_experimental": "constant.other.placeholder: #9CDCFE",
+			"hc_light": "constant.other.placeholder: #001080",
+			"light_plus_experimental": "constant.other.placeholder: #001080"
 		}
 	},
 	{
@@ -2192,7 +2556,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2204,7 +2570,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2216,7 +2584,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2228,7 +2598,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2240,7 +2612,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2252,7 +2626,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2264,7 +2640,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2276,7 +2654,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2288,7 +2668,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2300,7 +2682,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2312,7 +2696,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2324,7 +2710,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2336,7 +2724,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2348,7 +2738,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2360,7 +2752,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2372,7 +2766,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2384,7 +2780,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2396,7 +2794,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2408,7 +2808,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2420,7 +2822,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2432,7 +2836,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2444,7 +2850,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2456,7 +2864,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2468,7 +2878,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2480,7 +2892,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2492,7 +2906,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2504,7 +2920,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2516,7 +2934,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2528,7 +2948,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2540,7 +2962,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2552,7 +2976,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2564,7 +2990,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2576,7 +3004,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2588,7 +3018,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2600,7 +3032,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2612,7 +3046,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2624,7 +3060,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2636,7 +3074,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2648,7 +3088,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2660,7 +3102,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2672,7 +3116,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2684,7 +3130,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2696,7 +3144,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2708,7 +3158,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2720,7 +3172,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2732,7 +3186,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "constant.other.placeholder: #001080"
+			"dark_plus_experimental": "constant.other.placeholder: #9CDCFE",
+			"hc_light": "constant.other.placeholder: #001080",
+			"light_plus_experimental": "constant.other.placeholder: #001080"
 		}
 	},
 	{
@@ -2744,7 +3200,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2756,7 +3214,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "constant.other.placeholder: #001080"
+			"dark_plus_experimental": "constant.other.placeholder: #9CDCFE",
+			"hc_light": "constant.other.placeholder: #001080",
+			"light_plus_experimental": "constant.other.placeholder: #001080"
 		}
 	},
 	{
@@ -2768,7 +3228,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2780,7 +3242,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "constant.other.placeholder: #001080"
+			"dark_plus_experimental": "constant.other.placeholder: #9CDCFE",
+			"hc_light": "constant.other.placeholder: #001080",
+			"light_plus_experimental": "constant.other.placeholder: #001080"
 		}
 	},
 	{
@@ -2792,7 +3256,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2804,7 +3270,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "constant.other.placeholder: #001080"
+			"dark_plus_experimental": "constant.other.placeholder: #9CDCFE",
+			"hc_light": "constant.other.placeholder: #001080",
+			"light_plus_experimental": "constant.other.placeholder: #001080"
 		}
 	},
 	{
@@ -2816,7 +3284,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2828,7 +3298,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2840,7 +3312,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2852,7 +3326,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2864,7 +3340,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2876,7 +3354,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2888,7 +3368,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2900,7 +3382,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2912,7 +3396,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2924,7 +3410,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2936,7 +3424,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2948,7 +3438,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2960,7 +3452,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2972,7 +3466,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2984,7 +3480,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2996,7 +3494,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3008,7 +3508,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3020,7 +3522,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3032,7 +3536,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3044,7 +3550,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 64a7b53445e748..84389a01037518 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_cc.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_cc.json
@@ -8,7 +8,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "entity.name.function.preprocessor: #569CD6",
 			"light_vs": "entity.name.function.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function.preprocessor: #0F4A85"
+			"dark_plus_experimental": "entity.name.function.preprocessor: #569CD6",
+			"hc_light": "entity.name.function.preprocessor: #0F4A85",
+			"light_plus_experimental": "entity.name.function.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "constant.other.placeholder: #001080"
+			"dark_plus_experimental": "constant.other.placeholder: #9CDCFE",
+			"hc_light": "constant.other.placeholder: #001080",
+			"light_plus_experimental": "constant.other.placeholder: #001080"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "constant.other.placeholder: #001080"
+			"dark_plus_experimental": "constant.other.placeholder: #9CDCFE",
+			"hc_light": "constant.other.placeholder: #001080",
+			"light_plus_experimental": "constant.other.placeholder: #001080"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.scope-resolution: #4EC9B0",
-			"hc_light": "entity.name.scope-resolution: #185E73"
+			"dark_plus_experimental": "entity.name.scope-resolution: #4EC9B0",
+			"hc_light": "entity.name.scope-resolution: #185E73",
+			"light_plus_experimental": "entity.name.scope-resolution: #267F99"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "keyword.operator.new: #569CD6",
 			"light_vs": "keyword.operator.new: #0000FF",
 			"hc_black": "source.cpp keyword.operator.new: #C586C0",
-			"hc_light": "source.cpp keyword.operator.new: #B5200D"
+			"dark_plus_experimental": "source.cpp keyword.operator.new: #C586C0",
+			"hc_light": "source.cpp keyword.operator.new: #B5200D",
+			"light_plus_experimental": "source.cpp keyword.operator.new: #AF00DB"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "constant.other.placeholder: #001080"
+			"dark_plus_experimental": "constant.other.placeholder: #9CDCFE",
+			"hc_light": "constant.other.placeholder: #001080",
+			"light_plus_experimental": "constant.other.placeholder: #001080"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "constant.other.placeholder: #001080"
+			"dark_plus_experimental": "constant.other.placeholder: #9CDCFE",
+			"hc_light": "constant.other.placeholder: #001080",
+			"light_plus_experimental": "constant.other.placeholder: #001080"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "meta.embedded.assembly: #CE9178",
 			"light_vs": "meta.embedded.assembly: #A31515",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded.assembly: #0F4A85"
+			"dark_plus_experimental": "meta.embedded.assembly: #CE9178",
+			"hc_light": "meta.embedded.assembly: #0F4A85",
+			"light_plus_experimental": "meta.embedded.assembly: #A31515"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 0692f8af1ab490..46548fdf568ad1 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_clj.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_clj.json
@@ -8,7 +8,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "storage: #569CD6",
 			"light_vs": "storage: #0000FF",
 			"hc_black": "storage: #569CD6",
-			"hc_light": "storage: #0F4A85"
+			"dark_plus_experimental": "storage: #569CD6",
+			"hc_light": "storage: #0F4A85",
+			"light_plus_experimental": "storage: #0000FF"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2168,7 +2528,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2180,7 +2542,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2192,7 +2556,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2204,7 +2570,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2216,7 +2584,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2228,7 +2598,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2240,7 +2612,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2252,7 +2626,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2264,7 +2640,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2276,7 +2654,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2288,7 +2668,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2300,7 +2682,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2312,7 +2696,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2324,7 +2710,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2336,7 +2724,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2348,7 +2738,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2360,7 +2752,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2372,7 +2766,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2384,7 +2780,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2396,7 +2794,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2408,7 +2808,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2420,7 +2822,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2432,7 +2836,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2444,7 +2850,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2456,7 +2864,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2468,7 +2878,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2480,7 +2892,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2492,7 +2906,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2504,7 +2920,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2516,7 +2934,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2528,7 +2948,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2540,7 +2962,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2552,7 +2976,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2564,7 +2990,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2576,7 +3004,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2588,7 +3018,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2600,7 +3032,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2612,7 +3046,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2624,7 +3060,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2636,7 +3074,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2648,7 +3088,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2660,7 +3102,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2672,7 +3116,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2684,7 +3130,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2696,7 +3144,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2708,7 +3158,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2720,7 +3172,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2732,7 +3186,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2744,7 +3200,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2756,7 +3214,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2768,7 +3228,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2780,7 +3242,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2792,7 +3256,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2804,7 +3270,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2816,7 +3284,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2828,7 +3298,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2840,7 +3312,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2852,7 +3326,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2864,7 +3340,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2876,7 +3354,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2888,7 +3368,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2900,7 +3382,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2912,7 +3396,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2924,7 +3410,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2936,7 +3424,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2948,7 +3438,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2960,7 +3452,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2972,7 +3466,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2984,7 +3480,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2996,7 +3494,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3008,7 +3508,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3020,7 +3522,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3032,7 +3536,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3044,7 +3550,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -3056,7 +3564,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3068,7 +3578,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3080,7 +3592,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3092,7 +3606,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3104,7 +3620,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3116,7 +3634,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3128,7 +3648,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3140,7 +3662,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3152,7 +3676,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3164,7 +3690,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3176,7 +3704,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3188,7 +3718,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3200,7 +3732,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3212,7 +3746,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3224,7 +3760,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -3236,7 +3774,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3248,7 +3788,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3260,7 +3802,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3272,7 +3816,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3284,7 +3830,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3296,7 +3844,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3308,7 +3858,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3320,7 +3872,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3332,7 +3886,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3344,7 +3900,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3356,7 +3914,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3368,7 +3928,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3380,7 +3942,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3392,7 +3956,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3404,7 +3970,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3416,7 +3984,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -3428,7 +3998,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3440,7 +4012,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3452,7 +4026,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3464,7 +4040,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3476,7 +4054,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3488,7 +4068,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3500,7 +4082,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3512,7 +4096,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3524,7 +4110,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3536,7 +4124,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3548,7 +4138,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3560,7 +4152,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3572,7 +4166,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3584,7 +4180,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3596,7 +4194,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3608,7 +4208,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3620,7 +4222,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	}
 ]
\ 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 c173079cd2aa62..24ede72e2f3eee 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_coffee.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_coffee.json
@@ -8,7 +8,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "punctuation.section.embedded: #569CD6",
 			"light_vs": "punctuation.section.embedded: #0000FF",
 			"hc_black": "punctuation.section.embedded: #569CD6",
-			"hc_light": "punctuation.section.embedded: #0F4A85"
+			"dark_plus_experimental": "punctuation.section.embedded: #569CD6",
+			"hc_light": "punctuation.section.embedded: #0F4A85",
+			"light_plus_experimental": "punctuation.section.embedded: #0000FF"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "source.coffee.embedded: #9CDCFE",
 			"light_vs": "source.coffee.embedded: #E50000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "punctuation.section.embedded: #569CD6",
 			"light_vs": "punctuation.section.embedded: #0000FF",
 			"hc_black": "punctuation.section.embedded: #569CD6",
-			"hc_light": "punctuation.section.embedded: #0F4A85"
+			"dark_plus_experimental": "punctuation.section.embedded: #569CD6",
+			"hc_light": "punctuation.section.embedded: #0F4A85",
+			"light_plus_experimental": "punctuation.section.embedded: #0000FF"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.other.inherited-class: #4EC9B0",
-			"hc_light": "entity.other.inherited-class: #185E73"
+			"dark_plus_experimental": "entity.other.inherited-class: #4EC9B0",
+			"hc_light": "entity.other.inherited-class: #185E73",
+			"light_plus_experimental": "entity.other.inherited-class: #267F99"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "punctuation.section.embedded: #569CD6",
 			"light_vs": "punctuation.section.embedded: #0000FF",
 			"hc_black": "punctuation.section.embedded: #569CD6",
-			"hc_light": "punctuation.section.embedded: #0F4A85"
+			"dark_plus_experimental": "punctuation.section.embedded: #569CD6",
+			"hc_light": "punctuation.section.embedded: #0F4A85",
+			"light_plus_experimental": "punctuation.section.embedded: #0000FF"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "source.coffee.embedded: #9CDCFE",
 			"light_vs": "source.coffee.embedded: #E50000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "punctuation.section.embedded: #569CD6",
 			"light_vs": "punctuation.section.embedded: #0000FF",
 			"hc_black": "punctuation.section.embedded: #569CD6",
-			"hc_light": "punctuation.section.embedded: #0F4A85"
+			"dark_plus_experimental": "punctuation.section.embedded: #569CD6",
+			"hc_light": "punctuation.section.embedded: #0F4A85",
+			"light_plus_experimental": "punctuation.section.embedded: #0000FF"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "keyword.operator.new: #569CD6",
 			"light_vs": "keyword.operator.new: #0000FF",
 			"hc_black": "keyword.operator.new: #569CD6",
-			"hc_light": "keyword.operator.new: #0F4A85"
+			"dark_plus_experimental": "keyword.operator.new: #569CD6",
+			"hc_light": "keyword.operator.new: #0F4A85",
+			"light_plus_experimental": "keyword.operator.new: #0000FF"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "keyword.operator.new: #569CD6",
 			"light_vs": "keyword.operator.new: #0000FF",
 			"hc_black": "keyword.operator.new: #569CD6",
-			"hc_light": "keyword.operator.new: #0F4A85"
+			"dark_plus_experimental": "keyword.operator.new: #569CD6",
+			"hc_light": "keyword.operator.new: #0F4A85",
+			"light_plus_experimental": "keyword.operator.new: #0000FF"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "punctuation.definition.group.regexp: #D16969"
+			"dark_plus_experimental": "punctuation.definition.group.regexp: #CE9178",
+			"hc_light": "punctuation.definition.group.regexp: #D16969",
+			"light_plus_experimental": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.character-class.regexp: #811F3F"
+			"dark_plus_experimental": "constant.character.character-class.regexp: #D16969",
+			"hc_light": "constant.character.character-class.regexp: #811F3F",
+			"light_plus_experimental": "constant.character.character-class.regexp: #811F3F"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator.quantifier.regexp: #000000"
+			"dark_plus_experimental": "keyword.operator.quantifier.regexp: #D7BA7D",
+			"hc_light": "keyword.operator.quantifier.regexp: #000000",
+			"light_plus_experimental": "keyword.operator.quantifier.regexp: #000000"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "punctuation.definition.group.regexp: #D16969"
+			"dark_plus_experimental": "punctuation.definition.group.regexp: #CE9178",
+			"hc_light": "punctuation.definition.group.regexp: #D16969",
+			"light_plus_experimental": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "punctuation.definition.group.regexp: #D16969"
+			"dark_plus_experimental": "punctuation.definition.group.regexp: #CE9178",
+			"hc_light": "punctuation.definition.group.regexp: #D16969",
+			"light_plus_experimental": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.character-class.regexp: #811F3F"
+			"dark_plus_experimental": "constant.character.character-class.regexp: #D16969",
+			"hc_light": "constant.character.character-class.regexp: #811F3F",
+			"light_plus_experimental": "constant.character.character-class.regexp: #811F3F"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator.quantifier.regexp: #000000"
+			"dark_plus_experimental": "keyword.operator.quantifier.regexp: #D7BA7D",
+			"hc_light": "keyword.operator.quantifier.regexp: #000000",
+			"light_plus_experimental": "keyword.operator.quantifier.regexp: #000000"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "punctuation.definition.group.regexp: #D16969"
+			"dark_plus_experimental": "punctuation.definition.group.regexp: #CE9178",
+			"hc_light": "punctuation.definition.group.regexp: #D16969",
+			"light_plus_experimental": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control.anchor.regexp: #EE0000"
+			"dark_plus_experimental": "keyword.control.anchor.regexp: #DCDCAA",
+			"hc_light": "keyword.control.anchor.regexp: #EE0000",
+			"light_plus_experimental": "keyword.control.anchor.regexp: #EE0000"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	}
 ]
\ 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 1ac0418fd111ed..fbb4c113784fc7 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_cpp.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_cpp.json
@@ -8,7 +8,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword.other.using: #C586C0",
-			"hc_light": "keyword.other.using: #B5200D"
+			"dark_plus_experimental": "keyword.other.using: #C586C0",
+			"hc_light": "keyword.other.using: #B5200D",
+			"light_plus_experimental": "keyword.other.using: #AF00DB"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.namespace: #4EC9B0",
-			"hc_light": "entity.name.namespace: #185E73"
+			"dark_plus_experimental": "entity.name.namespace: #4EC9B0",
+			"hc_light": "entity.name.namespace: #185E73",
+			"light_plus_experimental": "entity.name.namespace: #267F99"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "entity.name.function.preprocessor: #569CD6",
 			"light_vs": "entity.name.function.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function.preprocessor: #0F4A85"
+			"dark_plus_experimental": "entity.name.function.preprocessor: #569CD6",
+			"hc_light": "entity.name.function.preprocessor: #0F4A85",
+			"light_plus_experimental": "entity.name.function.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.scope-resolution: #4EC9B0",
-			"hc_light": "entity.name.scope-resolution: #185E73"
+			"dark_plus_experimental": "entity.name.scope-resolution: #4EC9B0",
+			"hc_light": "entity.name.scope-resolution: #185E73",
+			"light_plus_experimental": "entity.name.scope-resolution: #267F99"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword.other.operator: #C586C0",
-			"hc_light": "keyword.other.operator: #B5200D"
+			"dark_plus_experimental": "keyword.other.operator: #C586C0",
+			"hc_light": "keyword.other.operator: #B5200D",
+			"light_plus_experimental": "keyword.other.operator: #AF00DB"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "entity.name.operator.custom-literal: #5E2CBC"
+			"dark_plus_experimental": "entity.name.operator.custom-literal: #DCDCAA",
+			"hc_light": "entity.name.operator.custom-literal: #5E2CBC",
+			"light_plus_experimental": "entity.name.operator.custom-literal: #795E26"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "entity.name.operator.custom-literal: #5E2CBC"
+			"dark_plus_experimental": "entity.name.operator.custom-literal: #DCDCAA",
+			"hc_light": "entity.name.operator.custom-literal: #5E2CBC",
+			"light_plus_experimental": "entity.name.operator.custom-literal: #795E26"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "entity.name.function.preprocessor: #569CD6",
 			"light_vs": "entity.name.function.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function.preprocessor: #0F4A85"
+			"dark_plus_experimental": "entity.name.function.preprocessor: #569CD6",
+			"hc_light": "entity.name.function.preprocessor: #0F4A85",
+			"light_plus_experimental": "entity.name.function.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "meta.embedded.assembly: #CE9178",
 			"light_vs": "meta.embedded.assembly: #A31515",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded.assembly: #0F4A85"
+			"dark_plus_experimental": "meta.embedded.assembly: #CE9178",
+			"hc_light": "meta.embedded.assembly: #0F4A85",
+			"light_plus_experimental": "meta.embedded.assembly: #A31515"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2168,7 +2528,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.scope-resolution: #4EC9B0",
-			"hc_light": "entity.name.scope-resolution: #185E73"
+			"dark_plus_experimental": "entity.name.scope-resolution: #4EC9B0",
+			"hc_light": "entity.name.scope-resolution: #185E73",
+			"light_plus_experimental": "entity.name.scope-resolution: #267F99"
 		}
 	},
 	{
@@ -2180,7 +2542,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2192,7 +2556,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2204,7 +2570,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2216,7 +2584,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2228,7 +2598,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2240,7 +2612,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2252,7 +2626,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2264,7 +2640,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2276,7 +2654,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2288,7 +2668,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2300,7 +2682,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2312,7 +2696,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2324,7 +2710,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2336,7 +2724,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2348,7 +2738,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2360,7 +2752,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2372,7 +2766,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2384,7 +2780,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2396,7 +2794,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2408,7 +2808,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2420,7 +2822,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2432,7 +2836,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2444,7 +2850,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2456,7 +2864,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2468,7 +2878,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2480,7 +2892,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2492,7 +2906,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2504,7 +2920,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2516,7 +2934,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2528,7 +2948,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -2540,7 +2962,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2552,7 +2976,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2564,7 +2990,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2576,7 +3004,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2588,7 +3018,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2600,7 +3032,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2612,7 +3046,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2624,7 +3060,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2636,7 +3074,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2648,7 +3088,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 ddca9c755477cb..e372a1af196fa1 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_cs.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_cs.json
@@ -8,7 +8,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword.other.using: #C586C0",
-			"hc_light": "keyword.other.using: #B5200D"
+			"dark_plus_experimental": "keyword.other.using: #C586C0",
+			"hc_light": "keyword.other.using: #B5200D",
+			"light_plus_experimental": "keyword.other.using: #AF00DB"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "entity.name.variable: #001080"
+			"dark_plus_experimental": "entity.name.variable: #9CDCFE",
+			"hc_light": "entity.name.variable: #001080",
+			"light_plus_experimental": "entity.name.variable: #001080"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "entity.name.variable: #001080"
+			"dark_plus_experimental": "entity.name.variable: #9CDCFE",
+			"hc_light": "entity.name.variable: #001080",
+			"light_plus_experimental": "entity.name.variable: #001080"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "entity.name.variable: #001080"
+			"dark_plus_experimental": "entity.name.variable: #9CDCFE",
+			"hc_light": "entity.name.variable: #001080",
+			"light_plus_experimental": "entity.name.variable: #001080"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "entity.name.variable: #001080"
+			"dark_plus_experimental": "entity.name.variable: #9CDCFE",
+			"hc_light": "entity.name.variable: #001080",
+			"light_plus_experimental": "entity.name.variable: #001080"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "entity.name.variable: #001080"
+			"dark_plus_experimental": "entity.name.variable: #9CDCFE",
+			"hc_light": "entity.name.variable: #001080",
+			"light_plus_experimental": "entity.name.variable: #001080"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "entity.name.variable: #001080"
+			"dark_plus_experimental": "entity.name.variable: #9CDCFE",
+			"hc_light": "entity.name.variable: #001080",
+			"light_plus_experimental": "entity.name.variable: #001080"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "entity.name.variable: #001080"
+			"dark_plus_experimental": "entity.name.variable: #9CDCFE",
+			"hc_light": "entity.name.variable: #001080",
+			"light_plus_experimental": "entity.name.variable: #001080"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2168,7 +2528,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -2180,7 +2542,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2192,7 +2556,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2204,7 +2570,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2216,7 +2584,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -2228,7 +2598,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2240,7 +2612,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2252,7 +2626,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2264,7 +2640,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2276,7 +2654,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2288,7 +2668,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2300,7 +2682,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2312,7 +2696,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2324,7 +2710,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 16e4237171669e..c2b234ace34ca7 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_cshtml.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_cshtml.json
@@ -8,7 +8,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "entity.name.variable: #001080"
+			"dark_plus_experimental": "entity.name.variable: #9CDCFE",
+			"hc_light": "entity.name.variable: #001080",
+			"light_plus_experimental": "entity.name.variable: #001080"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "entity.name.variable: #001080"
+			"dark_plus_experimental": "entity.name.variable: #9CDCFE",
+			"hc_light": "entity.name.variable: #001080",
+			"light_plus_experimental": "entity.name.variable: #001080"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "entity.name.variable: #001080"
+			"dark_plus_experimental": "entity.name.variable: #9CDCFE",
+			"hc_light": "entity.name.variable: #001080",
+			"light_plus_experimental": "entity.name.variable: #001080"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "entity.name.variable: #001080"
+			"dark_plus_experimental": "entity.name.variable: #9CDCFE",
+			"hc_light": "entity.name.variable: #001080",
+			"light_plus_experimental": "entity.name.variable: #001080"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2168,7 +2528,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2180,7 +2542,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2192,7 +2556,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2204,7 +2570,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2216,7 +2584,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2228,7 +2598,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2240,7 +2612,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2252,7 +2626,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2264,7 +2640,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2276,7 +2654,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2288,7 +2668,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2300,7 +2682,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2312,7 +2696,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2324,7 +2710,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2336,7 +2724,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2348,7 +2738,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2360,7 +2752,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2372,7 +2766,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2384,7 +2780,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2396,7 +2794,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2408,7 +2808,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2420,7 +2822,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2432,7 +2836,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2444,7 +2850,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2456,7 +2864,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2468,7 +2878,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2480,7 +2892,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2492,7 +2906,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2504,7 +2920,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2516,7 +2934,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2528,7 +2948,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2540,7 +2962,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2552,7 +2976,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2564,7 +2990,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2576,7 +3004,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2588,7 +3018,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2600,7 +3032,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2612,7 +3046,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2624,7 +3060,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2636,7 +3074,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2648,7 +3088,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2660,7 +3102,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2672,7 +3116,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2684,7 +3130,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2696,7 +3144,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2708,7 +3158,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2720,7 +3172,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2732,7 +3186,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2744,7 +3200,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2756,7 +3214,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2768,7 +3228,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2780,7 +3242,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2792,7 +3256,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2804,7 +3270,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2816,7 +3284,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2828,7 +3298,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2840,7 +3312,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2852,7 +3326,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2864,7 +3340,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2876,7 +3354,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2888,7 +3368,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2900,7 +3382,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2912,7 +3396,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2924,7 +3410,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2936,7 +3424,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2948,7 +3438,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2960,7 +3452,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2972,7 +3466,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2984,7 +3480,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2996,7 +3494,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3008,7 +3508,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3020,7 +3522,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3032,7 +3536,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3044,7 +3550,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3056,7 +3564,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3068,7 +3578,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -3080,7 +3592,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3092,7 +3606,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3104,7 +3620,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3116,7 +3634,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -3128,7 +3648,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3140,7 +3662,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3152,7 +3676,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -3164,7 +3690,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3176,7 +3704,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -3188,7 +3718,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3200,7 +3732,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3212,7 +3746,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3224,7 +3760,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3236,7 +3774,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3248,7 +3788,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -3260,7 +3802,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3272,7 +3816,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3284,7 +3830,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3296,7 +3844,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3308,7 +3858,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3320,7 +3872,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3332,7 +3886,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3344,7 +3900,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -3356,7 +3914,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3368,7 +3928,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3380,7 +3942,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3392,7 +3956,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -3404,7 +3970,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3416,7 +3984,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3428,7 +3998,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3440,7 +4012,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3452,7 +4026,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3464,7 +4040,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3476,7 +4054,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3488,7 +4068,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3500,7 +4082,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3512,7 +4096,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3524,7 +4110,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -3536,7 +4124,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3548,7 +4138,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3560,7 +4152,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3572,7 +4166,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3584,7 +4180,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -3596,7 +4194,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3608,7 +4208,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3620,7 +4222,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3632,7 +4236,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -3644,7 +4250,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3656,7 +4264,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3668,7 +4278,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3680,7 +4292,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3692,7 +4306,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3704,7 +4320,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3716,7 +4334,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3728,7 +4348,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3740,7 +4362,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3752,7 +4376,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3764,7 +4390,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -3776,7 +4404,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3788,7 +4418,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3800,7 +4432,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -3812,7 +4446,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3824,7 +4460,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3836,7 +4474,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -3848,7 +4488,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3860,7 +4502,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3872,7 +4516,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -3884,7 +4530,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "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 1d023e0aba344c..3b4539db3d6692 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_css.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_css.json
@@ -8,7 +8,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "invalid: #F44747",
 			"light_vs": "invalid: #CD3131",
 			"hc_black": "invalid: #F44747",
-			"hc_light": "invalid: #B5200D"
+			"dark_plus_experimental": "invalid: #F44747",
+			"hc_light": "invalid: #B5200D",
+			"light_plus_experimental": "invalid: #CD3131"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "invalid: #F44747",
 			"light_vs": "invalid: #CD3131",
 			"hc_black": "invalid: #F44747",
-			"hc_light": "invalid: #B5200D"
+			"dark_plus_experimental": "invalid: #F44747",
+			"hc_light": "invalid: #B5200D",
+			"light_plus_experimental": "invalid: #CD3131"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.font-name: #0451A5",
 			"hc_black": "support.constant.font-name: #CE9178",
-			"hc_light": "support.constant.font-name: #0451A5"
+			"dark_plus_experimental": "support.constant.font-name: #CE9178",
+			"hc_light": "support.constant.font-name: #0451A5",
+			"light_plus_experimental": "support.constant.font-name: #0451A5"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.font-name: #0451A5",
 			"hc_black": "support.constant.font-name: #CE9178",
-			"hc_light": "support.constant.font-name: #0451A5"
+			"dark_plus_experimental": "support.constant.font-name: #CE9178",
+			"hc_light": "support.constant.font-name: #0451A5",
+			"light_plus_experimental": "support.constant.font-name: #0451A5"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "invalid: #F44747",
 			"light_vs": "invalid: #CD3131",
 			"hc_black": "invalid: #F44747",
-			"hc_light": "invalid: #B5200D"
+			"dark_plus_experimental": "invalid: #F44747",
+			"hc_light": "invalid: #B5200D",
+			"light_plus_experimental": "invalid: #CD3131"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "invalid: #F44747",
 			"light_vs": "invalid: #CD3131",
 			"hc_black": "invalid: #F44747",
-			"hc_light": "invalid: #B5200D"
+			"dark_plus_experimental": "invalid: #F44747",
+			"hc_light": "invalid: #B5200D",
+			"light_plus_experimental": "invalid: #CD3131"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "invalid: #F44747",
 			"light_vs": "invalid: #CD3131",
 			"hc_black": "invalid: #F44747",
-			"hc_light": "invalid: #B5200D"
+			"dark_plus_experimental": "invalid: #F44747",
+			"hc_light": "invalid: #B5200D",
+			"light_plus_experimental": "invalid: #CD3131"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2168,7 +2528,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2180,7 +2542,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2192,7 +2556,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2204,7 +2570,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2216,7 +2584,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2228,7 +2598,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2240,7 +2612,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2252,7 +2626,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2264,7 +2640,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2276,7 +2654,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2288,7 +2668,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2300,7 +2682,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2312,7 +2696,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -2324,7 +2710,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2336,7 +2724,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2348,7 +2738,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2360,7 +2752,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2372,7 +2766,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2384,7 +2780,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2396,7 +2794,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2408,7 +2808,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2420,7 +2822,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2432,7 +2836,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2444,7 +2850,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2456,7 +2864,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2468,7 +2878,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2480,7 +2892,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2492,7 +2906,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2504,7 +2920,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2516,7 +2934,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2528,7 +2948,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2540,7 +2962,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2552,7 +2976,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2564,7 +2990,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -2576,7 +3004,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2588,7 +3018,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2600,7 +3032,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2612,7 +3046,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2624,7 +3060,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2636,7 +3074,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2648,7 +3088,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2660,7 +3102,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2672,7 +3116,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2684,7 +3130,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -2696,7 +3144,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2708,7 +3158,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -2720,7 +3172,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2732,7 +3186,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2744,7 +3200,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -2756,7 +3214,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2768,7 +3228,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.font-name: #0451A5",
 			"hc_black": "support.constant.font-name: #CE9178",
-			"hc_light": "support.constant.font-name: #0451A5"
+			"dark_plus_experimental": "support.constant.font-name: #CE9178",
+			"hc_light": "support.constant.font-name: #0451A5",
+			"light_plus_experimental": "support.constant.font-name: #0451A5"
 		}
 	},
 	{
@@ -2780,7 +3242,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2792,7 +3256,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2804,7 +3270,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.font-name: #0451A5",
 			"hc_black": "support.constant.font-name: #CE9178",
-			"hc_light": "support.constant.font-name: #0451A5"
+			"dark_plus_experimental": "support.constant.font-name: #CE9178",
+			"hc_light": "support.constant.font-name: #0451A5",
+			"light_plus_experimental": "support.constant.font-name: #0451A5"
 		}
 	},
 	{
@@ -2816,7 +3284,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2828,7 +3298,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2840,7 +3312,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2852,7 +3326,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2864,7 +3340,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2876,7 +3354,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2888,7 +3368,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -2900,7 +3382,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2912,7 +3396,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2924,7 +3410,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2936,7 +3424,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2948,7 +3438,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2960,7 +3452,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2972,7 +3466,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2984,7 +3480,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2996,7 +3494,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3008,7 +3508,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3020,7 +3522,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3032,7 +3536,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -3044,7 +3550,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -3056,7 +3564,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3068,7 +3578,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3080,7 +3592,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -3092,7 +3606,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-class.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000"
 		}
 	},
 	{
@@ -3104,7 +3620,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-class.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000"
 		}
 	},
 	{
@@ -3116,7 +3634,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3128,7 +3648,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3140,7 +3662,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3152,7 +3676,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3164,7 +3690,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3176,7 +3704,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3188,7 +3718,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -3200,7 +3732,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3212,7 +3746,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3224,7 +3760,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3236,7 +3774,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3248,7 +3788,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3260,7 +3802,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -3272,7 +3816,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3284,7 +3830,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3296,7 +3844,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3308,7 +3858,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3320,7 +3872,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3332,7 +3886,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -3344,7 +3900,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -3356,7 +3914,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3368,7 +3928,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3380,7 +3942,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -3392,7 +3956,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-class.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000"
 		}
 	},
 	{
@@ -3404,7 +3970,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-class.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000"
 		}
 	},
 	{
@@ -3416,7 +3984,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3428,7 +3998,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3440,7 +4012,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3452,7 +4026,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3464,7 +4040,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3476,7 +4054,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3488,7 +4068,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -3500,7 +4082,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3512,7 +4096,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3524,7 +4110,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3536,7 +4124,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3548,7 +4138,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3560,7 +4152,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -3572,7 +4166,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3584,7 +4180,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3596,7 +4194,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3608,7 +4208,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3620,7 +4222,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3632,7 +4236,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -3644,7 +4250,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -3656,7 +4264,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3668,7 +4278,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3680,7 +4292,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3692,7 +4306,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3704,7 +4320,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3716,7 +4334,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -3728,7 +4348,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3740,7 +4362,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3752,7 +4376,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -3764,7 +4390,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-class.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000"
 		}
 	},
 	{
@@ -3776,7 +4404,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-class.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000"
 		}
 	},
 	{
@@ -3788,7 +4418,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3800,7 +4432,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -3812,7 +4446,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-class.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000"
 		}
 	},
 	{
@@ -3824,7 +4460,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-class.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000"
 		}
 	},
 	{
@@ -3836,7 +4474,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3848,7 +4488,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -3860,7 +4502,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-class.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000"
 		}
 	},
 	{
@@ -3872,7 +4516,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-class.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000"
 		}
 	},
 	{
@@ -3884,7 +4530,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3896,7 +4544,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3908,7 +4558,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3920,7 +4572,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3932,7 +4586,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3944,7 +4600,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3956,7 +4614,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -3968,7 +4628,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3980,7 +4642,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3992,7 +4656,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4004,7 +4670,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4016,7 +4684,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4028,7 +4698,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -4040,7 +4712,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -4052,7 +4726,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4064,7 +4740,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4076,7 +4754,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -4088,7 +4768,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4100,7 +4782,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4112,7 +4796,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4124,7 +4810,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4136,7 +4824,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4148,7 +4838,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4160,7 +4852,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -4172,7 +4866,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4184,7 +4880,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4196,7 +4894,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4208,7 +4908,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4220,7 +4922,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4232,7 +4936,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -4244,7 +4950,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -4256,7 +4964,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4268,7 +4978,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4280,7 +4992,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4292,7 +5006,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4304,7 +5020,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4316,7 +5034,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4328,7 +5048,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -4340,7 +5062,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4352,7 +5076,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -4364,7 +5090,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4376,7 +5104,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4388,7 +5118,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -4400,7 +5132,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4412,7 +5146,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -4424,7 +5160,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4436,7 +5174,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -4448,7 +5188,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4460,7 +5202,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4472,7 +5216,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4484,7 +5230,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4496,7 +5244,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4508,7 +5258,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4520,7 +5272,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4532,7 +5286,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4544,7 +5300,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -4556,7 +5314,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4568,7 +5328,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4580,7 +5342,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4592,7 +5356,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4604,7 +5370,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -4616,7 +5384,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4628,7 +5398,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4640,7 +5412,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4652,7 +5426,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4664,7 +5440,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4676,7 +5454,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4688,7 +5468,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4700,7 +5482,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4712,7 +5496,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4724,7 +5510,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4736,7 +5524,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4748,7 +5538,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -4760,7 +5552,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4772,7 +5566,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4784,7 +5580,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -4796,7 +5594,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -4808,7 +5608,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4820,7 +5622,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4832,7 +5636,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4844,7 +5650,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4856,7 +5664,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4868,7 +5678,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4880,7 +5692,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4892,7 +5706,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -4904,7 +5720,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4916,7 +5734,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4928,7 +5748,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4940,7 +5762,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4952,7 +5776,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4964,7 +5790,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4976,7 +5804,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -4988,7 +5818,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5000,7 +5832,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5012,7 +5846,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -5024,7 +5860,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5036,7 +5874,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -5048,7 +5888,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5060,7 +5902,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5072,7 +5916,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5084,7 +5930,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5096,7 +5944,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5108,7 +5958,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5120,7 +5972,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -5132,7 +5986,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5144,7 +6000,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -5156,7 +6014,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5168,7 +6028,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -5180,7 +6042,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5192,7 +6056,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5204,7 +6070,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -5216,7 +6084,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5228,7 +6098,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -5240,7 +6112,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5252,7 +6126,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -5264,7 +6140,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5276,7 +6154,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5288,7 +6168,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5300,7 +6182,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5312,7 +6196,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5324,7 +6210,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5336,7 +6224,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -5348,7 +6238,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5360,7 +6252,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5372,7 +6266,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5384,7 +6280,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5396,7 +6294,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5408,7 +6308,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -5420,7 +6322,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5432,7 +6336,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5444,7 +6350,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5456,7 +6364,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5468,7 +6378,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5480,7 +6392,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5492,7 +6406,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -5504,7 +6420,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5516,7 +6434,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5528,7 +6448,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5540,7 +6462,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5552,7 +6476,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5564,7 +6490,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5576,7 +6504,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -5588,7 +6518,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5600,7 +6532,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5612,7 +6546,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5624,7 +6560,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5636,7 +6574,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5648,7 +6588,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -5660,7 +6602,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5672,7 +6616,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5684,7 +6630,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5696,7 +6644,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5708,7 +6658,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5720,7 +6672,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5732,7 +6686,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -5744,7 +6700,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5756,7 +6714,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5768,7 +6728,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5780,7 +6742,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5792,7 +6756,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5804,7 +6770,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -5816,7 +6784,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5828,7 +6798,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5840,7 +6812,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5852,7 +6826,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5864,7 +6840,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5876,7 +6854,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -5888,7 +6868,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5900,7 +6882,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5912,7 +6896,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -5924,7 +6910,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5936,7 +6924,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5948,7 +6938,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5960,7 +6952,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5972,7 +6966,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5984,7 +6980,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5996,7 +6994,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6008,7 +7008,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -6020,7 +7022,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6032,7 +7036,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6044,7 +7050,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -6056,7 +7064,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6068,7 +7078,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6080,7 +7092,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6092,7 +7106,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -6104,7 +7120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6116,7 +7134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6128,7 +7148,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -6140,7 +7162,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -6152,7 +7176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6164,7 +7190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6176,7 +7204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6188,7 +7218,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -6200,7 +7232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6212,7 +7246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6224,7 +7260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -6236,7 +7274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6248,7 +7288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6260,7 +7302,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -6272,7 +7316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6284,7 +7330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6296,7 +7344,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6308,7 +7358,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -6320,7 +7372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6332,7 +7386,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6344,7 +7400,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -6356,7 +7414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6368,7 +7428,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6380,7 +7442,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -6392,7 +7456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6404,7 +7470,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6416,7 +7484,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -6428,7 +7498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6440,7 +7512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6452,7 +7526,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -6464,7 +7540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6476,7 +7554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6488,7 +7568,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6500,7 +7582,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -6512,7 +7596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6524,7 +7610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6536,7 +7624,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -6548,7 +7638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6560,7 +7652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6572,7 +7666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -6584,7 +7680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6596,7 +7694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6608,7 +7708,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -6620,7 +7722,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -6632,7 +7736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6644,7 +7750,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -6656,7 +7764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6668,7 +7778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6680,7 +7792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6692,7 +7806,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -6704,7 +7820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6716,7 +7834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6728,7 +7848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -6740,7 +7862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6752,7 +7876,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6764,7 +7890,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -6776,7 +7904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6788,7 +7918,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6800,7 +7932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6812,7 +7946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.font-name: #0451A5",
 			"hc_black": "support.constant.font-name: #CE9178",
-			"hc_light": "support.constant.font-name: #0451A5"
+			"dark_plus_experimental": "support.constant.font-name: #CE9178",
+			"hc_light": "support.constant.font-name: #0451A5",
+			"light_plus_experimental": "support.constant.font-name: #0451A5"
 		}
 	},
 	{
@@ -6824,7 +7960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6836,7 +7974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6848,7 +7988,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -6860,7 +8002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6872,7 +8016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6884,7 +8030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -6896,7 +8044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6908,7 +8058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6920,7 +8072,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -6932,7 +8086,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -6944,7 +8100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6956,7 +8114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6968,7 +8128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6980,7 +8142,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -6992,7 +8156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7004,7 +8170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7016,7 +8184,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -7028,7 +8198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7040,7 +8212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7052,7 +8226,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -7064,7 +8240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7076,7 +8254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7088,7 +8268,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7100,7 +8282,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -7112,7 +8296,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7124,7 +8310,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7136,7 +8324,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -7148,7 +8338,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7160,7 +8352,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7172,7 +8366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7184,7 +8380,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7196,7 +8394,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -7208,7 +8408,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7220,7 +8422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7232,7 +8436,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -7244,7 +8450,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -7256,7 +8464,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7268,7 +8478,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7280,7 +8492,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7292,7 +8506,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -7304,7 +8520,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7316,7 +8534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7328,7 +8548,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7340,7 +8562,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -7352,7 +8576,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7364,7 +8590,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7376,7 +8604,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -7388,7 +8618,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7400,7 +8632,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7412,7 +8646,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7424,7 +8660,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -7436,7 +8674,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7448,7 +8688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7460,7 +8702,9 @@
 			"dark_vs": "entity.other.attribute-name.id.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.id.css: #800000",
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.id.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -7472,7 +8716,9 @@
 			"dark_vs": "entity.other.attribute-name.id.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.id.css: #800000",
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.id.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -7484,7 +8730,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7496,7 +8744,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7508,7 +8758,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7520,7 +8772,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -7532,7 +8786,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7544,7 +8800,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7556,7 +8814,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -7568,7 +8828,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7580,7 +8842,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -7592,7 +8856,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7604,7 +8870,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -7616,7 +8884,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-class.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000"
 		}
 	},
 	{
@@ -7628,7 +8898,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-class.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000"
 		}
 	},
 	{
@@ -7640,7 +8912,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7652,7 +8926,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -7664,7 +8940,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7676,7 +8954,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -7688,7 +8968,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-class.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000"
 		}
 	},
 	{
@@ -7700,7 +8982,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-class.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000"
 		}
 	},
 	{
@@ -7712,7 +8996,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7724,7 +9010,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7736,7 +9024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7748,7 +9038,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -7760,7 +9052,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7772,7 +9066,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7784,7 +9080,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7796,7 +9094,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -7808,7 +9108,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7820,7 +9122,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7832,7 +9136,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -7844,7 +9150,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -7856,7 +9164,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7868,7 +9178,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7880,7 +9192,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7892,7 +9206,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -7904,7 +9220,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7916,7 +9234,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7928,7 +9248,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7940,7 +9262,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -7952,7 +9276,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7964,7 +9290,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7976,7 +9304,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -7988,7 +9318,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8000,7 +9332,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8012,7 +9346,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -8024,7 +9360,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8036,7 +9374,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8048,7 +9388,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8060,7 +9402,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8072,7 +9416,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8084,7 +9430,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8096,7 +9444,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8108,7 +9458,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8120,7 +9472,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8132,7 +9486,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8144,7 +9500,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8156,7 +9514,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8168,7 +9528,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8180,7 +9542,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8192,7 +9556,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -8204,7 +9570,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -8216,7 +9584,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8228,7 +9598,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -8240,7 +9612,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -8252,7 +9626,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8264,7 +9640,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8276,7 +9654,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8288,7 +9668,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8300,7 +9682,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8312,7 +9696,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8324,7 +9710,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8336,7 +9724,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -8348,7 +9738,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8360,7 +9752,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.font-name: #0451A5",
 			"hc_black": "support.constant.font-name: #CE9178",
-			"hc_light": "support.constant.font-name: #0451A5"
+			"dark_plus_experimental": "support.constant.font-name: #CE9178",
+			"hc_light": "support.constant.font-name: #0451A5",
+			"light_plus_experimental": "support.constant.font-name: #0451A5"
 		}
 	},
 	{
@@ -8372,7 +9766,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8384,7 +9780,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8396,7 +9794,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.font-name: #0451A5",
 			"hc_black": "support.constant.font-name: #CE9178",
-			"hc_light": "support.constant.font-name: #0451A5"
+			"dark_plus_experimental": "support.constant.font-name: #CE9178",
+			"hc_light": "support.constant.font-name: #0451A5",
+			"light_plus_experimental": "support.constant.font-name: #0451A5"
 		}
 	},
 	{
@@ -8408,7 +9808,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8420,7 +9822,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8432,7 +9836,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8444,7 +9850,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8456,7 +9864,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8468,7 +9878,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -8480,7 +9892,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8492,7 +9906,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -8504,7 +9920,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8516,7 +9934,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -8528,7 +9948,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8540,7 +9962,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8552,7 +9976,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -8564,7 +9990,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8576,7 +10004,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -8588,7 +10018,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8600,7 +10032,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -8612,7 +10046,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8624,7 +10060,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8636,7 +10074,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8648,7 +10088,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8660,7 +10102,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8672,7 +10116,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8684,7 +10130,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -8696,7 +10144,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8708,7 +10158,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8720,7 +10172,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8732,7 +10186,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8744,7 +10200,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8756,7 +10214,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8768,7 +10228,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -8780,7 +10242,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8792,7 +10256,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8804,7 +10270,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8816,7 +10284,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8828,7 +10298,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8840,7 +10312,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8852,7 +10326,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -8864,7 +10340,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8876,7 +10354,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8888,7 +10368,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -8900,7 +10382,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -8912,7 +10396,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8924,7 +10410,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -8936,7 +10424,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8948,7 +10438,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -8960,7 +10452,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-class.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000"
 		}
 	},
 	{
@@ -8972,7 +10466,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-class.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000"
 		}
 	},
 	{
@@ -8984,7 +10480,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8996,7 +10494,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9008,7 +10508,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9020,7 +10522,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -9032,7 +10536,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9044,7 +10550,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9056,7 +10564,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -9068,7 +10578,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -9080,7 +10592,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9092,7 +10606,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9104,7 +10620,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -9116,7 +10634,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -9128,7 +10648,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9140,7 +10662,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -9152,7 +10676,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9164,7 +10690,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -9176,7 +10704,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-class.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000"
 		}
 	},
 	{
@@ -9188,7 +10718,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-class.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000"
 		}
 	},
 	{
@@ -9200,7 +10732,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9212,7 +10746,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9224,7 +10760,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9236,7 +10774,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -9248,7 +10788,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9260,7 +10802,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9272,7 +10816,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -9284,7 +10830,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -9296,7 +10844,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -9308,7 +10858,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9320,7 +10872,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9332,7 +10886,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -9344,7 +10900,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -9356,7 +10914,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9368,7 +10928,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9380,7 +10942,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9392,7 +10956,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -9404,7 +10970,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9416,7 +10984,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9428,7 +10998,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -9440,7 +11012,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9452,7 +11026,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -9464,7 +11040,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9476,7 +11054,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9488,7 +11068,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9500,7 +11082,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9512,7 +11096,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -9524,7 +11110,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9536,7 +11124,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -9548,7 +11138,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9560,7 +11152,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -9572,7 +11166,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9584,7 +11180,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9596,7 +11194,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -9608,7 +11208,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9620,7 +11222,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9632,7 +11236,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -9644,7 +11250,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9656,7 +11264,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9668,7 +11278,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -9680,7 +11292,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9692,7 +11306,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9704,7 +11320,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9716,7 +11334,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -9728,7 +11348,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9740,7 +11362,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9752,7 +11376,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -9764,7 +11390,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9776,7 +11404,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9788,7 +11418,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9800,7 +11432,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9812,7 +11446,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9824,7 +11460,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -9836,7 +11474,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9848,7 +11488,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9860,7 +11502,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9872,7 +11516,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -9884,7 +11530,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9896,7 +11544,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9908,7 +11558,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -9920,7 +11572,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9932,7 +11586,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9944,7 +11600,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9956,7 +11614,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -9968,7 +11628,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9980,7 +11642,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 7ba670c9e47348..3a6ce95a04be2c 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_cu.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_cu.json
@@ -8,7 +8,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "entity.name.function.preprocessor: #569CD6",
 			"light_vs": "entity.name.function.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function.preprocessor: #0F4A85"
+			"dark_plus_experimental": "entity.name.function.preprocessor: #569CD6",
+			"hc_light": "entity.name.function.preprocessor: #0F4A85",
+			"light_plus_experimental": "entity.name.function.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "entity.name.function.preprocessor: #569CD6",
 			"light_vs": "entity.name.function.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function.preprocessor: #0F4A85"
+			"dark_plus_experimental": "entity.name.function.preprocessor: #569CD6",
+			"hc_light": "entity.name.function.preprocessor: #0F4A85",
+			"light_plus_experimental": "entity.name.function.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "entity.name.function.preprocessor: #569CD6",
 			"light_vs": "entity.name.function.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function.preprocessor: #0F4A85"
+			"dark_plus_experimental": "entity.name.function.preprocessor: #569CD6",
+			"hc_light": "entity.name.function.preprocessor: #0F4A85",
+			"light_plus_experimental": "entity.name.function.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "constant.other.placeholder: #001080"
+			"dark_plus_experimental": "constant.other.placeholder: #9CDCFE",
+			"hc_light": "constant.other.placeholder: #001080",
+			"light_plus_experimental": "constant.other.placeholder: #001080"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "constant.other.placeholder: #001080"
+			"dark_plus_experimental": "constant.other.placeholder: #9CDCFE",
+			"hc_light": "constant.other.placeholder: #001080",
+			"light_plus_experimental": "constant.other.placeholder: #001080"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "constant.other.placeholder: #001080"
+			"dark_plus_experimental": "constant.other.placeholder: #9CDCFE",
+			"hc_light": "constant.other.placeholder: #001080",
+			"light_plus_experimental": "constant.other.placeholder: #001080"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "entity.name.function.preprocessor: #569CD6",
 			"light_vs": "entity.name.function.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function.preprocessor: #0F4A85"
+			"dark_plus_experimental": "entity.name.function.preprocessor: #569CD6",
+			"hc_light": "entity.name.function.preprocessor: #0F4A85",
+			"light_plus_experimental": "entity.name.function.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "constant.other.placeholder: #001080"
+			"dark_plus_experimental": "constant.other.placeholder: #9CDCFE",
+			"hc_light": "constant.other.placeholder: #001080",
+			"light_plus_experimental": "constant.other.placeholder: #001080"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "constant.other.placeholder: #001080"
+			"dark_plus_experimental": "constant.other.placeholder: #9CDCFE",
+			"hc_light": "constant.other.placeholder: #001080",
+			"light_plus_experimental": "constant.other.placeholder: #001080"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "constant.other.placeholder: #001080"
+			"dark_plus_experimental": "constant.other.placeholder: #9CDCFE",
+			"hc_light": "constant.other.placeholder: #001080",
+			"light_plus_experimental": "constant.other.placeholder: #001080"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "constant.other.placeholder: #001080"
+			"dark_plus_experimental": "constant.other.placeholder: #9CDCFE",
+			"hc_light": "constant.other.placeholder: #001080",
+			"light_plus_experimental": "constant.other.placeholder: #001080"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2168,7 +2528,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2180,7 +2542,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2192,7 +2556,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2204,7 +2570,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2216,7 +2584,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2228,7 +2598,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2240,7 +2612,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2252,7 +2626,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2264,7 +2640,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2276,7 +2654,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -2288,7 +2668,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2300,7 +2682,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2312,7 +2696,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2324,7 +2710,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2336,7 +2724,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2348,7 +2738,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2360,7 +2752,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2372,7 +2766,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -2384,7 +2780,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2396,7 +2794,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2408,7 +2808,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2420,7 +2822,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -2432,7 +2836,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2444,7 +2850,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2456,7 +2864,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2468,7 +2878,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2480,7 +2892,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2492,7 +2906,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2504,7 +2920,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2516,7 +2934,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2528,7 +2948,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2540,7 +2962,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2552,7 +2976,9 @@
 			"dark_vs": "entity.name.function.preprocessor: #569CD6",
 			"light_vs": "entity.name.function.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function.preprocessor: #0F4A85"
+			"dark_plus_experimental": "entity.name.function.preprocessor: #569CD6",
+			"hc_light": "entity.name.function.preprocessor: #0F4A85",
+			"light_plus_experimental": "entity.name.function.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2564,7 +2990,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2576,7 +3004,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2588,7 +3018,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2600,7 +3032,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2612,7 +3046,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2624,7 +3060,9 @@
 			"dark_vs": "keyword.operator.sizeof: #569CD6",
 			"light_vs": "keyword.operator.sizeof: #0000FF",
 			"hc_black": "keyword.operator.sizeof: #569CD6",
-			"hc_light": "keyword.operator.sizeof: #0F4A85"
+			"dark_plus_experimental": "keyword.operator.sizeof: #569CD6",
+			"hc_light": "keyword.operator.sizeof: #0F4A85",
+			"light_plus_experimental": "keyword.operator.sizeof: #0000FF"
 		}
 	},
 	{
@@ -2636,7 +3074,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2648,7 +3088,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2660,7 +3102,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2672,7 +3116,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2684,7 +3130,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2696,7 +3144,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2708,7 +3158,9 @@
 			"dark_vs": "keyword.operator.sizeof: #569CD6",
 			"light_vs": "keyword.operator.sizeof: #0000FF",
 			"hc_black": "keyword.operator.sizeof: #569CD6",
-			"hc_light": "keyword.operator.sizeof: #0F4A85"
+			"dark_plus_experimental": "keyword.operator.sizeof: #569CD6",
+			"hc_light": "keyword.operator.sizeof: #0F4A85",
+			"light_plus_experimental": "keyword.operator.sizeof: #0000FF"
 		}
 	},
 	{
@@ -2720,7 +3172,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2732,7 +3186,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2744,7 +3200,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2756,7 +3214,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2768,7 +3228,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2780,7 +3242,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2792,7 +3256,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2804,7 +3270,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -2816,7 +3284,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2828,7 +3298,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2840,7 +3312,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2852,7 +3326,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2864,7 +3340,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2876,7 +3354,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2888,7 +3368,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2900,7 +3382,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2912,7 +3396,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2924,7 +3410,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2936,7 +3424,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2948,7 +3438,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -2960,7 +3452,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2972,7 +3466,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2984,7 +3480,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2996,7 +3494,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3008,7 +3508,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3020,7 +3522,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3032,7 +3536,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3044,7 +3550,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -3056,7 +3564,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3068,7 +3578,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -3080,7 +3592,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3092,7 +3606,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -3104,7 +3620,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3116,7 +3634,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3128,7 +3648,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -3140,7 +3662,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3152,7 +3676,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -3164,7 +3690,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3176,7 +3704,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3188,7 +3718,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -3200,7 +3732,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3212,7 +3746,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3224,7 +3760,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3236,7 +3774,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -3248,7 +3788,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3260,7 +3802,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3272,7 +3816,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3284,7 +3830,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -3296,7 +3844,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3308,7 +3858,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3320,7 +3872,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3332,7 +3886,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -3344,7 +3900,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3356,7 +3914,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3368,7 +3928,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3380,7 +3942,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3392,7 +3956,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3404,7 +3970,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3416,7 +3984,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3428,7 +3998,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -3440,7 +4012,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3452,7 +4026,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -3464,7 +4040,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3476,7 +4054,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -3488,7 +4068,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3500,7 +4082,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3512,7 +4096,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3524,7 +4110,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3536,7 +4124,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3548,7 +4138,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3560,7 +4152,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3572,7 +4166,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -3584,7 +4180,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3596,7 +4194,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3608,7 +4208,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3620,7 +4222,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3632,7 +4236,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3644,7 +4250,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3656,7 +4264,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3668,7 +4278,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -3680,7 +4292,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3692,7 +4306,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3704,7 +4320,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3716,7 +4334,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -3728,7 +4348,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3740,7 +4362,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3752,7 +4376,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3764,7 +4390,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -3776,7 +4404,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3788,7 +4418,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3800,7 +4432,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3812,7 +4446,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3824,7 +4460,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3836,7 +4474,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3848,7 +4488,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3860,7 +4502,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3872,7 +4516,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3884,7 +4530,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3896,7 +4544,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3908,7 +4558,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -3920,7 +4572,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3932,7 +4586,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3944,7 +4600,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3956,7 +4614,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3968,7 +4628,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3980,7 +4642,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3992,7 +4656,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4004,7 +4670,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -4016,7 +4684,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4028,7 +4698,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4040,7 +4712,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4052,7 +4726,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4064,7 +4740,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -4076,7 +4754,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4088,7 +4768,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -4100,7 +4782,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4112,7 +4796,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -4124,7 +4810,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4136,7 +4824,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -4148,7 +4838,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -4160,7 +4852,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4172,7 +4866,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -4184,7 +4880,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4196,7 +4894,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4208,7 +4908,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -4220,7 +4922,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4232,7 +4936,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -4244,7 +4950,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -4256,7 +4964,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4268,7 +4978,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4280,7 +4992,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4292,7 +5006,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -4304,7 +5020,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4316,7 +5034,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4328,7 +5048,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4340,7 +5062,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -4352,7 +5076,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4364,7 +5090,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4376,7 +5104,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4388,7 +5118,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4400,7 +5132,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4412,7 +5146,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -4424,7 +5160,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4436,7 +5174,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4448,7 +5188,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4460,7 +5202,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4472,7 +5216,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4484,7 +5230,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4496,7 +5244,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4508,7 +5258,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4520,7 +5272,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4532,7 +5286,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4544,7 +5300,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4556,7 +5314,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -4568,7 +5328,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4580,7 +5342,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4592,7 +5356,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4604,7 +5370,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4616,7 +5384,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4628,7 +5398,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4640,7 +5412,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4652,7 +5426,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4664,7 +5440,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -4676,7 +5454,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4688,7 +5468,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -4700,7 +5482,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4712,7 +5496,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -4724,7 +5510,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4736,7 +5524,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -4748,7 +5538,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4760,7 +5552,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4772,7 +5566,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4784,7 +5580,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4796,7 +5594,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4808,7 +5608,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4820,7 +5622,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4832,7 +5636,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -4844,7 +5650,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4856,7 +5664,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -4868,7 +5678,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4880,7 +5692,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -4892,7 +5706,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4904,7 +5720,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -4916,7 +5734,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4928,7 +5748,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4940,7 +5762,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4952,7 +5776,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4964,7 +5790,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4976,7 +5804,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -4988,7 +5818,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5000,7 +5832,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -5012,7 +5846,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5024,7 +5860,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5036,7 +5874,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5048,7 +5888,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5060,7 +5902,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5072,7 +5916,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5084,7 +5930,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5096,7 +5944,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5108,7 +5958,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -5120,7 +5972,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5132,7 +5986,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -5144,7 +6000,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5156,7 +6014,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -5168,7 +6028,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5180,7 +6042,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5192,7 +6056,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5204,7 +6070,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5216,7 +6084,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5228,7 +6098,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5240,7 +6112,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5252,7 +6126,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5264,7 +6140,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5276,7 +6154,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5288,7 +6168,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -5300,7 +6182,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5312,7 +6196,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -5324,7 +6210,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5336,7 +6224,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5348,7 +6238,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5360,7 +6252,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5372,7 +6266,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5384,7 +6280,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5396,7 +6294,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5408,7 +6308,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5420,7 +6322,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5432,7 +6336,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5444,7 +6350,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -5456,7 +6364,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5468,7 +6378,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -5480,7 +6392,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5492,7 +6406,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5504,7 +6420,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5516,7 +6434,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5528,7 +6448,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5540,7 +6462,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5552,7 +6476,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5564,7 +6490,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5576,7 +6504,9 @@
 			"dark_vs": "keyword.operator.sizeof: #569CD6",
 			"light_vs": "keyword.operator.sizeof: #0000FF",
 			"hc_black": "keyword.operator.sizeof: #569CD6",
-			"hc_light": "keyword.operator.sizeof: #0F4A85"
+			"dark_plus_experimental": "keyword.operator.sizeof: #569CD6",
+			"hc_light": "keyword.operator.sizeof: #0F4A85",
+			"light_plus_experimental": "keyword.operator.sizeof: #0000FF"
 		}
 	},
 	{
@@ -5588,7 +6518,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5600,7 +6532,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -5612,7 +6546,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5624,7 +6560,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -5636,7 +6574,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5648,7 +6588,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5660,7 +6602,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5672,7 +6616,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5684,7 +6630,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5696,7 +6644,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5708,7 +6658,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5720,7 +6672,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5732,7 +6686,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5744,7 +6700,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5756,7 +6714,9 @@
 			"dark_vs": "keyword.operator.cast: #569CD6",
 			"light_vs": "keyword.operator.cast: #0000FF",
 			"hc_black": "keyword.operator.cast: #569CD6",
-			"hc_light": "keyword.operator.cast: #0F4A85"
+			"dark_plus_experimental": "keyword.operator.cast: #569CD6",
+			"hc_light": "keyword.operator.cast: #0F4A85",
+			"light_plus_experimental": "keyword.operator.cast: #0000FF"
 		}
 	},
 	{
@@ -5768,7 +6728,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5780,7 +6742,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5792,7 +6756,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5804,7 +6770,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5816,7 +6784,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5828,7 +6798,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -5840,7 +6812,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5852,7 +6826,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -5864,7 +6840,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5876,7 +6854,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5888,7 +6868,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5900,7 +6882,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5912,7 +6896,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5924,7 +6910,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5936,7 +6924,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5948,7 +6938,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -5960,7 +6952,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -5972,7 +6966,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -5984,7 +6980,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5996,7 +6994,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6008,7 +7008,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6020,7 +7022,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6032,7 +7036,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -6044,7 +7050,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6056,7 +7064,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6068,7 +7078,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6080,7 +7092,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6092,7 +7106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -6104,7 +7120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6116,7 +7134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6128,7 +7148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6140,7 +7162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6152,7 +7176,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6164,7 +7190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6176,7 +7204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6188,7 +7218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6200,7 +7232,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -6212,7 +7246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6224,7 +7260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -6236,7 +7274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6248,7 +7288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6260,7 +7302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6272,7 +7316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6284,7 +7330,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -6296,7 +7344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6308,7 +7358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6320,7 +7372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6332,7 +7386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -6344,7 +7400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6356,7 +7414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -6368,7 +7428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6380,7 +7442,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6392,7 +7456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6404,7 +7470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6416,7 +7484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6428,7 +7498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6440,7 +7512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -6452,7 +7526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6464,7 +7540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6476,7 +7554,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6488,7 +7568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6500,7 +7582,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6512,7 +7596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6524,7 +7610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6536,7 +7624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6548,7 +7638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -6560,7 +7652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6572,7 +7666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -6584,7 +7680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6596,7 +7694,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6608,7 +7708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6620,7 +7722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6632,7 +7736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6644,7 +7750,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6656,7 +7764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6668,7 +7778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6680,7 +7792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6692,7 +7806,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -6704,7 +7820,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6716,7 +7834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6728,7 +7848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6740,7 +7862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6752,7 +7876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -6764,7 +7890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6776,7 +7904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -6788,7 +7918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6800,7 +7932,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6812,7 +7946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6824,7 +7960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6836,7 +7974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6848,7 +7988,9 @@
 			"dark_vs": "keyword.operator.sizeof: #569CD6",
 			"light_vs": "keyword.operator.sizeof: #0000FF",
 			"hc_black": "keyword.operator.sizeof: #569CD6",
-			"hc_light": "keyword.operator.sizeof: #0F4A85"
+			"dark_plus_experimental": "keyword.operator.sizeof: #569CD6",
+			"hc_light": "keyword.operator.sizeof: #0F4A85",
+			"light_plus_experimental": "keyword.operator.sizeof: #0000FF"
 		}
 	},
 	{
@@ -6860,7 +8002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6872,7 +8016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6884,7 +8030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6896,7 +8044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6908,7 +8058,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6920,7 +8072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6932,7 +8086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6944,7 +8100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6956,7 +8114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6968,7 +8128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -6980,7 +8142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6992,7 +8156,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7004,7 +8170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7016,7 +8184,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7028,7 +8198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7040,7 +8212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7052,7 +8226,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -7064,7 +8240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7076,7 +8254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7088,7 +8268,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -7100,7 +8282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7112,7 +8296,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7124,7 +8310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7136,7 +8324,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7148,7 +8338,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7160,7 +8352,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7172,7 +8366,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7184,7 +8380,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7196,7 +8394,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7208,7 +8408,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7220,7 +8422,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7232,7 +8436,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7244,7 +8450,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7256,7 +8464,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7268,7 +8478,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7280,7 +8492,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -7292,7 +8506,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7304,7 +8520,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7316,7 +8534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7328,7 +8548,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7340,7 +8562,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -7352,7 +8576,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7364,7 +8590,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -7376,7 +8604,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7388,7 +8618,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -7400,7 +8632,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7412,7 +8646,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7424,7 +8660,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7436,7 +8674,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7448,7 +8688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7460,7 +8702,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7472,7 +8716,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7484,7 +8730,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7496,7 +8744,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -7508,7 +8758,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7520,7 +8772,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7532,7 +8786,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7544,7 +8800,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7556,7 +8814,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -7568,7 +8828,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7580,7 +8842,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -7592,7 +8856,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7604,7 +8870,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -7616,7 +8884,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7628,7 +8898,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7640,7 +8912,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7652,7 +8926,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7664,7 +8940,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7676,7 +8954,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7688,7 +8968,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7700,7 +8982,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7712,7 +8996,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -7724,7 +9010,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7736,7 +9024,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -7748,7 +9038,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7760,7 +9052,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7772,7 +9066,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7784,7 +9080,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7796,7 +9094,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7808,7 +9108,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7820,7 +9122,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7832,7 +9136,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7844,7 +9150,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -7856,7 +9164,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7868,7 +9178,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -7880,7 +9192,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7892,7 +9206,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7904,7 +9220,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7916,7 +9234,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7928,7 +9248,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -7940,7 +9262,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7952,7 +9276,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7964,7 +9290,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7976,7 +9304,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7988,7 +9318,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8000,7 +9332,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8012,7 +9346,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8024,7 +9360,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8036,7 +9374,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -8048,7 +9388,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8060,7 +9402,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8072,7 +9416,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8084,7 +9430,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8096,7 +9444,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -8108,7 +9458,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8120,7 +9472,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8132,7 +9486,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8144,7 +9500,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8156,7 +9514,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8168,7 +9528,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8180,7 +9542,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8192,7 +9556,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8204,7 +9570,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8216,7 +9584,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8228,7 +9598,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8240,7 +9612,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8252,7 +9626,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8264,7 +9640,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8276,7 +9654,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8288,7 +9668,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8300,7 +9682,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8312,7 +9696,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -8324,7 +9710,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8336,7 +9724,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8348,7 +9738,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8360,7 +9752,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8372,7 +9766,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8384,7 +9780,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8396,7 +9794,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8408,7 +9808,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8420,7 +9822,9 @@
 			"dark_vs": "keyword.operator.sizeof: #569CD6",
 			"light_vs": "keyword.operator.sizeof: #0000FF",
 			"hc_black": "keyword.operator.sizeof: #569CD6",
-			"hc_light": "keyword.operator.sizeof: #0F4A85"
+			"dark_plus_experimental": "keyword.operator.sizeof: #569CD6",
+			"hc_light": "keyword.operator.sizeof: #0F4A85",
+			"light_plus_experimental": "keyword.operator.sizeof: #0000FF"
 		}
 	},
 	{
@@ -8432,7 +9836,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8444,7 +9850,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -8456,7 +9864,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8468,7 +9878,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8480,7 +9892,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8492,7 +9906,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8504,7 +9920,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -8516,7 +9934,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8528,7 +9948,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8540,7 +9962,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8552,7 +9976,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8564,7 +9990,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8576,7 +10004,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8588,7 +10018,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8600,7 +10032,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8612,7 +10046,9 @@
 			"dark_vs": "keyword.operator.cast: #569CD6",
 			"light_vs": "keyword.operator.cast: #0000FF",
 			"hc_black": "keyword.operator.cast: #569CD6",
-			"hc_light": "keyword.operator.cast: #0F4A85"
+			"dark_plus_experimental": "keyword.operator.cast: #569CD6",
+			"hc_light": "keyword.operator.cast: #0F4A85",
+			"light_plus_experimental": "keyword.operator.cast: #0000FF"
 		}
 	},
 	{
@@ -8624,7 +10060,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8636,7 +10074,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8648,7 +10088,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8660,7 +10102,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8672,7 +10116,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8684,7 +10130,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -8696,7 +10144,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8708,7 +10158,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8720,7 +10172,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8732,7 +10186,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8744,7 +10200,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -8756,7 +10214,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8768,7 +10228,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8780,7 +10242,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8792,7 +10256,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8804,7 +10270,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8816,7 +10284,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8828,7 +10298,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8840,7 +10312,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -8852,7 +10326,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -8864,7 +10340,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -8876,7 +10354,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8888,7 +10368,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8900,7 +10382,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8912,7 +10396,9 @@
 			"dark_vs": "keyword.operator.cast: #569CD6",
 			"light_vs": "keyword.operator.cast: #0000FF",
 			"hc_black": "keyword.operator.cast: #569CD6",
-			"hc_light": "keyword.operator.cast: #0F4A85"
+			"dark_plus_experimental": "keyword.operator.cast: #569CD6",
+			"hc_light": "keyword.operator.cast: #0F4A85",
+			"light_plus_experimental": "keyword.operator.cast: #0000FF"
 		}
 	},
 	{
@@ -8924,7 +10410,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8936,7 +10424,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -8948,7 +10438,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8960,7 +10452,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8972,7 +10466,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8984,7 +10480,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8996,7 +10494,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9008,7 +10508,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9020,7 +10522,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9032,7 +10536,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9044,7 +10550,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9056,7 +10564,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9068,7 +10578,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9080,7 +10592,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9092,7 +10606,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9104,7 +10620,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9116,7 +10634,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9128,7 +10648,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9140,7 +10662,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9152,7 +10676,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9164,7 +10690,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9176,7 +10704,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9188,7 +10718,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9200,7 +10732,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9212,7 +10746,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9224,7 +10760,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9236,7 +10774,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9248,7 +10788,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9260,7 +10802,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9272,7 +10816,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9284,7 +10830,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9296,7 +10844,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9308,7 +10858,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9320,7 +10872,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9332,7 +10886,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9344,7 +10900,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9356,7 +10914,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9368,7 +10928,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9380,7 +10942,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9392,7 +10956,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9404,7 +10970,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9416,7 +10984,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9428,7 +10998,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9440,7 +11012,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9452,7 +11026,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9464,7 +11040,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9476,7 +11054,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9488,7 +11068,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9500,7 +11082,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9512,7 +11096,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9524,7 +11110,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9536,7 +11124,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9548,7 +11138,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9560,7 +11152,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9572,7 +11166,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9584,7 +11180,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9596,7 +11194,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9608,7 +11208,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9620,7 +11222,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9632,7 +11236,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9644,7 +11250,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9656,7 +11264,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9668,7 +11278,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9680,7 +11292,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9692,7 +11306,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9704,7 +11320,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9716,7 +11334,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9728,7 +11348,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9740,7 +11362,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9752,7 +11376,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9764,7 +11390,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9776,7 +11404,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9788,7 +11418,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9800,7 +11432,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9812,7 +11446,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9824,7 +11460,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9836,7 +11474,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9848,7 +11488,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9860,7 +11502,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9872,7 +11516,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9884,7 +11530,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9896,7 +11544,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9908,7 +11558,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9920,7 +11572,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9932,7 +11586,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9944,7 +11600,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9956,7 +11614,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9968,7 +11628,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9980,7 +11642,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -9992,7 +11656,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10004,7 +11670,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -10016,7 +11684,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10028,7 +11698,9 @@
 			"dark_vs": "keyword.operator.cast: #569CD6",
 			"light_vs": "keyword.operator.cast: #0000FF",
 			"hc_black": "keyword.operator.cast: #569CD6",
-			"hc_light": "keyword.operator.cast: #0F4A85"
+			"dark_plus_experimental": "keyword.operator.cast: #569CD6",
+			"hc_light": "keyword.operator.cast: #0F4A85",
+			"light_plus_experimental": "keyword.operator.cast: #0000FF"
 		}
 	},
 	{
@@ -10040,7 +11712,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10052,7 +11726,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -10064,7 +11740,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10076,7 +11754,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10088,7 +11768,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10100,7 +11782,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10112,7 +11796,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10124,7 +11810,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10136,7 +11824,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10148,7 +11838,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10160,7 +11852,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10172,7 +11866,9 @@
 			"dark_vs": "keyword.operator.sizeof: #569CD6",
 			"light_vs": "keyword.operator.sizeof: #0000FF",
 			"hc_black": "keyword.operator.sizeof: #569CD6",
-			"hc_light": "keyword.operator.sizeof: #0F4A85"
+			"dark_plus_experimental": "keyword.operator.sizeof: #569CD6",
+			"hc_light": "keyword.operator.sizeof: #0F4A85",
+			"light_plus_experimental": "keyword.operator.sizeof: #0000FF"
 		}
 	},
 	{
@@ -10184,7 +11880,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10196,7 +11894,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -10208,7 +11908,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10220,7 +11922,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10232,7 +11936,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10244,7 +11950,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10256,7 +11964,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10268,7 +11978,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10280,7 +11992,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10292,7 +12006,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -10304,7 +12020,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10316,7 +12034,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10328,7 +12048,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10340,7 +12062,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10352,7 +12076,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10364,7 +12090,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10376,7 +12104,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -10388,7 +12118,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10400,7 +12132,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -10412,7 +12146,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10424,7 +12160,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10436,7 +12174,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10448,7 +12188,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10460,7 +12202,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10472,7 +12216,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10484,7 +12230,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10496,7 +12244,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10508,7 +12258,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10520,7 +12272,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10532,7 +12286,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10544,7 +12300,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10556,7 +12314,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10568,7 +12328,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10580,7 +12342,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10592,7 +12356,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10604,7 +12370,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10616,7 +12384,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10628,7 +12398,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10640,7 +12412,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10652,7 +12426,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10664,7 +12440,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -10676,7 +12454,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10688,7 +12468,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -10700,7 +12482,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10712,7 +12496,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10724,7 +12510,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10736,7 +12524,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10748,7 +12538,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -10760,7 +12552,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10772,7 +12566,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -10784,7 +12580,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10796,7 +12594,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10808,7 +12608,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10820,7 +12622,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10832,7 +12636,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10844,7 +12650,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10856,7 +12664,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10868,7 +12678,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10880,7 +12692,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10892,7 +12706,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10904,7 +12720,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10916,7 +12734,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -10928,7 +12748,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10940,7 +12762,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -10952,7 +12776,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10964,7 +12790,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10976,7 +12804,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10988,7 +12818,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11000,7 +12832,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11012,7 +12846,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11024,7 +12860,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11036,7 +12874,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11048,7 +12888,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11060,7 +12902,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11072,7 +12916,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -11084,7 +12930,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11096,7 +12944,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11108,7 +12958,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11120,7 +12972,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -11132,7 +12986,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11144,7 +13000,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11156,7 +13014,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11168,7 +13028,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11180,7 +13042,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11192,7 +13056,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11204,7 +13070,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11216,7 +13084,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -11228,7 +13098,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11240,7 +13112,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11252,7 +13126,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11264,7 +13140,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11276,7 +13154,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -11288,7 +13168,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11300,7 +13182,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11312,7 +13196,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11324,7 +13210,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -11336,7 +13224,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11348,7 +13238,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11360,7 +13252,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11372,7 +13266,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -11384,7 +13280,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11396,7 +13294,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11408,7 +13308,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11420,7 +13322,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11432,7 +13336,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11444,7 +13350,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11456,7 +13364,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11468,7 +13378,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -11480,7 +13392,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11492,7 +13406,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11504,7 +13420,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11516,7 +13434,9 @@
 			"dark_vs": "keyword.operator.sizeof: #569CD6",
 			"light_vs": "keyword.operator.sizeof: #0000FF",
 			"hc_black": "keyword.operator.sizeof: #569CD6",
-			"hc_light": "keyword.operator.sizeof: #0F4A85"
+			"dark_plus_experimental": "keyword.operator.sizeof: #569CD6",
+			"hc_light": "keyword.operator.sizeof: #0F4A85",
+			"light_plus_experimental": "keyword.operator.sizeof: #0000FF"
 		}
 	},
 	{
@@ -11528,7 +13448,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11540,7 +13462,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11552,7 +13476,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11564,7 +13490,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -11576,7 +13504,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11588,7 +13518,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11600,7 +13532,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11612,7 +13546,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11624,7 +13560,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11636,7 +13574,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11648,7 +13588,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11660,7 +13602,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11672,7 +13616,9 @@
 			"dark_vs": "keyword.operator.sizeof: #569CD6",
 			"light_vs": "keyword.operator.sizeof: #0000FF",
 			"hc_black": "keyword.operator.sizeof: #569CD6",
-			"hc_light": "keyword.operator.sizeof: #0F4A85"
+			"dark_plus_experimental": "keyword.operator.sizeof: #569CD6",
+			"hc_light": "keyword.operator.sizeof: #0F4A85",
+			"light_plus_experimental": "keyword.operator.sizeof: #0000FF"
 		}
 	},
 	{
@@ -11684,7 +13630,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11696,7 +13644,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11708,7 +13658,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11720,7 +13672,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -11732,7 +13686,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11744,7 +13700,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11756,7 +13714,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11768,7 +13728,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11780,7 +13742,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11792,7 +13756,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11804,7 +13770,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11816,7 +13784,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -11828,7 +13798,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11840,7 +13812,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11852,7 +13826,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11864,7 +13840,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11876,7 +13854,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -11888,7 +13868,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11900,7 +13882,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11912,7 +13896,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -11924,7 +13910,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11936,7 +13924,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11948,7 +13938,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -11960,7 +13952,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11972,7 +13966,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11984,7 +13980,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11996,7 +13994,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -12008,7 +14008,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12020,7 +14022,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12032,7 +14036,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12044,7 +14050,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12056,7 +14064,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12068,7 +14078,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12080,7 +14092,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12092,7 +14106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12104,7 +14120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12116,7 +14134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12128,7 +14148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12140,7 +14162,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -12152,7 +14176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12164,7 +14190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12176,7 +14204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -12188,7 +14218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12200,7 +14232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12212,7 +14246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12224,7 +14260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12236,7 +14274,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12248,7 +14288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12260,7 +14302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12272,7 +14316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12284,7 +14330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12296,7 +14344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -12308,7 +14358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12320,7 +14372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12332,7 +14386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12344,7 +14400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12356,7 +14414,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -12368,7 +14428,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -12380,7 +14442,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "constant.other.placeholder: #001080"
+			"dark_plus_experimental": "constant.other.placeholder: #9CDCFE",
+			"hc_light": "constant.other.placeholder: #001080",
+			"light_plus_experimental": "constant.other.placeholder: #001080"
 		}
 	},
 	{
@@ -12392,7 +14456,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -12404,7 +14470,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "constant.other.placeholder: #001080"
+			"dark_plus_experimental": "constant.other.placeholder: #9CDCFE",
+			"hc_light": "constant.other.placeholder: #001080",
+			"light_plus_experimental": "constant.other.placeholder: #001080"
 		}
 	},
 	{
@@ -12416,7 +14484,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -12428,7 +14498,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "constant.other.placeholder: #001080"
+			"dark_plus_experimental": "constant.other.placeholder: #9CDCFE",
+			"hc_light": "constant.other.placeholder: #001080",
+			"light_plus_experimental": "constant.other.placeholder: #001080"
 		}
 	},
 	{
@@ -12440,7 +14512,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -12452,7 +14526,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -12464,7 +14540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12476,7 +14554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12488,7 +14568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12500,7 +14582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12512,7 +14596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -12524,7 +14610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12536,7 +14624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12548,7 +14638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12560,7 +14652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12572,7 +14666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12584,7 +14680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12596,7 +14694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12608,7 +14708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12620,7 +14722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -12632,7 +14736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12644,7 +14750,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -12656,7 +14764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12668,7 +14778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12680,7 +14792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12692,7 +14806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12704,7 +14820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12716,7 +14834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12728,7 +14848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12740,7 +14862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -12752,7 +14876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12764,7 +14890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -12776,7 +14904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12788,7 +14918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12800,7 +14932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12812,7 +14946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12824,7 +14960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12836,7 +14974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -12848,7 +14988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12860,7 +15002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -12872,7 +15016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12884,7 +15030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12896,7 +15044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12908,7 +15058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12920,7 +15072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12932,7 +15086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -12944,7 +15100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12956,7 +15114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12968,7 +15128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12980,7 +15142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12992,7 +15156,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -13004,7 +15170,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -13016,7 +15184,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -13028,7 +15198,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -13040,7 +15212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13052,7 +15226,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13064,7 +15240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13076,7 +15254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -13088,7 +15268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13100,7 +15282,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -13112,7 +15296,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13124,7 +15310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13136,7 +15324,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 289cc958232f60..3ad1c188648bf9 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_dart.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_dart.json
@@ -8,7 +8,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 45be213c86042a..6c0ae183e92c9e 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_diff.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_diff.json
@@ -8,7 +8,9 @@
 			"dark_vs": "meta.diff.header: #569CD6",
 			"light_vs": "meta.diff.header: #000080",
 			"hc_black": "meta.diff.header: #000080",
-			"hc_light": "meta.diff.header: #062F4A"
+			"dark_plus_experimental": "meta.diff.header: #569CD6",
+			"hc_light": "meta.diff.header: #062F4A",
+			"light_plus_experimental": "meta.diff.header: #000080"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "meta.diff.header: #569CD6",
 			"light_vs": "meta.diff.header: #000080",
 			"hc_black": "meta.diff.header: #000080",
-			"hc_light": "meta.diff.header: #062F4A"
+			"dark_plus_experimental": "meta.diff.header: #569CD6",
+			"hc_light": "meta.diff.header: #062F4A",
+			"light_plus_experimental": "meta.diff.header: #000080"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "meta.diff.header: #569CD6",
 			"light_vs": "meta.diff.header: #000080",
 			"hc_black": "meta.diff.header: #000080",
-			"hc_light": "meta.diff.header: #062F4A"
+			"dark_plus_experimental": "meta.diff.header: #569CD6",
+			"hc_light": "meta.diff.header: #062F4A",
+			"light_plus_experimental": "meta.diff.header: #000080"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "meta.diff.header: #569CD6",
 			"light_vs": "meta.diff.header: #000080",
 			"hc_black": "meta.diff.header: #000080",
-			"hc_light": "meta.diff.header: #062F4A"
+			"dark_plus_experimental": "meta.diff.header: #569CD6",
+			"hc_light": "meta.diff.header: #062F4A",
+			"light_plus_experimental": "meta.diff.header: #000080"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "meta.diff.header: #569CD6",
 			"light_vs": "meta.diff.header: #000080",
 			"hc_black": "meta.diff.header: #000080",
-			"hc_light": "meta.diff.header: #062F4A"
+			"dark_plus_experimental": "meta.diff.header: #569CD6",
+			"hc_light": "meta.diff.header: #062F4A",
+			"light_plus_experimental": "meta.diff.header: #000080"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "markup.deleted: #CE9178",
 			"light_vs": "markup.deleted: #A31515",
 			"hc_black": "markup.deleted: #CE9178",
-			"hc_light": "markup.deleted: #5A5A5A"
+			"dark_plus_experimental": "markup.deleted: #CE9178",
+			"hc_light": "markup.deleted: #5A5A5A",
+			"light_plus_experimental": "markup.deleted: #A31515"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "markup.deleted: #CE9178",
 			"light_vs": "markup.deleted: #A31515",
 			"hc_black": "markup.deleted: #CE9178",
-			"hc_light": "markup.deleted: #5A5A5A"
+			"dark_plus_experimental": "markup.deleted: #CE9178",
+			"hc_light": "markup.deleted: #5A5A5A",
+			"light_plus_experimental": "markup.deleted: #A31515"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "markup.inserted: #B5CEA8",
 			"light_vs": "markup.inserted: #098658",
 			"hc_black": "markup.inserted: #B5CEA8",
-			"hc_light": "markup.inserted: #096D48"
+			"dark_plus_experimental": "markup.inserted: #B5CEA8",
+			"hc_light": "markup.inserted: #096D48",
+			"light_plus_experimental": "markup.inserted: #098658"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "markup.inserted: #B5CEA8",
 			"light_vs": "markup.inserted: #098658",
 			"hc_black": "markup.inserted: #B5CEA8",
-			"hc_light": "markup.inserted: #096D48"
+			"dark_plus_experimental": "markup.inserted: #B5CEA8",
+			"hc_light": "markup.inserted: #096D48",
+			"light_plus_experimental": "markup.inserted: #098658"
 		}
 	}
 ]
\ 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 499e9a81515ab5..449c46578613bd 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_fs.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_fs.json
@@ -8,7 +8,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character: #0F4A85"
+			"dark_plus_experimental": "constant.character: #569CD6",
+			"hc_light": "constant.character: #0F4A85",
+			"light_plus_experimental": "constant.character: #0000FF"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 5284f96c15e71a..92f8f5a7fd079f 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_go.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_go.json
@@ -8,7 +8,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type.numeric.go: #185E73"
+			"dark_plus_experimental": "storage.type.numeric.go: #4EC9B0",
+			"hc_light": "storage.type.numeric.go: #185E73",
+			"light_plus_experimental": "storage.type.numeric.go: #267F99"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "constant.other.placeholder: #001080"
+			"dark_plus_experimental": "constant.other.placeholder: #9CDCFE",
+			"hc_light": "constant.other.placeholder: #001080",
+			"light_plus_experimental": "constant.other.placeholder: #001080"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "constant.other.placeholder: #001080"
+			"dark_plus_experimental": "constant.other.placeholder: #9CDCFE",
+			"hc_light": "constant.other.placeholder: #001080",
+			"light_plus_experimental": "constant.other.placeholder: #001080"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 7d6169cac45201..a01f6eaed8987f 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_groovy.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_groovy.json
@@ -8,7 +8,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
-			"hc_light": "meta.definition.variable.name: #001080"
+			"dark_plus_experimental": "meta.definition.variable.name: #9CDCFE",
+			"hc_light": "meta.definition.variable.name: #001080",
+			"light_plus_experimental": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.groovy: #4EC9B0",
-			"hc_light": "storage.type.groovy: #185E73"
+			"dark_plus_experimental": "storage.type.groovy: #4EC9B0",
+			"hc_light": "storage.type.groovy: #185E73",
+			"light_plus_experimental": "storage.type.groovy: #267F99"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
-			"hc_light": "meta.definition.variable.name: #001080"
+			"dark_plus_experimental": "meta.definition.variable.name: #9CDCFE",
+			"hc_light": "meta.definition.variable.name: #001080",
+			"light_plus_experimental": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2168,7 +2528,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2180,7 +2542,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2192,7 +2556,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2204,7 +2570,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2216,7 +2584,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2228,7 +2598,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2240,7 +2612,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2252,7 +2626,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2264,7 +2640,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2276,7 +2654,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2288,7 +2668,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2300,7 +2682,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2312,7 +2696,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2324,7 +2710,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2336,7 +2724,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2348,7 +2738,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -2360,7 +2752,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2372,7 +2766,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2384,7 +2780,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2396,7 +2794,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2408,7 +2808,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.groovy: #4EC9B0",
-			"hc_light": "storage.type.groovy: #185E73"
+			"dark_plus_experimental": "storage.type.groovy: #4EC9B0",
+			"hc_light": "storage.type.groovy: #185E73",
+			"light_plus_experimental": "storage.type.groovy: #267F99"
 		}
 	},
 	{
@@ -2420,7 +2822,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2432,7 +2836,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2444,7 +2850,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2456,7 +2864,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2468,7 +2878,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2480,7 +2892,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2492,7 +2906,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2504,7 +2920,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2516,7 +2934,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2528,7 +2948,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2540,7 +2962,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2552,7 +2976,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2564,7 +2990,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2576,7 +3004,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2588,7 +3018,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2600,7 +3032,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2612,7 +3046,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2624,7 +3060,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.groovy: #4EC9B0",
-			"hc_light": "storage.type.groovy: #185E73"
+			"dark_plus_experimental": "storage.type.groovy: #4EC9B0",
+			"hc_light": "storage.type.groovy: #185E73",
+			"light_plus_experimental": "storage.type.groovy: #267F99"
 		}
 	},
 	{
@@ -2636,7 +3074,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2648,7 +3088,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2660,7 +3102,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2672,7 +3116,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2684,7 +3130,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2696,7 +3144,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2708,7 +3158,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2720,7 +3172,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2732,7 +3186,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.groovy: #4EC9B0",
-			"hc_light": "storage.type.groovy: #185E73"
+			"dark_plus_experimental": "storage.type.groovy: #4EC9B0",
+			"hc_light": "storage.type.groovy: #185E73",
+			"light_plus_experimental": "storage.type.groovy: #267F99"
 		}
 	},
 	{
@@ -2744,7 +3200,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2756,7 +3214,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2768,7 +3228,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2780,7 +3242,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2792,7 +3256,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2804,7 +3270,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2816,7 +3284,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2828,7 +3298,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2840,7 +3312,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2852,7 +3326,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2864,7 +3340,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2876,7 +3354,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2888,7 +3368,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2900,7 +3382,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
-			"hc_light": "meta.definition.variable.name: #001080"
+			"dark_plus_experimental": "meta.definition.variable.name: #9CDCFE",
+			"hc_light": "meta.definition.variable.name: #001080",
+			"light_plus_experimental": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -2912,7 +3396,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2924,7 +3410,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2936,7 +3424,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2948,7 +3438,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2960,7 +3452,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2972,7 +3466,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2984,7 +3480,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2996,7 +3494,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3008,7 +3508,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3020,7 +3522,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3032,7 +3536,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3044,7 +3550,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3056,7 +3564,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3068,7 +3578,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3080,7 +3592,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3092,7 +3606,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3104,7 +3620,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3116,7 +3634,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3128,7 +3648,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3140,7 +3662,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3152,7 +3676,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3164,7 +3690,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3176,7 +3704,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3188,7 +3718,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3200,7 +3732,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3212,7 +3746,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3224,7 +3760,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3236,7 +3774,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3248,7 +3788,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3260,7 +3802,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3272,7 +3816,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3284,7 +3830,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3296,7 +3844,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3308,7 +3858,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3320,7 +3872,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3332,7 +3886,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3344,7 +3900,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3356,7 +3914,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3368,7 +3928,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3380,7 +3942,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3392,7 +3956,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3404,7 +3970,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3416,7 +3984,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3428,7 +3998,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3440,7 +4012,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3452,7 +4026,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3464,7 +4040,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3476,7 +4054,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3488,7 +4068,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3500,7 +4082,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3512,7 +4096,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3524,7 +4110,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3536,7 +4124,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3548,7 +4138,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3560,7 +4152,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3572,7 +4166,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -3584,7 +4180,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3596,7 +4194,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3608,7 +4208,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3620,7 +4222,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3632,7 +4236,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -3644,7 +4250,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3656,7 +4264,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3668,7 +4278,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3680,7 +4292,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3692,7 +4306,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -3704,7 +4320,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3716,7 +4334,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3728,7 +4348,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3740,7 +4362,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3752,7 +4376,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3764,7 +4390,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3776,7 +4404,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3788,7 +4418,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3800,7 +4432,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3812,7 +4446,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3824,7 +4460,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3836,7 +4474,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3848,7 +4488,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3860,7 +4502,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3872,7 +4516,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -3884,7 +4530,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3896,7 +4544,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3908,7 +4558,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3920,7 +4572,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3932,7 +4586,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3944,7 +4600,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3956,7 +4614,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3968,7 +4628,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3980,7 +4642,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3992,7 +4656,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4004,7 +4670,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -4016,7 +4684,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4028,7 +4698,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4040,7 +4712,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4052,7 +4726,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4064,7 +4740,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -4076,7 +4754,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -4088,7 +4768,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -4100,7 +4782,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4112,7 +4796,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4124,7 +4810,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4136,7 +4824,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -4148,7 +4838,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4160,7 +4852,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4172,7 +4866,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4184,7 +4880,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4196,7 +4894,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4208,7 +4908,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -4220,7 +4922,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4232,7 +4936,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -4244,7 +4950,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4256,7 +4964,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4268,7 +4978,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4280,7 +4992,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4292,7 +5006,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4304,7 +5020,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4316,7 +5034,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -4328,7 +5048,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4340,7 +5062,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.groovy: #4EC9B0",
-			"hc_light": "storage.type.groovy: #185E73"
+			"dark_plus_experimental": "storage.type.groovy: #4EC9B0",
+			"hc_light": "storage.type.groovy: #185E73",
+			"light_plus_experimental": "storage.type.groovy: #267F99"
 		}
 	},
 	{
@@ -4352,7 +5076,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4364,7 +5090,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
-			"hc_light": "meta.definition.variable.name: #001080"
+			"dark_plus_experimental": "meta.definition.variable.name: #9CDCFE",
+			"hc_light": "meta.definition.variable.name: #001080",
+			"light_plus_experimental": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -4376,7 +5104,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4388,7 +5118,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4400,7 +5132,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4412,7 +5146,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -4424,7 +5160,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -4436,7 +5174,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -4448,7 +5188,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4460,7 +5202,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4472,7 +5216,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4484,7 +5230,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4496,7 +5244,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.groovy: #4EC9B0",
-			"hc_light": "storage.type.groovy: #185E73"
+			"dark_plus_experimental": "storage.type.groovy: #4EC9B0",
+			"hc_light": "storage.type.groovy: #185E73",
+			"light_plus_experimental": "storage.type.groovy: #267F99"
 		}
 	},
 	{
@@ -4508,7 +5258,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4520,7 +5272,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
-			"hc_light": "meta.definition.variable.name: #001080"
+			"dark_plus_experimental": "meta.definition.variable.name: #9CDCFE",
+			"hc_light": "meta.definition.variable.name: #001080",
+			"light_plus_experimental": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -4532,7 +5286,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4544,7 +5300,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -4556,7 +5314,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4568,7 +5328,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.primitive.groovy: #4EC9B0",
-			"hc_light": "storage.type.primitive.groovy: #185E73"
+			"dark_plus_experimental": "storage.type.primitive.groovy: #4EC9B0",
+			"hc_light": "storage.type.primitive.groovy: #185E73",
+			"light_plus_experimental": "storage.type.primitive.groovy: #267F99"
 		}
 	},
 	{
@@ -4580,7 +5342,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4592,7 +5356,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -4604,7 +5370,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4616,7 +5384,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.groovy: #4EC9B0",
-			"hc_light": "storage.type.groovy: #185E73"
+			"dark_plus_experimental": "storage.type.groovy: #4EC9B0",
+			"hc_light": "storage.type.groovy: #185E73",
+			"light_plus_experimental": "storage.type.groovy: #267F99"
 		}
 	},
 	{
@@ -4628,7 +5398,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4640,7 +5412,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -4652,7 +5426,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4664,7 +5440,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4676,7 +5454,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4688,7 +5468,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -4700,7 +5482,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4712,7 +5496,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4724,7 +5510,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4736,7 +5524,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4748,7 +5538,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4760,7 +5552,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4772,7 +5566,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4784,7 +5580,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4796,7 +5594,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4808,7 +5608,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -4820,7 +5622,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4832,7 +5636,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
-			"hc_light": "meta.definition.variable.name: #001080"
+			"dark_plus_experimental": "meta.definition.variable.name: #9CDCFE",
+			"hc_light": "meta.definition.variable.name: #001080",
+			"light_plus_experimental": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -4844,7 +5650,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4856,7 +5664,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4868,7 +5678,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4880,7 +5692,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4892,7 +5706,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4904,7 +5720,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4916,7 +5734,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -4928,7 +5748,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4940,7 +5762,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
-			"hc_light": "meta.definition.variable.name: #001080"
+			"dark_plus_experimental": "meta.definition.variable.name: #9CDCFE",
+			"hc_light": "meta.definition.variable.name: #001080",
+			"light_plus_experimental": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -4952,7 +5776,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4964,7 +5790,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4976,7 +5804,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4988,7 +5818,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5000,7 +5832,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -5012,7 +5846,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5024,7 +5860,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5036,7 +5874,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5048,7 +5888,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5060,7 +5902,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5072,7 +5916,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -5084,7 +5930,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5096,7 +5944,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -5108,7 +5958,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -5120,7 +5972,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -5132,7 +5986,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5144,7 +6000,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -5156,7 +6014,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5168,7 +6028,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -5180,7 +6042,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5192,7 +6056,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5204,7 +6070,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5216,7 +6084,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5228,7 +6098,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5240,7 +6112,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -5252,7 +6126,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5264,7 +6140,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -5276,7 +6154,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -5288,7 +6168,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -5300,7 +6182,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5312,7 +6196,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -5324,7 +6210,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5336,7 +6224,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5348,7 +6238,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -5360,7 +6252,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5372,7 +6266,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -5384,7 +6280,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -5396,7 +6294,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -5408,7 +6308,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5420,7 +6322,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -5432,7 +6336,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -5444,7 +6350,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -5456,7 +6364,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5468,7 +6378,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
-			"hc_light": "meta.definition.variable.name: #001080"
+			"dark_plus_experimental": "meta.definition.variable.name: #9CDCFE",
+			"hc_light": "meta.definition.variable.name: #001080",
+			"light_plus_experimental": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -5480,7 +6392,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5492,7 +6406,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5504,7 +6420,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5516,7 +6434,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5528,7 +6448,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -5540,7 +6462,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5552,7 +6476,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
-			"hc_light": "meta.definition.variable.name: #001080"
+			"dark_plus_experimental": "meta.definition.variable.name: #9CDCFE",
+			"hc_light": "meta.definition.variable.name: #001080",
+			"light_plus_experimental": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -5564,7 +6490,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5576,7 +6504,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5588,7 +6518,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5600,7 +6532,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5612,7 +6546,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5624,7 +6560,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5636,7 +6574,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5648,7 +6588,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5660,7 +6602,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5672,7 +6616,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -5684,7 +6630,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -5696,7 +6644,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -5708,7 +6658,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5720,7 +6672,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5732,7 +6686,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5744,7 +6700,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -5756,7 +6714,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -5768,7 +6728,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -5780,7 +6742,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -5792,7 +6756,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5804,7 +6770,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5816,7 +6784,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5828,7 +6798,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -5840,7 +6812,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -5852,7 +6826,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -5864,7 +6840,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -5876,7 +6854,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -5888,7 +6868,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -5900,7 +6882,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -5912,7 +6896,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5924,7 +6910,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5936,7 +6924,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5948,7 +6938,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5960,7 +6952,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5972,7 +6966,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5984,7 +6980,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5996,7 +6994,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6008,7 +7008,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6020,7 +7022,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6032,7 +7036,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6044,7 +7050,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -6056,7 +7064,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -6068,7 +7078,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -6080,7 +7092,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -6092,7 +7106,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -6104,7 +7120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6116,7 +7134,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6128,7 +7148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6140,7 +7162,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6152,7 +7176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6164,7 +7190,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6176,7 +7204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6188,7 +7218,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -6200,7 +7232,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -6212,7 +7246,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -6224,7 +7260,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -6236,7 +7274,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -6248,7 +7288,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -6260,7 +7302,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -6272,7 +7316,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -6284,7 +7330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6296,7 +7344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
-			"hc_light": "meta.definition.variable.name: #001080"
+			"dark_plus_experimental": "meta.definition.variable.name: #9CDCFE",
+			"hc_light": "meta.definition.variable.name: #001080",
+			"light_plus_experimental": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -6308,7 +7358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6320,7 +7372,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6332,7 +7386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6344,7 +7400,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6356,7 +7414,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6368,7 +7428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6380,7 +7442,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6392,7 +7456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6404,7 +7470,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6416,7 +7484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6428,7 +7498,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6440,7 +7512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6452,7 +7526,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6464,7 +7540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6476,7 +7554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6488,7 +7568,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6500,7 +7582,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6512,7 +7596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6524,7 +7610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6536,7 +7624,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -6548,7 +7638,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -6560,7 +7652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6572,7 +7666,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6584,7 +7680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6596,7 +7694,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6608,7 +7708,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6620,7 +7722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6632,7 +7736,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6644,7 +7750,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6656,7 +7764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6668,7 +7778,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6680,7 +7792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6692,7 +7806,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6704,7 +7820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6716,7 +7834,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6728,7 +7848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6740,7 +7862,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6752,7 +7876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6764,7 +7890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6776,7 +7904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6788,7 +7918,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6800,7 +7932,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6812,7 +7946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6824,7 +7960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6836,7 +7974,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -6848,7 +7988,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -6860,7 +8002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6872,7 +8016,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6884,7 +8030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6896,7 +8044,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6908,7 +8058,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6920,7 +8072,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6932,7 +8086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6944,7 +8100,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6956,7 +8114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6968,7 +8128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6980,7 +8142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6992,7 +8156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7004,7 +8170,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7016,7 +8184,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7028,7 +8198,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7040,7 +8212,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -7052,7 +8226,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7064,7 +8240,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7076,7 +8254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7088,7 +8268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7100,7 +8282,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7112,7 +8296,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7124,7 +8310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7136,7 +8324,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7148,7 +8338,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -7160,7 +8352,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -7172,7 +8366,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -7184,7 +8380,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7196,7 +8394,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
-			"hc_light": "meta.definition.variable.name: #001080"
+			"dark_plus_experimental": "meta.definition.variable.name: #9CDCFE",
+			"hc_light": "meta.definition.variable.name: #001080",
+			"light_plus_experimental": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -7208,7 +8408,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7220,7 +8422,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7232,7 +8436,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7244,7 +8450,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7256,7 +8464,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7268,7 +8478,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7280,7 +8492,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7292,7 +8506,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7304,7 +8520,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7316,7 +8534,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7328,7 +8548,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7340,7 +8562,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7352,7 +8576,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7364,7 +8590,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7376,7 +8604,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7388,7 +8618,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7400,7 +8632,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7412,7 +8646,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7424,7 +8660,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7436,7 +8674,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7448,7 +8688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7460,7 +8702,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7472,7 +8716,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7484,7 +8730,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7496,7 +8744,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7508,7 +8758,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7520,7 +8772,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7532,7 +8786,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7544,7 +8800,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7556,7 +8814,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7568,7 +8828,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7580,7 +8842,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7592,7 +8856,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7604,7 +8870,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7616,7 +8884,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -7628,7 +8898,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7640,7 +8912,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7652,7 +8926,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7664,7 +8940,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7676,7 +8954,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7688,7 +8968,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7700,7 +8982,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7712,7 +8996,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7724,7 +9010,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7736,7 +9024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7748,7 +9038,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -7760,7 +9052,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7772,7 +9066,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
-			"hc_light": "meta.definition.variable.name: #001080"
+			"dark_plus_experimental": "meta.definition.variable.name: #9CDCFE",
+			"hc_light": "meta.definition.variable.name: #001080",
+			"light_plus_experimental": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -7784,7 +9080,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7796,7 +9094,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7808,7 +9108,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7820,7 +9122,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7832,7 +9136,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7844,7 +9150,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7856,7 +9164,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7868,7 +9178,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7880,7 +9192,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7892,7 +9206,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7904,7 +9220,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7916,7 +9234,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7928,7 +9248,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7940,7 +9262,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7952,7 +9276,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7964,7 +9290,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7976,7 +9304,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7988,7 +9318,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8000,7 +9332,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8012,7 +9346,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8024,7 +9360,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8036,7 +9374,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8048,7 +9388,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8060,7 +9402,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -8072,7 +9416,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -8084,7 +9430,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -8096,7 +9444,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8108,7 +9458,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
-			"hc_light": "meta.definition.variable.name: #001080"
+			"dark_plus_experimental": "meta.definition.variable.name: #9CDCFE",
+			"hc_light": "meta.definition.variable.name: #001080",
+			"light_plus_experimental": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -8120,7 +9472,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8132,7 +9486,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8144,7 +9500,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8156,7 +9514,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.groovy: #4EC9B0",
-			"hc_light": "storage.type.groovy: #185E73"
+			"dark_plus_experimental": "storage.type.groovy: #4EC9B0",
+			"hc_light": "storage.type.groovy: #185E73",
+			"light_plus_experimental": "storage.type.groovy: #267F99"
 		}
 	},
 	{
@@ -8168,7 +9528,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8180,7 +9542,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8192,7 +9556,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8204,7 +9570,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8216,7 +9584,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8228,7 +9598,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -8240,7 +9612,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8252,7 +9626,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
-			"hc_light": "meta.definition.variable.name: #001080"
+			"dark_plus_experimental": "meta.definition.variable.name: #9CDCFE",
+			"hc_light": "meta.definition.variable.name: #001080",
+			"light_plus_experimental": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -8264,7 +9640,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8276,7 +9654,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8288,7 +9668,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8300,7 +9682,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8312,7 +9696,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8324,7 +9710,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -8336,7 +9724,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8348,7 +9738,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
-			"hc_light": "meta.definition.variable.name: #001080"
+			"dark_plus_experimental": "meta.definition.variable.name: #9CDCFE",
+			"hc_light": "meta.definition.variable.name: #001080",
+			"light_plus_experimental": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -8360,7 +9752,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8372,7 +9766,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8384,7 +9780,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8396,7 +9794,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -8408,7 +9808,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8420,7 +9822,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -8432,7 +9836,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -8444,7 +9850,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -8456,7 +9864,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8468,7 +9878,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -8480,7 +9892,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8492,7 +9906,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
-			"hc_light": "meta.definition.variable.name: #001080"
+			"dark_plus_experimental": "meta.definition.variable.name: #9CDCFE",
+			"hc_light": "meta.definition.variable.name: #001080",
+			"light_plus_experimental": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -8504,7 +9920,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8516,7 +9934,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8528,7 +9948,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8540,7 +9962,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8552,7 +9976,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -8564,7 +9990,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8576,7 +10004,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8588,7 +10018,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -8600,7 +10032,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8612,7 +10046,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8624,7 +10060,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8636,7 +10074,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -8648,7 +10088,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8660,7 +10102,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8672,7 +10116,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8684,7 +10130,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8696,7 +10144,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8708,7 +10158,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8720,7 +10172,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8732,7 +10186,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8744,7 +10200,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8756,7 +10214,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -8768,7 +10228,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8780,7 +10242,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
-			"hc_light": "meta.definition.variable.name: #001080"
+			"dark_plus_experimental": "meta.definition.variable.name: #9CDCFE",
+			"hc_light": "meta.definition.variable.name: #001080",
+			"light_plus_experimental": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -8792,7 +10256,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8804,7 +10270,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8816,7 +10284,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8828,7 +10298,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8840,7 +10312,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -8852,7 +10326,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8864,7 +10340,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
-			"hc_light": "meta.definition.variable.name: #001080"
+			"dark_plus_experimental": "meta.definition.variable.name: #9CDCFE",
+			"hc_light": "meta.definition.variable.name: #001080",
+			"light_plus_experimental": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -8876,7 +10354,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8888,7 +10368,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8900,7 +10382,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8912,7 +10396,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8924,7 +10410,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -8936,7 +10424,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8948,7 +10438,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8960,7 +10452,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8972,7 +10466,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8984,7 +10480,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8996,7 +10494,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -9008,7 +10508,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9020,7 +10522,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9032,7 +10536,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9044,7 +10550,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9056,7 +10564,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9068,7 +10578,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -9080,7 +10592,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9092,7 +10606,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
-			"hc_light": "meta.definition.variable.name: #001080"
+			"dark_plus_experimental": "meta.definition.variable.name: #9CDCFE",
+			"hc_light": "meta.definition.variable.name: #001080",
+			"light_plus_experimental": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -9104,7 +10620,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9116,7 +10634,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9128,7 +10648,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9140,7 +10662,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -9152,7 +10676,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9164,7 +10690,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9176,7 +10704,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9188,7 +10718,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9200,7 +10732,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -9212,7 +10746,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -9224,7 +10760,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -9236,7 +10774,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9248,7 +10788,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9260,7 +10802,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -9272,7 +10816,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9284,7 +10830,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
-			"hc_light": "meta.definition.variable.name: #001080"
+			"dark_plus_experimental": "meta.definition.variable.name: #9CDCFE",
+			"hc_light": "meta.definition.variable.name: #001080",
+			"light_plus_experimental": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -9296,7 +10844,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9308,7 +10858,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9320,7 +10872,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9332,7 +10886,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9344,7 +10900,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9356,7 +10914,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9368,7 +10928,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9380,7 +10942,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9392,7 +10956,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9404,7 +10970,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9416,7 +10984,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9428,7 +10998,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9440,7 +11012,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9452,7 +11026,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9464,7 +11040,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9476,7 +11054,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -9488,7 +11068,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -9500,7 +11082,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9512,7 +11096,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9524,7 +11110,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9536,7 +11124,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9548,7 +11138,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9560,7 +11152,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9572,7 +11166,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9584,7 +11180,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9596,7 +11194,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9608,7 +11208,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9620,7 +11222,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9632,7 +11236,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -9644,7 +11250,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9656,7 +11264,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -9668,7 +11278,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9680,7 +11292,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9692,7 +11306,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9704,7 +11320,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9716,7 +11334,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9728,7 +11348,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9740,7 +11362,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9752,7 +11376,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9764,7 +11390,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9776,7 +11404,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -9788,7 +11418,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9800,7 +11432,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9812,7 +11446,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9824,7 +11460,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.groovy: #4EC9B0",
-			"hc_light": "storage.type.groovy: #185E73"
+			"dark_plus_experimental": "storage.type.groovy: #4EC9B0",
+			"hc_light": "storage.type.groovy: #185E73",
+			"light_plus_experimental": "storage.type.groovy: #267F99"
 		}
 	},
 	{
@@ -9836,7 +11474,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9848,7 +11488,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9860,7 +11502,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9872,7 +11516,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9884,7 +11530,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9896,7 +11544,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9908,7 +11558,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9920,7 +11572,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9932,7 +11586,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9944,7 +11600,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9956,7 +11614,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9968,7 +11628,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9980,7 +11642,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -9992,7 +11656,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10004,7 +11670,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -10016,7 +11684,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -10028,7 +11698,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -10040,7 +11712,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -10052,7 +11726,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -10064,7 +11740,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -10076,7 +11754,9 @@
 			"dark_vs": "punctuation.section.embedded: #569CD6",
 			"light_vs": "punctuation.section.embedded: #0000FF",
 			"hc_black": "punctuation.section.embedded: #569CD6",
-			"hc_light": "punctuation.section.embedded: #0F4A85"
+			"dark_plus_experimental": "punctuation.section.embedded: #569CD6",
+			"hc_light": "punctuation.section.embedded: #0F4A85",
+			"light_plus_experimental": "punctuation.section.embedded: #0000FF"
 		}
 	},
 	{
@@ -10088,7 +11768,9 @@
 			"dark_vs": "source.groovy.embedded: #D4D4D4",
 			"light_vs": "source.groovy.embedded: #000000",
 			"hc_black": "source.groovy.embedded: #FFFFFF",
-			"hc_light": "source.groovy.embedded: #292929"
+			"dark_plus_experimental": "source.groovy.embedded: #D4D4D4",
+			"hc_light": "source.groovy.embedded: #292929",
+			"light_plus_experimental": "source.groovy.embedded: #000000"
 		}
 	},
 	{
@@ -10100,7 +11782,9 @@
 			"dark_vs": "punctuation.section.embedded: #569CD6",
 			"light_vs": "punctuation.section.embedded: #0000FF",
 			"hc_black": "punctuation.section.embedded: #569CD6",
-			"hc_light": "punctuation.section.embedded: #0F4A85"
+			"dark_plus_experimental": "punctuation.section.embedded: #569CD6",
+			"hc_light": "punctuation.section.embedded: #0F4A85",
+			"light_plus_experimental": "punctuation.section.embedded: #0000FF"
 		}
 	},
 	{
@@ -10112,7 +11796,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -10124,7 +11810,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -10136,7 +11824,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10148,7 +11838,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10160,7 +11852,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10172,7 +11866,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10184,7 +11880,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10196,7 +11894,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10208,7 +11908,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10220,7 +11922,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10232,7 +11936,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -10244,7 +11950,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -10256,7 +11964,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -10268,7 +11978,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10280,7 +11992,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -10292,7 +12006,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -10304,7 +12020,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -10316,7 +12034,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -10328,7 +12048,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -10340,7 +12062,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.annotation.groovy: #4EC9B0",
-			"hc_light": "storage.type.annotation.groovy: #185E73"
+			"dark_plus_experimental": "storage.type.annotation.groovy: #4EC9B0",
+			"hc_light": "storage.type.annotation.groovy: #185E73",
+			"light_plus_experimental": "storage.type.annotation.groovy: #267F99"
 		}
 	},
 	{
@@ -10352,7 +12076,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.groovy: #4EC9B0",
-			"hc_light": "storage.type.groovy: #185E73"
+			"dark_plus_experimental": "storage.type.groovy: #4EC9B0",
+			"hc_light": "storage.type.groovy: #185E73",
+			"light_plus_experimental": "storage.type.groovy: #267F99"
 		}
 	},
 	{
@@ -10364,7 +12090,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10376,7 +12104,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -10388,7 +12118,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10400,7 +12132,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10412,7 +12146,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10424,7 +12160,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10436,7 +12174,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.groovy: #4EC9B0",
-			"hc_light": "storage.type.groovy: #185E73"
+			"dark_plus_experimental": "storage.type.groovy: #4EC9B0",
+			"hc_light": "storage.type.groovy: #185E73",
+			"light_plus_experimental": "storage.type.groovy: #267F99"
 		}
 	},
 	{
@@ -10448,7 +12188,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10460,7 +12202,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10472,7 +12216,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10484,7 +12230,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -10496,7 +12244,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -10508,7 +12258,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -10520,7 +12272,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10532,7 +12286,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.object.array.groovy: #4EC9B0",
-			"hc_light": "storage.type.object.array.groovy: #185E73"
+			"dark_plus_experimental": "storage.type.object.array.groovy: #4EC9B0",
+			"hc_light": "storage.type.object.array.groovy: #185E73",
+			"light_plus_experimental": "storage.type.object.array.groovy: #267F99"
 		}
 	},
 	{
@@ -10544,7 +12300,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10556,7 +12314,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10568,7 +12328,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10580,7 +12342,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10592,7 +12356,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10604,7 +12370,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10616,7 +12384,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10628,7 +12398,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10640,7 +12412,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10652,7 +12426,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10664,7 +12440,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10676,7 +12454,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10688,7 +12468,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10700,7 +12482,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10712,7 +12496,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10724,7 +12510,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.groovy: #4EC9B0",
-			"hc_light": "storage.type.groovy: #185E73"
+			"dark_plus_experimental": "storage.type.groovy: #4EC9B0",
+			"hc_light": "storage.type.groovy: #185E73",
+			"light_plus_experimental": "storage.type.groovy: #267F99"
 		}
 	},
 	{
@@ -10736,7 +12524,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10748,7 +12538,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10760,7 +12552,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10772,7 +12566,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10784,7 +12580,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10796,7 +12594,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10808,7 +12608,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10820,7 +12622,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -10832,7 +12636,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10844,7 +12650,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -10856,7 +12664,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -10868,7 +12678,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -10880,7 +12692,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10892,7 +12706,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -10904,7 +12720,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -10916,7 +12734,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -10928,7 +12748,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10940,7 +12762,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -10952,7 +12776,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -10964,7 +12790,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -10976,7 +12804,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -10988,7 +12818,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -11000,7 +12832,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.annotation.groovy: #4EC9B0",
-			"hc_light": "storage.type.annotation.groovy: #185E73"
+			"dark_plus_experimental": "storage.type.annotation.groovy: #4EC9B0",
+			"hc_light": "storage.type.annotation.groovy: #185E73",
+			"light_plus_experimental": "storage.type.annotation.groovy: #267F99"
 		}
 	},
 	{
@@ -11012,7 +12846,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.primitive.groovy: #4EC9B0",
-			"hc_light": "storage.type.primitive.groovy: #185E73"
+			"dark_plus_experimental": "storage.type.primitive.groovy: #4EC9B0",
+			"hc_light": "storage.type.primitive.groovy: #185E73",
+			"light_plus_experimental": "storage.type.primitive.groovy: #267F99"
 		}
 	},
 	{
@@ -11024,7 +12860,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11036,7 +12874,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -11048,7 +12888,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11060,7 +12902,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.primitive.groovy: #4EC9B0",
-			"hc_light": "storage.type.primitive.groovy: #185E73"
+			"dark_plus_experimental": "storage.type.primitive.groovy: #4EC9B0",
+			"hc_light": "storage.type.primitive.groovy: #185E73",
+			"light_plus_experimental": "storage.type.primitive.groovy: #267F99"
 		}
 	},
 	{
@@ -11072,7 +12916,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11084,7 +12930,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11096,7 +12944,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11108,7 +12958,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11120,7 +12972,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type.primitive.groovy: #4EC9B0",
-			"hc_light": "storage.type.primitive.groovy: #185E73"
+			"dark_plus_experimental": "storage.type.primitive.groovy: #4EC9B0",
+			"hc_light": "storage.type.primitive.groovy: #185E73",
+			"light_plus_experimental": "storage.type.primitive.groovy: #267F99"
 		}
 	},
 	{
@@ -11132,7 +12986,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11144,7 +13000,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11156,7 +13014,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11168,7 +13028,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11180,7 +13042,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11192,7 +13056,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11204,7 +13070,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11216,7 +13084,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11228,7 +13098,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11240,7 +13112,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -11252,7 +13126,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11264,7 +13140,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11276,7 +13154,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11288,7 +13168,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -11300,7 +13182,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11312,7 +13196,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -11324,7 +13210,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11336,7 +13224,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11348,7 +13238,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11360,7 +13252,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11372,7 +13266,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "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 64eaa2eef81d54..301e7ba116e1e0 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_handlebars.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_handlebars.json
@@ -8,7 +8,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -2168,7 +2528,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2180,7 +2542,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -2192,7 +2556,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2204,7 +2570,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2216,7 +2584,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2228,7 +2598,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2240,7 +2612,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -2252,7 +2626,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2264,7 +2640,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -2276,7 +2654,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2288,7 +2668,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2300,7 +2682,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "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 99d478276598d0..ecb0bf68759ebe 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_hbs.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_hbs.json
@@ -8,7 +8,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.handlebars: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.handlebars: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.constant.handlebars: #DCDCAA",
-			"hc_light": "support.constant.handlebars: #5E2CBC"
+			"dark_plus_experimental": "support.constant.handlebars: #DCDCAA",
+			"hc_light": "support.constant.handlebars: #5E2CBC",
+			"light_plus_experimental": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "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 54f5e9a8aa9974..c29d3922b8d142 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_hlsl.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_hlsl.json
@@ -8,7 +8,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.variable: #9CDCFE",
-			"hc_light": "support.variable: #001080"
+			"dark_plus_experimental": "support.variable: #9CDCFE",
+			"hc_light": "support.variable: #001080",
+			"light_plus_experimental": "support.variable: #001080"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.variable: #9CDCFE",
-			"hc_light": "support.variable: #001080"
+			"dark_plus_experimental": "support.variable: #9CDCFE",
+			"hc_light": "support.variable: #001080",
+			"light_plus_experimental": "support.variable: #001080"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 2070e202ee8723..eb5b1702ccb777 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_html.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_html.json
@@ -8,7 +8,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "support.constant.color: #0451A5",
 			"hc_black": "support.constant.color: #CE9178",
-			"hc_light": "support.constant.color: #0451A5"
+			"dark_plus_experimental": "support.constant.color: #CE9178",
+			"hc_light": "support.constant.color: #0451A5",
+			"light_plus_experimental": "support.constant.color: #0451A5"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2168,7 +2528,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2180,7 +2542,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2192,7 +2556,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2204,7 +2570,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2216,7 +2584,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2228,7 +2598,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2240,7 +2612,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2252,7 +2626,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2264,7 +2640,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2276,7 +2654,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2288,7 +2668,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2300,7 +2682,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2312,7 +2696,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2324,7 +2710,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2336,7 +2724,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2348,7 +2738,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2360,7 +2752,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2372,7 +2766,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2384,7 +2780,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2396,7 +2794,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2408,7 +2808,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2420,7 +2822,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2432,7 +2836,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2444,7 +2850,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2456,7 +2864,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2468,7 +2878,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2480,7 +2892,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2492,7 +2906,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2504,7 +2920,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2516,7 +2934,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2528,7 +2948,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2540,7 +2962,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2552,7 +2976,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2564,7 +2990,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2576,7 +3004,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2588,7 +3018,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2600,7 +3032,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2612,7 +3046,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2624,7 +3060,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2636,7 +3074,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2648,7 +3088,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2660,7 +3102,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.unquoted.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.unquoted.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.unquoted.html: #0F4A85",
+			"light_plus_experimental": "string.unquoted.html: #0000FF"
 		}
 	},
 	{
@@ -2672,7 +3116,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2684,7 +3130,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2696,7 +3144,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2708,7 +3158,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2720,7 +3172,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2732,7 +3186,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2744,7 +3200,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2756,7 +3214,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2768,7 +3228,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2780,7 +3242,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2792,7 +3256,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2804,7 +3270,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2816,7 +3284,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2828,7 +3298,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2840,7 +3312,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2852,7 +3326,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2864,7 +3340,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2876,7 +3354,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2888,7 +3368,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2900,7 +3382,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2912,7 +3396,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2924,7 +3410,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2936,7 +3424,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2948,7 +3438,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2960,7 +3452,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2972,7 +3466,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2984,7 +3480,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2996,7 +3494,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3008,7 +3508,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3020,7 +3522,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -3032,7 +3536,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3044,7 +3550,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3056,7 +3564,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3068,7 +3578,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -3080,7 +3592,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3092,7 +3606,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -3104,7 +3620,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3116,7 +3634,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3128,7 +3648,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3140,7 +3662,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3152,7 +3676,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3164,7 +3690,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3176,7 +3704,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3188,7 +3718,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -3200,7 +3732,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3212,7 +3746,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -3224,7 +3760,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3236,7 +3774,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3248,7 +3788,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3260,7 +3802,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3272,7 +3816,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3284,7 +3830,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3296,7 +3844,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -3308,7 +3858,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3320,7 +3872,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3332,7 +3886,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3344,7 +3900,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -3356,7 +3914,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3368,7 +3928,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3380,7 +3942,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3392,7 +3956,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -3404,7 +3970,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3416,7 +3984,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3428,7 +3998,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -3440,7 +4012,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3452,7 +4026,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3464,7 +4040,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -3476,7 +4054,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "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 9fb572a9404e4e..a3e58c3c7ffe5a 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_ini.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_ini.json
@@ -8,7 +8,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	}
 ]
\ 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 ef13d3d8073023..ebc08f64a62c7e 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_jl.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_jl.json
@@ -8,7 +8,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2168,7 +2528,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2180,7 +2542,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2192,7 +2556,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2204,7 +2570,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2216,7 +2584,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2228,7 +2598,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2240,7 +2612,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2252,7 +2626,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2264,7 +2640,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2276,7 +2654,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2288,7 +2668,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2300,7 +2682,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2312,7 +2696,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2324,7 +2710,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2336,7 +2724,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2348,7 +2738,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2360,7 +2752,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2372,7 +2766,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2384,7 +2780,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2396,7 +2794,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2408,7 +2808,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2420,7 +2822,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2432,7 +2836,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2444,7 +2850,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2456,7 +2864,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2468,7 +2878,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2480,7 +2892,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2492,7 +2906,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2504,7 +2920,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2516,7 +2934,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2528,7 +2948,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2540,7 +2962,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2552,7 +2976,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2564,7 +2990,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2576,7 +3004,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -2588,7 +3018,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2600,7 +3032,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2612,7 +3046,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2624,7 +3060,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2636,7 +3074,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2648,7 +3088,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2660,7 +3102,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2672,7 +3116,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2684,7 +3130,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2696,7 +3144,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2708,7 +3158,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2720,7 +3172,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2732,7 +3186,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2744,7 +3200,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2756,7 +3214,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -2768,7 +3228,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "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 8ef32f838b9a8e..b90e6e1eb11a0e 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_js.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_js.json
@@ -8,7 +8,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2168,7 +2528,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2180,7 +2542,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2192,7 +2556,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2204,7 +2570,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2216,7 +2584,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2228,7 +2598,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2240,7 +2612,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2252,7 +2626,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2264,7 +2640,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2276,7 +2654,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2288,7 +2668,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2300,7 +2682,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2312,7 +2696,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2324,7 +2710,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2336,7 +2724,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2348,7 +2738,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -2360,7 +2752,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -2372,7 +2766,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2384,7 +2780,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2396,7 +2794,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2408,7 +2808,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2420,7 +2822,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2432,7 +2836,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2444,7 +2850,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2456,7 +2864,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2468,7 +2878,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2480,7 +2892,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2492,7 +2906,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2504,7 +2920,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2516,7 +2934,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2528,7 +2948,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2540,7 +2962,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2552,7 +2976,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2564,7 +2990,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2576,7 +3004,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2588,7 +3018,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2600,7 +3032,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2612,7 +3046,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -2624,7 +3060,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -2636,7 +3074,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2648,7 +3088,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2660,7 +3102,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2672,7 +3116,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2684,7 +3130,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2696,7 +3144,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2708,7 +3158,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2720,7 +3172,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2732,7 +3186,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2744,7 +3200,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2756,7 +3214,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2768,7 +3228,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2780,7 +3242,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2792,7 +3256,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2804,7 +3270,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2816,7 +3284,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2828,7 +3298,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2840,7 +3312,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2852,7 +3326,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2864,7 +3340,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2876,7 +3354,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2888,7 +3368,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2900,7 +3382,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2912,7 +3396,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2924,7 +3410,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2936,7 +3424,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2948,7 +3438,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2960,7 +3452,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2972,7 +3466,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2984,7 +3480,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2996,7 +3494,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3008,7 +3508,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3020,7 +3522,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3032,7 +3536,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3044,7 +3550,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3056,7 +3564,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3068,7 +3578,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3080,7 +3592,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -3092,7 +3606,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3104,7 +3620,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3116,7 +3634,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3128,7 +3648,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3140,7 +3662,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3152,7 +3676,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3164,7 +3690,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3176,7 +3704,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3188,7 +3718,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3200,7 +3732,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3212,7 +3746,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3224,7 +3760,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3236,7 +3774,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3248,7 +3788,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -3260,7 +3802,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3272,7 +3816,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -3284,7 +3830,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3296,7 +3844,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3308,7 +3858,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3320,7 +3872,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3332,7 +3886,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3344,7 +3900,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3356,7 +3914,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3368,7 +3928,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3380,7 +3942,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -3392,7 +3956,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3404,7 +3970,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3416,7 +3984,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3428,7 +3998,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -3440,7 +4012,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3452,7 +4026,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3464,7 +4040,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3476,7 +4054,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3488,7 +4068,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3500,7 +4082,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3512,7 +4096,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3524,7 +4110,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3536,7 +4124,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3548,7 +4138,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3560,7 +4152,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3572,7 +4166,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -3584,7 +4180,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3596,7 +4194,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3608,7 +4208,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3620,7 +4222,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3632,7 +4236,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3644,7 +4250,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3656,7 +4264,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3668,7 +4278,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3680,7 +4292,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3692,7 +4306,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3704,7 +4320,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3716,7 +4334,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3728,7 +4348,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3740,7 +4362,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3752,7 +4376,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.variable: #9CDCFE",
-			"hc_light": "support.variable: #001080"
+			"dark_plus_experimental": "support.variable: #9CDCFE",
+			"hc_light": "support.variable: #001080",
+			"light_plus_experimental": "support.variable: #001080"
 		}
 	},
 	{
@@ -3764,7 +4390,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3776,7 +4404,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3788,7 +4418,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3800,7 +4432,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3812,7 +4446,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3824,7 +4460,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3836,7 +4474,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3848,7 +4488,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3860,7 +4502,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3872,7 +4516,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3884,7 +4530,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3896,7 +4544,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3908,7 +4558,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3920,7 +4572,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3932,7 +4586,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3944,7 +4600,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3956,7 +4614,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3968,7 +4628,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3980,7 +4642,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3992,7 +4656,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4004,7 +4670,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4016,7 +4684,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4028,7 +4698,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -4040,7 +4712,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4052,7 +4726,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -4064,7 +4740,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4076,7 +4754,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -4088,7 +4768,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4100,7 +4782,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4112,7 +4796,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4124,7 +4810,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4136,7 +4824,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4148,7 +4838,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4160,7 +4852,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -4172,7 +4866,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4184,7 +4880,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -4196,7 +4894,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4208,7 +4908,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 1019443333c8ff..d58f6fdf911cf7 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_json.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_json.json
@@ -8,7 +8,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 1b2f32d6270cf1..ab959125c27540 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_jsx.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_jsx.json
@@ -8,7 +8,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "punctuation.section.embedded: #569CD6",
 			"light_vs": "punctuation.section.embedded: #0000FF",
 			"hc_black": "punctuation.section.embedded: #569CD6",
-			"hc_light": "punctuation.section.embedded: #0F4A85"
+			"dark_plus_experimental": "punctuation.section.embedded: #569CD6",
+			"hc_light": "punctuation.section.embedded: #0F4A85",
+			"light_plus_experimental": "punctuation.section.embedded: #0000FF"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "punctuation.section.embedded: #569CD6",
 			"light_vs": "punctuation.section.embedded: #0000FF",
 			"hc_black": "punctuation.section.embedded: #569CD6",
-			"hc_light": "punctuation.section.embedded: #0F4A85"
+			"dark_plus_experimental": "punctuation.section.embedded: #569CD6",
+			"hc_light": "punctuation.section.embedded: #0F4A85",
+			"light_plus_experimental": "punctuation.section.embedded: #0000FF"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "punctuation.section.embedded: #569CD6",
 			"light_vs": "punctuation.section.embedded: #0000FF",
 			"hc_black": "punctuation.section.embedded: #569CD6",
-			"hc_light": "punctuation.section.embedded: #0F4A85"
+			"dark_plus_experimental": "punctuation.section.embedded: #569CD6",
+			"hc_light": "punctuation.section.embedded: #0F4A85",
+			"light_plus_experimental": "punctuation.section.embedded: #0000FF"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "punctuation.section.embedded: #569CD6",
 			"light_vs": "punctuation.section.embedded: #0000FF",
 			"hc_black": "punctuation.section.embedded: #569CD6",
-			"hc_light": "punctuation.section.embedded: #0F4A85"
+			"dark_plus_experimental": "punctuation.section.embedded: #569CD6",
+			"hc_light": "punctuation.section.embedded: #0F4A85",
+			"light_plus_experimental": "punctuation.section.embedded: #0000FF"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2168,7 +2528,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2180,7 +2542,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2192,7 +2556,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2204,7 +2570,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2216,7 +2584,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2228,7 +2598,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2240,7 +2612,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2252,7 +2626,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2264,7 +2640,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2276,7 +2654,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2288,7 +2668,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2300,7 +2682,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2312,7 +2696,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2324,7 +2710,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2336,7 +2724,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2348,7 +2738,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2360,7 +2752,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -2372,7 +2766,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2384,7 +2780,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2396,7 +2794,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2408,7 +2808,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2420,7 +2822,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2432,7 +2836,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2444,7 +2850,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2456,7 +2864,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2468,7 +2878,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2480,7 +2892,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2492,7 +2906,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2504,7 +2920,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2516,7 +2934,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2528,7 +2948,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2540,7 +2962,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2552,7 +2976,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2564,7 +2990,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2576,7 +3004,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2588,7 +3018,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2600,7 +3032,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2612,7 +3046,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
-]
+]
\ 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 f26403edc500c0..6c41a765b23299 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_less.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_less.json
@@ -8,7 +8,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.rgb-value: #0451A5",
 			"hc_black": "constant.other.rgb-value: #CE9178",
-			"hc_light": "constant.other.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.rgb-value: #CE9178",
+			"hc_light": "constant.other.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "entity.other.attribute-name.class.mixin.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.mixin.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.mixin.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.mixin.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.mixin.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.mixin.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.mixin.css: #800000"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "entity.other.attribute-name.class.mixin.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.mixin.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.mixin.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.mixin.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.mixin.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.mixin.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.mixin.css: #800000"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "entity.other.attribute-name.class.mixin.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.mixin.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.mixin.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.mixin.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.mixin.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.mixin.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.mixin.css: #800000"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "entity.other.attribute-name.class.mixin.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.mixin.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.mixin.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.mixin.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.mixin.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.mixin.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.mixin.css: #800000"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "source.css.less entity.other.attribute-name.id: #D7BA7D",
 			"light_vs": "source.css.less entity.other.attribute-name.id: #800000",
 			"hc_black": "source.css.less entity.other.attribute-name.id: #D7BA7D",
-			"hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85"
+			"dark_plus_experimental": "source.css.less entity.other.attribute-name.id: #D7BA7D",
+			"hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85",
+			"light_plus_experimental": "source.css.less entity.other.attribute-name.id: #800000"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "source.css.less entity.other.attribute-name.id: #D7BA7D",
 			"light_vs": "source.css.less entity.other.attribute-name.id: #800000",
 			"hc_black": "source.css.less entity.other.attribute-name.id: #D7BA7D",
-			"hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85"
+			"dark_plus_experimental": "source.css.less entity.other.attribute-name.id: #D7BA7D",
+			"hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85",
+			"light_plus_experimental": "source.css.less entity.other.attribute-name.id: #800000"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2168,7 +2528,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -2180,7 +2542,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2192,7 +2556,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2204,7 +2570,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2216,7 +2584,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2228,7 +2598,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2240,7 +2612,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -2252,7 +2626,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2264,7 +2640,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2276,7 +2654,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2288,7 +2668,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2300,7 +2682,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2312,7 +2696,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2324,7 +2710,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2336,7 +2724,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2348,7 +2738,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2360,7 +2752,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2372,7 +2766,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2384,7 +2780,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2396,7 +2794,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -2408,7 +2808,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2420,7 +2822,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2432,7 +2836,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2444,7 +2850,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2456,7 +2864,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2468,7 +2878,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2480,7 +2892,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2492,7 +2906,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2504,7 +2920,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2516,7 +2934,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -2528,7 +2948,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2540,7 +2962,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2552,7 +2976,9 @@
 			"dark_vs": "entity.other.attribute-name.parent-selector.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.parent-selector.css: #800000",
 			"hc_black": "entity.other.attribute-name.parent-selector.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.parent-selector.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.parent-selector.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.parent-selector.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.parent-selector.css: #800000"
 		}
 	},
 	{
@@ -2564,7 +2990,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-class.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000"
 		}
 	},
 	{
@@ -2576,7 +3004,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-class.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000"
 		}
 	},
 	{
@@ -2588,7 +3018,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2600,7 +3032,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2612,7 +3046,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2624,7 +3060,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2636,7 +3074,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2648,7 +3088,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2660,7 +3102,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2672,7 +3116,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -2684,7 +3130,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2696,7 +3144,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2708,7 +3158,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2720,7 +3172,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2732,7 +3186,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2744,7 +3200,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2756,7 +3214,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2768,7 +3228,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -2780,7 +3242,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -2792,7 +3256,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2804,7 +3270,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2816,7 +3284,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2828,7 +3298,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -2840,7 +3312,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2852,7 +3326,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -2864,7 +3340,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -2876,7 +3354,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2888,7 +3368,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2900,7 +3382,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.rgb-value: #0451A5",
 			"hc_black": "constant.other.rgb-value: #CE9178",
-			"hc_light": "constant.other.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.rgb-value: #CE9178",
+			"hc_light": "constant.other.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -2912,7 +3396,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2924,7 +3410,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -2936,7 +3424,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -2948,7 +3438,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2960,7 +3452,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2972,7 +3466,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.rgb-value: #0451A5",
 			"hc_black": "constant.other.rgb-value: #CE9178",
-			"hc_light": "constant.other.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.rgb-value: #CE9178",
+			"hc_light": "constant.other.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -2984,7 +3480,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2996,7 +3494,9 @@
 			"dark_vs": "source.css.less entity.other.attribute-name.id: #D7BA7D",
 			"light_vs": "source.css.less entity.other.attribute-name.id: #800000",
 			"hc_black": "source.css.less entity.other.attribute-name.id: #D7BA7D",
-			"hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85"
+			"dark_plus_experimental": "source.css.less entity.other.attribute-name.id: #D7BA7D",
+			"hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85",
+			"light_plus_experimental": "source.css.less entity.other.attribute-name.id: #800000"
 		}
 	},
 	{
@@ -3008,7 +3508,9 @@
 			"dark_vs": "source.css.less entity.other.attribute-name.id: #D7BA7D",
 			"light_vs": "source.css.less entity.other.attribute-name.id: #800000",
 			"hc_black": "source.css.less entity.other.attribute-name.id: #D7BA7D",
-			"hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85"
+			"dark_plus_experimental": "source.css.less entity.other.attribute-name.id: #D7BA7D",
+			"hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85",
+			"light_plus_experimental": "source.css.less entity.other.attribute-name.id: #800000"
 		}
 	},
 	{
@@ -3020,7 +3522,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3032,7 +3536,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3044,7 +3550,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3056,7 +3564,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3068,7 +3578,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3080,7 +3592,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3092,7 +3606,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3104,7 +3620,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -3116,7 +3634,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -3128,7 +3648,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3140,7 +3662,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3152,7 +3676,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3164,7 +3690,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3176,7 +3704,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3188,7 +3718,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3200,7 +3732,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3212,7 +3746,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3224,7 +3760,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3236,7 +3774,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3248,7 +3788,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -3260,7 +3802,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -3272,7 +3816,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3284,7 +3830,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3296,7 +3844,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3308,7 +3858,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3320,7 +3872,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3332,7 +3886,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3344,7 +3900,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -3356,7 +3914,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -3368,7 +3928,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3380,7 +3942,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3392,7 +3956,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3404,7 +3970,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3416,7 +3984,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3428,7 +3998,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3440,7 +4012,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3452,7 +4026,9 @@
 			"dark_vs": "source.css.less entity.other.attribute-name.id: #D7BA7D",
 			"light_vs": "source.css.less entity.other.attribute-name.id: #800000",
 			"hc_black": "source.css.less entity.other.attribute-name.id: #D7BA7D",
-			"hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85"
+			"dark_plus_experimental": "source.css.less entity.other.attribute-name.id: #D7BA7D",
+			"hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85",
+			"light_plus_experimental": "source.css.less entity.other.attribute-name.id: #800000"
 		}
 	},
 	{
@@ -3464,7 +4040,9 @@
 			"dark_vs": "source.css.less entity.other.attribute-name.id: #D7BA7D",
 			"light_vs": "source.css.less entity.other.attribute-name.id: #800000",
 			"hc_black": "source.css.less entity.other.attribute-name.id: #D7BA7D",
-			"hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85"
+			"dark_plus_experimental": "source.css.less entity.other.attribute-name.id: #D7BA7D",
+			"hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85",
+			"light_plus_experimental": "source.css.less entity.other.attribute-name.id: #800000"
 		}
 	},
 	{
@@ -3476,7 +4054,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3488,7 +4068,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3500,7 +4082,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3512,7 +4096,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3524,7 +4110,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3536,7 +4124,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3548,7 +4138,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3560,7 +4152,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -3572,7 +4166,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -3584,7 +4180,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3596,7 +4194,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3608,7 +4208,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3620,7 +4222,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.rgb-value: #0451A5",
 			"hc_black": "constant.other.rgb-value: #CE9178",
-			"hc_light": "constant.other.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.rgb-value: #CE9178",
+			"hc_light": "constant.other.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -3632,7 +4236,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3644,7 +4250,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3656,7 +4264,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3668,7 +4278,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3680,7 +4292,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3692,7 +4306,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3704,7 +4320,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -3716,7 +4334,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3728,7 +4348,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -3740,7 +4362,9 @@
 			"dark_vs": "variable.other.less: #9CDCFE",
 			"light_vs": "variable.other.less: #E50000",
 			"hc_black": "variable.other.less: #D4D4D4",
-			"hc_light": "variable.other.less: #264F78"
+			"dark_plus_experimental": "variable.other.less: #9CDCFE",
+			"hc_light": "variable.other.less: #264F78",
+			"light_plus_experimental": "variable.other.less: #E50000"
 		}
 	},
 	{
@@ -3752,7 +4376,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3764,7 +4390,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3776,7 +4404,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3788,7 +4418,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -3800,7 +4432,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3812,7 +4446,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3824,7 +4460,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 b653f9ba282090..f3370a0e51cf36 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_log.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_log.json
@@ -8,7 +8,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "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 47950c660065c6..c4572ee0c0dda5 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_lua.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_lua.json
@@ -8,7 +8,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 c8701b828d9784..5e5e61a0cf537a 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_m.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_m.json
@@ -8,7 +8,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2168,7 +2528,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2180,7 +2542,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -2192,7 +2556,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2204,7 +2570,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2216,7 +2584,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2228,7 +2598,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2240,7 +2612,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2252,7 +2626,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2264,7 +2640,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2276,7 +2654,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2288,7 +2668,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -2300,7 +2682,9 @@
 			"dark_vs": "keyword.operator.minus.exponent: #B5CEA8",
 			"light_vs": "keyword.operator.minus.exponent: #098658",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator.minus.exponent: #096D48"
+			"dark_plus_experimental": "keyword.operator.minus.exponent: #B5CEA8",
+			"hc_light": "keyword.operator.minus.exponent: #096D48",
+			"light_plus_experimental": "keyword.operator.minus.exponent: #098658"
 		}
 	},
 	{
@@ -2312,7 +2696,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2324,7 +2710,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2336,7 +2724,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2348,7 +2738,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2360,7 +2752,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2372,7 +2766,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2384,7 +2780,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2396,7 +2794,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2408,7 +2808,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2420,7 +2822,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2432,7 +2836,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2444,7 +2850,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2456,7 +2864,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2468,7 +2878,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2480,7 +2892,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2492,7 +2906,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2504,7 +2920,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2516,7 +2934,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2528,7 +2948,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2540,7 +2962,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2552,7 +2976,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2564,7 +2990,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2576,7 +3004,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2588,7 +3018,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2600,7 +3032,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2612,7 +3046,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2624,7 +3060,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2636,7 +3074,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2648,7 +3088,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2660,7 +3102,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2672,7 +3116,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2684,7 +3130,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2696,7 +3144,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2708,7 +3158,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2720,7 +3172,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2732,7 +3186,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2744,7 +3200,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2756,7 +3214,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2768,7 +3228,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2780,7 +3242,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2792,7 +3256,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2804,7 +3270,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2816,7 +3284,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2828,7 +3298,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2840,7 +3312,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2852,7 +3326,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2864,7 +3340,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -2876,7 +3354,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2888,7 +3368,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2900,7 +3382,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2912,7 +3396,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2924,7 +3410,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2936,7 +3424,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2948,7 +3438,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2960,7 +3452,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2972,7 +3466,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2984,7 +3480,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2996,7 +3494,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3008,7 +3508,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -3020,7 +3522,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3032,7 +3536,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3044,7 +3550,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3056,7 +3564,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3068,7 +3578,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3080,7 +3592,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3092,7 +3606,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -3104,7 +3620,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3116,7 +3634,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -3128,7 +3648,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3140,7 +3662,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3152,7 +3676,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3164,7 +3690,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3176,7 +3704,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3188,7 +3718,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -3200,7 +3732,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -3212,7 +3746,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3224,7 +3760,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3236,7 +3774,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3248,7 +3788,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3260,7 +3802,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3272,7 +3816,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3284,7 +3830,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -3296,7 +3844,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -3308,7 +3858,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3320,7 +3872,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3332,7 +3886,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3344,7 +3900,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3356,7 +3914,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3368,7 +3928,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3380,7 +3942,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3392,7 +3956,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3404,7 +3970,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3416,7 +3984,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3428,7 +3998,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3440,7 +4012,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3452,7 +4026,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3464,7 +4040,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3476,7 +4054,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3488,7 +4068,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3500,7 +4082,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3512,7 +4096,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3524,7 +4110,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -3536,7 +4124,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3548,7 +4138,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3560,7 +4152,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -3572,7 +4166,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	}
 ]
\ 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 78de60b2f92b9c..e4d1ddbc2a5720 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_md.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_md.json
@@ -8,7 +8,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.single.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.single.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.single.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.html: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.html: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.html: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "punctuation.definition.list.begin.markdown: #6796E6",
 			"light_vs": "punctuation.definition.list.begin.markdown: #0451A5",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5"
+			"dark_plus_experimental": "punctuation.definition.list.begin.markdown: #6796E6",
+			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5",
+			"light_plus_experimental": "punctuation.definition.list.begin.markdown: #0451A5"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "punctuation.definition.list.begin.markdown: #6796E6",
 			"light_vs": "punctuation.definition.list.begin.markdown: #0451A5",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5"
+			"dark_plus_experimental": "punctuation.definition.list.begin.markdown: #6796E6",
+			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5",
+			"light_plus_experimental": "punctuation.definition.list.begin.markdown: #0451A5"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "punctuation.definition.list.begin.markdown: #6796E6",
 			"light_vs": "punctuation.definition.list.begin.markdown: #0451A5",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5"
+			"dark_plus_experimental": "punctuation.definition.list.begin.markdown: #6796E6",
+			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5",
+			"light_plus_experimental": "punctuation.definition.list.begin.markdown: #0451A5"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "punctuation.definition.list.begin.markdown: #6796E6",
 			"light_vs": "punctuation.definition.list.begin.markdown: #0451A5",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5"
+			"dark_plus_experimental": "punctuation.definition.list.begin.markdown: #6796E6",
+			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5",
+			"light_plus_experimental": "punctuation.definition.list.begin.markdown: #0451A5"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "markup.inline.raw: #CE9178",
 			"light_vs": "markup.inline.raw: #800000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.inline.raw: #0F4A85"
+			"dark_plus_experimental": "markup.inline.raw: #CE9178",
+			"hc_light": "markup.inline.raw: #0F4A85",
+			"light_plus_experimental": "markup.inline.raw: #800000"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "markup.inline.raw: #CE9178",
 			"light_vs": "markup.inline.raw: #800000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.inline.raw: #0F4A85"
+			"dark_plus_experimental": "markup.inline.raw: #CE9178",
+			"hc_light": "markup.inline.raw: #0F4A85",
+			"light_plus_experimental": "markup.inline.raw: #800000"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "markup.inline.raw: #CE9178",
 			"light_vs": "markup.inline.raw: #800000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.inline.raw: #0F4A85"
+			"dark_plus_experimental": "markup.inline.raw: #CE9178",
+			"hc_light": "markup.inline.raw: #0F4A85",
+			"light_plus_experimental": "markup.inline.raw: #800000"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "punctuation.definition.quote.begin.markdown: #6A9955",
 			"light_vs": "punctuation.definition.quote.begin.markdown: #0451A5",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "punctuation.definition.quote.begin.markdown: #0451A5"
+			"dark_plus_experimental": "punctuation.definition.quote.begin.markdown: #6A9955",
+			"hc_light": "punctuation.definition.quote.begin.markdown: #0451A5",
+			"light_plus_experimental": "punctuation.definition.quote.begin.markdown: #0451A5"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "punctuation.definition.quote.begin.markdown: #6A9955",
 			"light_vs": "punctuation.definition.quote.begin.markdown: #0451A5",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "punctuation.definition.quote.begin.markdown: #0451A5"
+			"dark_plus_experimental": "punctuation.definition.quote.begin.markdown: #6A9955",
+			"hc_light": "punctuation.definition.quote.begin.markdown: #0451A5",
+			"light_plus_experimental": "punctuation.definition.quote.begin.markdown: #0451A5"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "punctuation.definition.quote.begin.markdown: #6A9955",
 			"light_vs": "punctuation.definition.quote.begin.markdown: #0451A5",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "punctuation.definition.quote.begin.markdown: #0451A5"
+			"dark_plus_experimental": "punctuation.definition.quote.begin.markdown: #6A9955",
+			"hc_light": "punctuation.definition.quote.begin.markdown: #0451A5",
+			"light_plus_experimental": "punctuation.definition.quote.begin.markdown: #0451A5"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "punctuation.definition.list.begin.markdown: #6796E6",
 			"light_vs": "punctuation.definition.list.begin.markdown: #0451A5",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5"
+			"dark_plus_experimental": "punctuation.definition.list.begin.markdown: #6796E6",
+			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5",
+			"light_plus_experimental": "punctuation.definition.list.begin.markdown: #0451A5"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "punctuation.definition.quote.begin.markdown: #6A9955",
 			"light_vs": "punctuation.definition.quote.begin.markdown: #0451A5",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "punctuation.definition.quote.begin.markdown: #0451A5"
+			"dark_plus_experimental": "punctuation.definition.quote.begin.markdown: #6A9955",
+			"hc_light": "punctuation.definition.quote.begin.markdown: #0451A5",
+			"light_plus_experimental": "punctuation.definition.quote.begin.markdown: #0451A5"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "punctuation.definition.list.begin.markdown: #6796E6",
 			"light_vs": "punctuation.definition.list.begin.markdown: #0451A5",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5"
+			"dark_plus_experimental": "punctuation.definition.list.begin.markdown: #6796E6",
+			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5",
+			"light_plus_experimental": "punctuation.definition.list.begin.markdown: #0451A5"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "punctuation.definition.list.begin.markdown: #6796E6",
 			"light_vs": "punctuation.definition.list.begin.markdown: #0451A5",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5"
+			"dark_plus_experimental": "punctuation.definition.list.begin.markdown: #6796E6",
+			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5",
+			"light_plus_experimental": "punctuation.definition.list.begin.markdown: #0451A5"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2168,7 +2528,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2180,7 +2542,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2192,7 +2556,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -2204,7 +2570,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -2216,7 +2584,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -2228,7 +2598,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2240,7 +2612,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2252,7 +2626,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2264,7 +2640,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2276,7 +2654,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2288,7 +2668,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2300,7 +2682,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2312,7 +2696,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2324,7 +2710,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2336,7 +2724,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2348,7 +2738,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2360,7 +2752,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2372,7 +2766,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2384,7 +2780,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -2396,7 +2794,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -2408,7 +2808,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -2420,7 +2822,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -2432,7 +2836,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -2444,7 +2850,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2456,7 +2864,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2468,7 +2878,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2480,7 +2892,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2492,7 +2906,9 @@
 			"dark_vs": "punctuation.definition.list.begin.markdown: #6796E6",
 			"light_vs": "punctuation.definition.list.begin.markdown: #0451A5",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5"
+			"dark_plus_experimental": "punctuation.definition.list.begin.markdown: #6796E6",
+			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5",
+			"light_plus_experimental": "punctuation.definition.list.begin.markdown: #0451A5"
 		}
 	},
 	{
@@ -2504,7 +2920,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2516,7 +2934,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2528,7 +2948,9 @@
 			"dark_vs": "punctuation.definition.list.begin.markdown: #6796E6",
 			"light_vs": "punctuation.definition.list.begin.markdown: #0451A5",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5"
+			"dark_plus_experimental": "punctuation.definition.list.begin.markdown: #6796E6",
+			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5",
+			"light_plus_experimental": "punctuation.definition.list.begin.markdown: #0451A5"
 		}
 	},
 	{
@@ -2540,7 +2962,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2552,7 +2976,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2564,7 +2990,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -2576,7 +3004,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -2588,7 +3018,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -2600,7 +3032,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -2612,7 +3046,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -2624,7 +3060,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2636,7 +3074,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2648,7 +3088,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2660,7 +3102,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2672,7 +3116,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2684,7 +3130,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2696,7 +3144,9 @@
 			"dark_vs": "punctuation.definition.list.begin.markdown: #6796E6",
 			"light_vs": "punctuation.definition.list.begin.markdown: #0451A5",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5"
+			"dark_plus_experimental": "punctuation.definition.list.begin.markdown: #6796E6",
+			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5",
+			"light_plus_experimental": "punctuation.definition.list.begin.markdown: #0451A5"
 		}
 	},
 	{
@@ -2708,7 +3158,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2720,7 +3172,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2732,7 +3186,9 @@
 			"dark_vs": "punctuation.definition.list.begin.markdown: #6796E6",
 			"light_vs": "punctuation.definition.list.begin.markdown: #0451A5",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5"
+			"dark_plus_experimental": "punctuation.definition.list.begin.markdown: #6796E6",
+			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5",
+			"light_plus_experimental": "punctuation.definition.list.begin.markdown: #0451A5"
 		}
 	},
 	{
@@ -2744,7 +3200,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2756,7 +3214,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2768,7 +3228,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2780,7 +3242,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2792,7 +3256,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2804,7 +3270,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2816,7 +3284,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2828,7 +3298,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2840,7 +3312,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2852,7 +3326,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2864,7 +3340,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 aee94b431d0b47..5a789191c64e24 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_mm.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_mm.json
@@ -8,7 +8,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "meta.preprocessor: #569CD6",
-			"hc_light": "meta.preprocessor: #0F4A85"
+			"dark_plus_experimental": "meta.preprocessor: #569CD6",
+			"hc_light": "meta.preprocessor: #0F4A85",
+			"light_plus_experimental": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2168,7 +2528,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2180,7 +2542,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2192,7 +2556,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2204,7 +2570,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2216,7 +2584,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -2228,7 +2598,9 @@
 			"dark_vs": "keyword.operator.minus.exponent: #B5CEA8",
 			"light_vs": "keyword.operator.minus.exponent: #098658",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator.minus.exponent: #096D48"
+			"dark_plus_experimental": "keyword.operator.minus.exponent: #B5CEA8",
+			"hc_light": "keyword.operator.minus.exponent: #096D48",
+			"light_plus_experimental": "keyword.operator.minus.exponent: #098658"
 		}
 	},
 	{
@@ -2240,7 +2612,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2252,7 +2626,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2264,7 +2640,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2276,7 +2654,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2288,7 +2668,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2300,7 +2682,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2312,7 +2696,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2324,7 +2710,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2336,7 +2724,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2348,7 +2738,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2360,7 +2752,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2372,7 +2766,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2384,7 +2780,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2396,7 +2794,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2408,7 +2808,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2420,7 +2822,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2432,7 +2836,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2444,7 +2850,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2456,7 +2864,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2468,7 +2878,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2480,7 +2892,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -2492,7 +2906,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2504,7 +2920,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2516,7 +2934,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2528,7 +2948,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2540,7 +2962,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2552,7 +2976,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2564,7 +2990,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2576,7 +3004,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2588,7 +3018,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2600,7 +3032,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2612,7 +3046,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2624,7 +3060,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2636,7 +3074,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2648,7 +3088,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2660,7 +3102,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2672,7 +3116,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2684,7 +3130,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2696,7 +3144,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2708,7 +3158,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2720,7 +3172,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2732,7 +3186,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2744,7 +3200,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2756,7 +3214,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -2768,7 +3228,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2780,7 +3242,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2792,7 +3256,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2804,7 +3270,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2816,7 +3284,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2828,7 +3298,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2840,7 +3312,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2852,7 +3326,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2864,7 +3340,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2876,7 +3354,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -2888,7 +3368,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2900,7 +3382,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2912,7 +3396,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2924,7 +3410,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2936,7 +3424,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2948,7 +3438,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2960,7 +3452,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -2972,7 +3466,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2984,7 +3480,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2996,7 +3494,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3008,7 +3508,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3020,7 +3522,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3032,7 +3536,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3044,7 +3550,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3056,7 +3564,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3068,7 +3578,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3080,7 +3592,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3092,7 +3606,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3104,7 +3620,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3116,7 +3634,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3128,7 +3648,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3140,7 +3662,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3152,7 +3676,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3164,7 +3690,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3176,7 +3704,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3188,7 +3718,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3200,7 +3732,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3212,7 +3746,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3224,7 +3760,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3236,7 +3774,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3248,7 +3788,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3260,7 +3802,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3272,7 +3816,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3284,7 +3830,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3296,7 +3844,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3308,7 +3858,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3320,7 +3872,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3332,7 +3886,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3344,7 +3900,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -3356,7 +3914,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3368,7 +3928,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3380,7 +3942,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -3392,7 +3956,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	}
 ]
\ 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 42526607776421..ae841ad36c907f 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_php.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_php.json
@@ -8,7 +8,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "punctuation.section.embedded.begin.php: #569CD6",
 			"light_vs": "punctuation.section.embedded.begin.php: #800000",
 			"hc_black": "punctuation.section.embedded: #569CD6",
-			"hc_light": "punctuation.section.embedded.begin.php: #0F4A85"
+			"dark_plus_experimental": "punctuation.section.embedded.begin.php: #569CD6",
+			"hc_light": "punctuation.section.embedded.begin.php: #0F4A85",
+			"light_plus_experimental": "punctuation.section.embedded.begin.php: #800000"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2168,7 +2528,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2180,7 +2542,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2192,7 +2556,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2204,7 +2570,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2216,7 +2584,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2228,7 +2598,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2240,7 +2612,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2252,7 +2626,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2264,7 +2640,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2276,7 +2654,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2288,7 +2668,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2300,7 +2682,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2312,7 +2696,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2324,7 +2710,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2336,7 +2724,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2348,7 +2738,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2360,7 +2752,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2372,7 +2766,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2384,7 +2780,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2396,7 +2794,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2408,7 +2808,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2420,7 +2822,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2432,7 +2836,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2444,7 +2850,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2456,7 +2864,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2468,7 +2878,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2480,7 +2892,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2492,7 +2906,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2504,7 +2920,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2516,7 +2934,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2528,7 +2948,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2540,7 +2962,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2552,7 +2976,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2564,7 +2990,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2576,7 +3004,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2588,7 +3018,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2600,7 +3032,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2612,7 +3046,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2624,7 +3060,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2636,7 +3074,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2648,7 +3088,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2660,7 +3102,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2672,7 +3116,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2684,7 +3130,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2696,7 +3144,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2708,7 +3158,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2720,7 +3172,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2732,7 +3186,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2744,7 +3200,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2756,7 +3214,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2768,7 +3228,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2780,7 +3242,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2792,7 +3256,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2804,7 +3270,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2816,7 +3284,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2828,7 +3298,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2840,7 +3312,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2852,7 +3326,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2864,7 +3340,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2876,7 +3354,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2888,7 +3368,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2900,7 +3382,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2912,7 +3396,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2924,7 +3410,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2936,7 +3424,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2948,7 +3438,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2960,7 +3452,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2972,7 +3466,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2984,7 +3480,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2996,7 +3494,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3008,7 +3508,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3020,7 +3522,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3032,7 +3536,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3044,7 +3550,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3056,7 +3564,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3068,7 +3578,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3080,7 +3592,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3092,7 +3606,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3104,7 +3620,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3116,7 +3634,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3128,7 +3648,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3140,7 +3662,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3152,7 +3676,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3164,7 +3690,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3176,7 +3704,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3188,7 +3718,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3200,7 +3732,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3212,7 +3746,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3224,7 +3760,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3236,7 +3774,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3248,7 +3788,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3260,7 +3802,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3272,7 +3816,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3284,7 +3830,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3296,7 +3844,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3308,7 +3858,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3320,7 +3872,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3332,7 +3886,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3344,7 +3900,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3356,7 +3914,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3368,7 +3928,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3380,7 +3942,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3392,7 +3956,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3404,7 +3970,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3416,7 +3984,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3428,7 +3998,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3440,7 +4012,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3452,7 +4026,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3464,7 +4040,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3476,7 +4054,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3488,7 +4068,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3500,7 +4082,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3512,7 +4096,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3524,7 +4110,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -3536,7 +4124,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3548,7 +4138,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3560,7 +4152,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3572,7 +4166,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3584,7 +4180,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3596,7 +4194,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3608,7 +4208,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3620,7 +4222,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3632,7 +4236,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3644,7 +4250,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3656,7 +4264,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3668,7 +4278,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3680,7 +4292,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3692,7 +4306,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3704,7 +4320,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3716,7 +4334,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3728,7 +4348,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3740,7 +4362,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3752,7 +4376,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3764,7 +4390,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3776,7 +4404,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3788,7 +4418,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -3800,7 +4432,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3812,7 +4446,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -3824,7 +4460,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3836,7 +4474,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3848,7 +4488,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3860,7 +4502,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "meta.embedded: #FFFFFF",
-			"hc_light": "meta.embedded: #292929"
+			"dark_plus_experimental": "meta.embedded: #D4D4D4",
+			"hc_light": "meta.embedded: #292929",
+			"light_plus_experimental": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3872,7 +4516,9 @@
 			"dark_vs": "punctuation.section.embedded.end.php: #569CD6",
 			"light_vs": "punctuation.section.embedded.end.php: #800000",
 			"hc_black": "punctuation.section.embedded: #569CD6",
-			"hc_light": "punctuation.section.embedded.end.php: #0F4A85"
+			"dark_plus_experimental": "punctuation.section.embedded.end.php: #569CD6",
+			"hc_light": "punctuation.section.embedded.end.php: #0F4A85",
+			"light_plus_experimental": "punctuation.section.embedded.end.php: #800000"
 		}
 	},
 	{
@@ -3884,7 +4530,9 @@
 			"dark_vs": "punctuation.section.embedded.end.php: #569CD6",
 			"light_vs": "punctuation.section.embedded.end.php: #800000",
 			"hc_black": "punctuation.section.embedded: #569CD6",
-			"hc_light": "punctuation.section.embedded.end.php: #0F4A85"
+			"dark_plus_experimental": "punctuation.section.embedded.end.php: #569CD6",
+			"hc_light": "punctuation.section.embedded.end.php: #0F4A85",
+			"light_plus_experimental": "punctuation.section.embedded.end.php: #800000"
 		}
 	},
 	{
@@ -3896,7 +4544,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3908,7 +4558,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -3920,7 +4572,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3932,7 +4586,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3944,7 +4600,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -3956,7 +4614,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "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 eb8ab4a045020b..077c6cf827e3a9 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_pl.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_pl.json
@@ -8,7 +8,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2168,7 +2528,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2180,7 +2542,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2192,7 +2556,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -2204,7 +2570,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2216,7 +2584,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2228,7 +2598,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2240,7 +2612,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2252,7 +2626,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2264,7 +2640,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2276,7 +2654,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2288,7 +2668,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2300,7 +2682,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2312,7 +2696,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2324,7 +2710,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2336,7 +2724,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2348,7 +2738,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2360,7 +2752,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2372,7 +2766,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2384,7 +2780,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2396,7 +2794,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2408,7 +2808,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2420,7 +2822,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2432,7 +2836,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2444,7 +2850,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2456,7 +2864,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2468,7 +2878,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2480,7 +2892,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2492,7 +2906,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -2504,7 +2920,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2516,7 +2934,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 309ee15fa4b91d..9779407bd23352 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_ps1.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_ps1.json
@@ -8,7 +8,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "source.powershell variable.other.member: #DCDCAA",
-			"hc_light": "source.powershell variable.other.member: #5E2CBC"
+			"dark_plus_experimental": "source.powershell variable.other.member: #DCDCAA",
+			"hc_light": "source.powershell variable.other.member: #5E2CBC",
+			"light_plus_experimental": "source.powershell variable.other.member: #795E26"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.variable: #9CDCFE",
-			"hc_light": "support.variable: #001080"
+			"dark_plus_experimental": "support.variable: #9CDCFE",
+			"hc_light": "support.variable: #001080",
+			"light_plus_experimental": "support.variable: #001080"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.variable: #9CDCFE",
-			"hc_light": "support.variable: #001080"
+			"dark_plus_experimental": "support.variable: #9CDCFE",
+			"hc_light": "support.variable: #001080",
+			"light_plus_experimental": "support.variable: #001080"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.variable: #9CDCFE",
-			"hc_light": "support.variable: #001080"
+			"dark_plus_experimental": "support.variable: #9CDCFE",
+			"hc_light": "support.variable: #001080",
+			"light_plus_experimental": "support.variable: #001080"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.variable: #9CDCFE",
-			"hc_light": "support.variable: #001080"
+			"dark_plus_experimental": "support.variable: #9CDCFE",
+			"hc_light": "support.variable: #001080",
+			"light_plus_experimental": "support.variable: #001080"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.variable: #9CDCFE",
-			"hc_light": "support.variable: #001080"
+			"dark_plus_experimental": "support.variable: #9CDCFE",
+			"hc_light": "support.variable: #001080",
+			"light_plus_experimental": "support.variable: #001080"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.variable: #9CDCFE",
-			"hc_light": "support.variable: #001080"
+			"dark_plus_experimental": "support.variable: #9CDCFE",
+			"hc_light": "support.variable: #001080",
+			"light_plus_experimental": "support.variable: #001080"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.variable: #9CDCFE",
-			"hc_light": "support.variable: #001080"
+			"dark_plus_experimental": "support.variable: #9CDCFE",
+			"hc_light": "support.variable: #001080",
+			"light_plus_experimental": "support.variable: #001080"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.variable: #9CDCFE",
-			"hc_light": "support.variable: #001080"
+			"dark_plus_experimental": "support.variable: #9CDCFE",
+			"hc_light": "support.variable: #001080",
+			"light_plus_experimental": "support.variable: #001080"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.variable: #9CDCFE",
-			"hc_light": "support.variable: #001080"
+			"dark_plus_experimental": "support.variable: #9CDCFE",
+			"hc_light": "support.variable: #001080",
+			"light_plus_experimental": "support.variable: #001080"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.variable: #9CDCFE",
-			"hc_light": "support.variable: #001080"
+			"dark_plus_experimental": "support.variable: #9CDCFE",
+			"hc_light": "support.variable: #001080",
+			"light_plus_experimental": "support.variable: #001080"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2168,7 +2528,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2180,7 +2542,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2192,7 +2556,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2204,7 +2570,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2216,7 +2584,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2228,7 +2598,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2240,7 +2612,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.variable: #9CDCFE",
-			"hc_light": "support.variable: #001080"
+			"dark_plus_experimental": "support.variable: #9CDCFE",
+			"hc_light": "support.variable: #001080",
+			"light_plus_experimental": "support.variable: #001080"
 		}
 	},
 	{
@@ -2252,7 +2626,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2264,7 +2640,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2276,7 +2654,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2288,7 +2668,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2300,7 +2682,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2312,7 +2696,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2324,7 +2710,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2336,7 +2724,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2348,7 +2738,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2360,7 +2752,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2372,7 +2766,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2384,7 +2780,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.variable: #9CDCFE",
-			"hc_light": "support.variable: #001080"
+			"dark_plus_experimental": "support.variable: #9CDCFE",
+			"hc_light": "support.variable: #001080",
+			"light_plus_experimental": "support.variable: #001080"
 		}
 	},
 	{
@@ -2396,7 +2794,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2408,7 +2808,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2420,7 +2822,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2432,7 +2836,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2444,7 +2850,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2456,7 +2864,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -2468,7 +2878,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2480,7 +2892,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2492,7 +2906,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2504,7 +2920,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2516,7 +2934,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2528,7 +2948,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "support.variable: #9CDCFE",
-			"hc_light": "support.variable: #001080"
+			"dark_plus_experimental": "support.variable: #9CDCFE",
+			"hc_light": "support.variable: #001080",
+			"light_plus_experimental": "support.variable: #001080"
 		}
 	},
 	{
@@ -2540,7 +2962,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2552,7 +2976,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2564,7 +2990,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2576,7 +3004,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2588,7 +3018,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2600,7 +3032,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2612,7 +3046,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2624,7 +3060,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2636,7 +3074,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2648,7 +3088,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2660,7 +3102,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2672,7 +3116,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2684,7 +3130,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2696,7 +3144,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2708,7 +3158,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2720,7 +3172,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2732,7 +3186,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2744,7 +3200,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2756,7 +3214,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2768,7 +3228,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2780,7 +3242,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2792,7 +3256,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2804,7 +3270,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2816,7 +3284,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2828,7 +3298,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2840,7 +3312,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2852,7 +3326,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2864,7 +3340,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2876,7 +3354,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2888,7 +3368,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2900,7 +3382,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2912,7 +3396,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2924,7 +3410,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2936,7 +3424,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2948,7 +3438,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2960,7 +3452,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2972,7 +3466,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2984,7 +3480,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2996,7 +3494,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.variable: #9CDCFE",
-			"hc_light": "support.variable: #001080"
+			"dark_plus_experimental": "support.variable: #9CDCFE",
+			"hc_light": "support.variable: #001080",
+			"light_plus_experimental": "support.variable: #001080"
 		}
 	},
 	{
@@ -3008,7 +3508,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3020,7 +3522,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3032,7 +3536,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3044,7 +3550,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3056,7 +3564,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3068,7 +3578,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3080,7 +3592,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -3092,7 +3606,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3104,7 +3620,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3116,7 +3634,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3128,7 +3648,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3140,7 +3662,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3152,7 +3676,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 e0e47e6d326cdf..b7fc27c1bcd32c 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_pug.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_pug.json
@@ -8,7 +8,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.comment.buffered.block.pug: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.comment.buffered.block.pug: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.comment.buffered.block.pug: #0F4A85",
+			"light_plus_experimental": "string.comment.buffered.block.pug: #0000FF"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.comment.buffered.block.pug: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.comment.buffered.block.pug: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.comment.buffered.block.pug: #0F4A85",
+			"light_plus_experimental": "string.comment.buffered.block.pug: #0000FF"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.comment.buffered.block.pug: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.comment.buffered.block.pug: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.comment.buffered.block.pug: #0F4A85",
+			"light_plus_experimental": "string.comment.buffered.block.pug: #0000FF"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.pug: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.pug: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.pug: #0F4A85",
+			"light_plus_experimental": "string.quoted.pug: #0000FF"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.pug: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.pug: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.pug: #0F4A85",
+			"light_plus_experimental": "string.quoted.pug: #0000FF"
 		}
 	},
 	{
@@ -248,19 +288,23 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": ".",
-		"t": "text.pug",
+		"t": "text.pug storage.type.function.pug.dot-block-dot",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.pug: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.pug: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.pug: #0F4A85",
+			"light_plus_experimental": "string.quoted.pug: #0000FF"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.pug: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.pug: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.pug: #0F4A85",
+			"light_plus_experimental": "string.quoted.pug: #0000FF"
 		}
 	},
 	{
@@ -572,19 +666,23 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": ".",
-		"t": "text.pug",
+		"t": "text.pug storage.type.function.pug.dot-block-dot",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "meta.object-literal.key: #9CDCFE",
-			"hc_light": "meta.object-literal.key: #001080"
+			"dark_plus_experimental": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_plus_experimental": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.comment.buffered.block.pug: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.comment.buffered.block.pug: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.comment.buffered.block.pug: #0F4A85",
+			"light_plus_experimental": "string.comment.buffered.block.pug: #0000FF"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1004,19 +1170,23 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
 		"c": ".",
-		"t": "text.pug",
+		"t": "text.pug storage.type.function.pug.dot-block-dot",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.interpolated.pug: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.interpolated.pug: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.interpolated.pug: #0F4A85",
+			"light_plus_experimental": "string.interpolated.pug: #0000FF"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.interpolated.pug: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.interpolated.pug: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.interpolated.pug: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.interpolated.pug: #0F4A85",
+			"light_plus_experimental": "string.interpolated.pug: #0000FF"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.interpolated.pug: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.interpolated.pug: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.interpolated.pug: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.interpolated.pug: #0F4A85",
+			"light_plus_experimental": "string.interpolated.pug: #0000FF"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.pug: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.pug: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.pug: #0F4A85",
+			"light_plus_experimental": "string.quoted.pug: #0000FF"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.pug: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.pug: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.pug: #0F4A85",
+			"light_plus_experimental": "string.quoted.pug: #0000FF"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.pug: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.pug: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.pug: #0F4A85",
+			"light_plus_experimental": "string.quoted.pug: #0000FF"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.pug: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.pug: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.pug: #0F4A85",
+			"light_plus_experimental": "string.quoted.pug: #0000FF"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.pug: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.pug: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.pug: #0F4A85",
+			"light_plus_experimental": "string.quoted.pug: #0000FF"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.pug: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.pug: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.pug: #0F4A85",
+			"light_plus_experimental": "string.quoted.pug: #0000FF"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.pug: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.pug: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.pug: #0F4A85",
+			"light_plus_experimental": "string.quoted.pug: #0000FF"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.pug: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.pug: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.pug: #0F4A85",
+			"light_plus_experimental": "string.quoted.pug: #0000FF"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.pug: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.pug: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.pug: #0F4A85",
+			"light_plus_experimental": "string.quoted.pug: #0000FF"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
-]
+]
\ 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 ee1e9c84aa71a4..cb15d3dcb1a0bb 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_r.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_r.json
@@ -8,7 +8,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 f2c3076501ae16..f3337b450d56c4 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_rb.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_rb.json
@@ -8,7 +8,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.other.inherited-class: #4EC9B0",
-			"hc_light": "entity.other.inherited-class: #185E73"
+			"dark_plus_experimental": "entity.other.inherited-class: #4EC9B0",
+			"hc_light": "entity.other.inherited-class: #185E73",
+			"light_plus_experimental": "entity.other.inherited-class: #267F99"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.other.inherited-class: #4EC9B0",
-			"hc_light": "entity.other.inherited-class: #185E73"
+			"dark_plus_experimental": "entity.other.inherited-class: #4EC9B0",
+			"hc_light": "entity.other.inherited-class: #185E73",
+			"light_plus_experimental": "entity.other.inherited-class: #267F99"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.other.inherited-class: #4EC9B0",
-			"hc_light": "entity.other.inherited-class: #185E73"
+			"dark_plus_experimental": "entity.other.inherited-class: #4EC9B0",
+			"hc_light": "entity.other.inherited-class: #185E73",
+			"light_plus_experimental": "entity.other.inherited-class: #267F99"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.other.inherited-class: #4EC9B0",
-			"hc_light": "entity.other.inherited-class: #185E73"
+			"dark_plus_experimental": "entity.other.inherited-class: #4EC9B0",
+			"hc_light": "entity.other.inherited-class: #185E73",
+			"light_plus_experimental": "entity.other.inherited-class: #267F99"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.other.inherited-class: #4EC9B0",
-			"hc_light": "entity.other.inherited-class: #185E73"
+			"dark_plus_experimental": "entity.other.inherited-class: #4EC9B0",
+			"hc_light": "entity.other.inherited-class: #185E73",
+			"light_plus_experimental": "entity.other.inherited-class: #267F99"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable.other.constant: #02715D"
+			"dark_plus_experimental": "variable.other.constant: #4FC1FF",
+			"hc_light": "variable.other.constant: #02715D",
+			"light_plus_experimental": "variable.other.constant: #0070C1"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable.other.constant: #02715D"
+			"dark_plus_experimental": "variable.other.constant: #4FC1FF",
+			"hc_light": "variable.other.constant: #02715D",
+			"light_plus_experimental": "variable.other.constant: #0070C1"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable.other.constant: #02715D"
+			"dark_plus_experimental": "variable.other.constant: #4FC1FF",
+			"hc_light": "variable.other.constant: #02715D",
+			"light_plus_experimental": "variable.other.constant: #0070C1"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable.other.constant: #02715D"
+			"dark_plus_experimental": "variable.other.constant: #4FC1FF",
+			"hc_light": "variable.other.constant: #02715D",
+			"light_plus_experimental": "variable.other.constant: #0070C1"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable.other.constant: #02715D"
+			"dark_plus_experimental": "variable.other.constant: #4FC1FF",
+			"hc_light": "variable.other.constant: #02715D",
+			"light_plus_experimental": "variable.other.constant: #0070C1"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2168,7 +2528,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2180,7 +2542,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2192,7 +2556,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2204,7 +2570,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2216,7 +2584,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2228,7 +2598,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2240,7 +2612,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2252,7 +2626,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2264,7 +2640,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2276,7 +2654,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2288,7 +2668,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -2300,7 +2682,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2312,7 +2696,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2324,7 +2710,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2336,7 +2724,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -2348,7 +2738,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2360,7 +2752,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2372,7 +2766,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2384,7 +2780,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2396,7 +2794,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2408,7 +2808,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2420,7 +2822,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2432,7 +2836,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2444,7 +2850,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2456,7 +2864,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2468,7 +2878,9 @@
 			"dark_vs": "punctuation.section.embedded: #569CD6",
 			"light_vs": "punctuation.section.embedded: #0000FF",
 			"hc_black": "punctuation.section.embedded: #569CD6",
-			"hc_light": "punctuation.section.embedded: #0F4A85"
+			"dark_plus_experimental": "punctuation.section.embedded: #569CD6",
+			"hc_light": "punctuation.section.embedded: #0F4A85",
+			"light_plus_experimental": "punctuation.section.embedded: #0000FF"
 		}
 	},
 	{
@@ -2480,7 +2892,9 @@
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable.other.constant: #02715D"
+			"dark_plus_experimental": "variable.other.constant: #4FC1FF",
+			"hc_light": "variable.other.constant: #02715D",
+			"light_plus_experimental": "variable.other.constant: #0070C1"
 		}
 	},
 	{
@@ -2492,7 +2906,9 @@
 			"dark_vs": "punctuation.section.embedded: #569CD6",
 			"light_vs": "punctuation.section.embedded: #0000FF",
 			"hc_black": "punctuation.section.embedded: #569CD6",
-			"hc_light": "punctuation.section.embedded: #0F4A85"
+			"dark_plus_experimental": "punctuation.section.embedded: #569CD6",
+			"hc_light": "punctuation.section.embedded: #0F4A85",
+			"light_plus_experimental": "punctuation.section.embedded: #0000FF"
 		}
 	},
 	{
@@ -2504,7 +2920,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2516,7 +2934,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2528,7 +2948,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2540,7 +2962,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2552,7 +2976,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2564,7 +2990,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2576,7 +3004,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2588,7 +3018,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2600,7 +3032,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2612,7 +3046,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2624,7 +3060,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2636,7 +3074,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2648,7 +3088,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2660,7 +3102,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2672,7 +3116,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2684,7 +3130,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2696,7 +3144,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -2708,7 +3158,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -2720,7 +3172,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -2732,7 +3186,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -2744,7 +3200,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -2756,7 +3214,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -2768,7 +3228,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -2780,7 +3242,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -2792,7 +3256,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -2804,7 +3270,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -2816,7 +3284,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -2828,7 +3298,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -2840,7 +3312,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -2852,7 +3326,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -2864,7 +3340,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -2876,7 +3354,9 @@
 			"dark_vs": "string.regexp: #D16969",
 			"light_vs": "string.regexp: #811F3F",
 			"hc_black": "string.regexp: #D16969",
-			"hc_light": "string.regexp: #811F3F"
+			"dark_plus_experimental": "string.regexp: #D16969",
+			"hc_light": "string.regexp: #811F3F",
+			"light_plus_experimental": "string.regexp: #811F3F"
 		}
 	},
 	{
@@ -2888,7 +3368,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2900,7 +3382,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2912,7 +3396,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2924,7 +3410,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2936,7 +3424,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2948,7 +3438,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2960,7 +3452,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2972,7 +3466,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2984,7 +3480,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2996,7 +3494,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3008,7 +3508,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3020,7 +3522,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3032,7 +3536,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3044,7 +3550,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3056,7 +3564,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3068,7 +3578,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3080,7 +3592,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3092,7 +3606,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	}
 ]
\ 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 84abed9d2244ed..286cdd485cac5c 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_rs.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_rs.json
@@ -8,7 +8,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.namespace: #4EC9B0",
-			"hc_light": "entity.name.namespace: #185E73"
+			"dark_plus_experimental": "entity.name.namespace: #4EC9B0",
+			"hc_light": "entity.name.namespace: #185E73",
+			"light_plus_experimental": "entity.name.namespace: #267F99"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.namespace: #4EC9B0",
-			"hc_light": "entity.name.namespace: #185E73"
+			"dark_plus_experimental": "entity.name.namespace: #4EC9B0",
+			"hc_light": "entity.name.namespace: #185E73",
+			"light_plus_experimental": "entity.name.namespace: #267F99"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 83de018f0ebcc7..9827e0fc78ae05 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_rst.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_rst.json
@@ -8,7 +8,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "markup.bold: #569CD6",
 			"light_vs": "markup.bold: #000080",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "markup.bold: #000080"
+			"dark_plus_experimental": "markup.bold: #569CD6",
+			"hc_light": "markup.bold: #000080",
+			"light_plus_experimental": "markup.bold: #000080"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "markup.heading: #569CD6",
 			"light_vs": "markup.heading: #800000",
 			"hc_black": "markup.heading: #6796E6",
-			"hc_light": "markup.heading: #0F4A85"
+			"dark_plus_experimental": "markup.heading: #569CD6",
+			"hc_light": "markup.heading: #0F4A85",
+			"light_plus_experimental": "markup.heading: #800000"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 3d5c91da983003..c97bf55fdf20f1 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_scss.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_scss.json
@@ -8,7 +8,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "entity.other.attribute-name.id.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.id.css: #800000",
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.id.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "entity.other.attribute-name.id.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.id.css: #800000",
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.id.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "entity.other.attribute-name.id.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.id.css: #800000",
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.id.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "entity.other.attribute-name.id.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.id.css: #800000",
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.id.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.color: #0451A5",
 			"hc_black": "support.constant.color: #CE9178",
-			"hc_light": "support.constant.color: #0451A5"
+			"dark_plus_experimental": "support.constant.color: #CE9178",
+			"hc_light": "support.constant.color: #0451A5",
+			"light_plus_experimental": "support.constant.color: #0451A5"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-class.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-class.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.color: #0451A5",
 			"hc_black": "support.constant.color: #CE9178",
-			"hc_light": "support.constant.color: #0451A5"
+			"dark_plus_experimental": "support.constant.color: #CE9178",
+			"hc_light": "support.constant.color: #0451A5",
+			"light_plus_experimental": "support.constant.color: #0451A5"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2168,7 +2528,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2180,7 +2542,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2192,7 +2556,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2204,7 +2570,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2216,7 +2584,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2228,7 +2598,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -2240,7 +2612,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -2252,7 +2626,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2264,7 +2640,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2276,7 +2654,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2288,7 +2668,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2300,7 +2682,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2312,7 +2696,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2324,7 +2710,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2336,7 +2724,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2348,7 +2738,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2360,7 +2752,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2372,7 +2766,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2384,7 +2780,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2396,7 +2794,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2408,7 +2808,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2420,7 +2822,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2432,7 +2836,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2444,7 +2850,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2456,7 +2864,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2468,7 +2878,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2480,7 +2892,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2492,7 +2906,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2504,7 +2920,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2516,7 +2934,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2528,7 +2948,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2540,7 +2962,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2552,7 +2976,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2564,7 +2990,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2576,7 +3004,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2588,7 +3018,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2600,7 +3032,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2612,7 +3046,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2624,7 +3060,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2636,7 +3074,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2648,7 +3088,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2660,7 +3102,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2672,7 +3116,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2684,7 +3130,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2696,7 +3144,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2708,7 +3158,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2720,7 +3172,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2732,7 +3186,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2744,7 +3200,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2756,7 +3214,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2768,7 +3228,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2780,7 +3242,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2792,7 +3256,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2804,7 +3270,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2816,7 +3284,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.color: #0451A5",
 			"hc_black": "support.constant.color: #CE9178",
-			"hc_light": "support.constant.color: #0451A5"
+			"dark_plus_experimental": "support.constant.color: #CE9178",
+			"hc_light": "support.constant.color: #0451A5",
+			"light_plus_experimental": "support.constant.color: #0451A5"
 		}
 	},
 	{
@@ -2828,7 +3298,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2840,7 +3312,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2852,7 +3326,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2864,7 +3340,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2876,7 +3354,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2888,7 +3368,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2900,7 +3382,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2912,7 +3396,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2924,7 +3410,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -2936,7 +3424,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -2948,7 +3438,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2960,7 +3452,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2972,7 +3466,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2984,7 +3480,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2996,7 +3494,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3008,7 +3508,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3020,7 +3522,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.color: #0451A5",
 			"hc_black": "support.constant.color: #CE9178",
-			"hc_light": "support.constant.color: #0451A5"
+			"dark_plus_experimental": "support.constant.color: #CE9178",
+			"hc_light": "support.constant.color: #0451A5",
+			"light_plus_experimental": "support.constant.color: #0451A5"
 		}
 	},
 	{
@@ -3032,7 +3536,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3044,7 +3550,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3056,7 +3564,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3068,7 +3578,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3080,7 +3592,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3092,7 +3606,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -3104,7 +3620,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -3116,7 +3634,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3128,7 +3648,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3140,7 +3662,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3152,7 +3676,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -3164,7 +3690,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3176,7 +3704,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -3188,7 +3718,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3200,7 +3732,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3212,7 +3746,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3224,7 +3760,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3236,7 +3774,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -3248,7 +3788,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3260,7 +3802,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -3272,7 +3816,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3284,7 +3830,9 @@
 			"dark_vs": "entity.other.attribute-name.id.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.id.css: #800000",
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.id.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -3296,7 +3844,9 @@
 			"dark_vs": "entity.other.attribute-name.id.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.id.css: #800000",
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.id.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -3308,7 +3858,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3320,7 +3872,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3332,7 +3886,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3344,7 +3900,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -3356,7 +3914,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3368,7 +3928,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3380,7 +3942,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3392,7 +3956,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -3404,7 +3970,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3416,7 +3984,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3428,7 +3998,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3440,7 +4012,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3452,7 +4026,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3464,7 +4040,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -3476,7 +4054,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3488,7 +4068,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3500,7 +4082,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -3512,7 +4096,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3524,7 +4110,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3536,7 +4124,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3548,7 +4138,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -3560,7 +4152,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3572,7 +4166,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3584,7 +4180,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -3596,7 +4194,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3608,7 +4208,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3620,7 +4222,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3632,7 +4236,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -3644,7 +4250,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3656,7 +4264,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3668,7 +4278,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -3680,7 +4292,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3692,7 +4306,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3704,7 +4320,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3716,7 +4334,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -3728,7 +4348,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3740,7 +4362,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3752,7 +4376,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3764,7 +4390,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -3776,7 +4404,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3788,7 +4418,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3800,7 +4432,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3812,7 +4446,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -3824,7 +4460,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3836,7 +4474,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3848,7 +4488,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3860,7 +4502,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -3872,7 +4516,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3884,7 +4530,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3896,7 +4544,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -3908,7 +4558,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3920,7 +4572,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -3932,7 +4586,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -3944,7 +4600,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3956,7 +4614,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -3968,7 +4628,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3980,7 +4642,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3992,7 +4656,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4004,7 +4670,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4016,7 +4684,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -4028,7 +4698,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -4040,7 +4712,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -4052,7 +4726,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4064,7 +4740,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4076,7 +4754,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4088,7 +4768,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.color: #0451A5",
 			"hc_black": "support.constant.color: #CE9178",
-			"hc_light": "support.constant.color: #0451A5"
+			"dark_plus_experimental": "support.constant.color: #CE9178",
+			"hc_light": "support.constant.color: #0451A5",
+			"light_plus_experimental": "support.constant.color: #0451A5"
 		}
 	},
 	{
@@ -4100,7 +4782,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4112,7 +4796,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4124,7 +4810,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4136,7 +4824,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4148,7 +4838,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4160,7 +4852,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4172,7 +4866,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4184,7 +4880,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -4196,7 +4894,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4208,7 +4908,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4220,7 +4922,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4232,7 +4936,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -4244,7 +4950,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4256,7 +4964,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4268,7 +4978,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4280,7 +4992,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4292,7 +5006,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4304,7 +5020,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4316,7 +5034,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4328,7 +5048,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4340,7 +5062,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4352,7 +5076,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4364,7 +5090,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4376,7 +5104,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4388,7 +5118,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4400,7 +5132,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -4412,7 +5146,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4424,7 +5160,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4436,7 +5174,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4448,7 +5188,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -4460,7 +5202,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -4472,7 +5216,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4484,7 +5230,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4496,7 +5244,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4508,7 +5258,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4520,7 +5272,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4532,7 +5286,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4544,7 +5300,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4556,7 +5314,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4568,7 +5328,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -4580,7 +5342,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4592,7 +5356,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4604,7 +5370,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4616,7 +5384,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4628,7 +5398,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -4640,7 +5412,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4652,7 +5426,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4664,7 +5440,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4676,7 +5454,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4688,7 +5468,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4700,7 +5482,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4712,7 +5496,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4724,7 +5510,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4736,7 +5524,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4748,7 +5538,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4760,7 +5552,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -4772,7 +5566,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -4784,7 +5580,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4796,7 +5594,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4808,7 +5608,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4820,7 +5622,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -4832,7 +5636,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -4844,7 +5650,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4856,7 +5664,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4868,7 +5678,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4880,7 +5692,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4892,7 +5706,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4904,7 +5720,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4916,7 +5734,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4928,7 +5748,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4940,7 +5762,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -4952,7 +5776,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -4964,7 +5790,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -4976,7 +5804,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4988,7 +5818,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5000,7 +5832,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5012,7 +5846,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5024,7 +5860,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5036,7 +5874,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5048,7 +5888,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -5060,7 +5902,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5072,7 +5916,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5084,7 +5930,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5096,7 +5944,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5108,7 +5958,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -5120,7 +5972,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5132,7 +5986,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -5144,7 +6000,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5156,7 +6014,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5168,7 +6028,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -5180,7 +6042,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5192,7 +6056,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5204,7 +6070,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -5216,7 +6084,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -5228,7 +6098,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -5240,7 +6112,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5252,7 +6126,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -5264,7 +6140,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5276,7 +6154,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -5288,7 +6168,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5300,7 +6182,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -5312,7 +6196,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -5324,7 +6210,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -5336,7 +6224,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5348,7 +6238,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5360,7 +6252,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5372,7 +6266,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5384,7 +6280,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5396,7 +6294,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -5408,7 +6308,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5420,7 +6322,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5432,7 +6336,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5444,7 +6350,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5456,7 +6364,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5468,7 +6378,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -5480,7 +6392,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5492,7 +6406,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5504,7 +6420,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5516,7 +6434,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -5528,7 +6448,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5540,7 +6462,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5552,7 +6476,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5564,7 +6490,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5576,7 +6504,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5588,7 +6518,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5600,7 +6532,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -5612,7 +6546,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5624,7 +6560,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -5636,7 +6574,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -5648,7 +6588,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5660,7 +6602,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5672,7 +6616,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5684,7 +6630,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5696,7 +6644,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -5708,7 +6658,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -5720,7 +6672,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5732,7 +6686,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5744,7 +6700,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -5756,7 +6714,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5768,7 +6728,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5780,7 +6742,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -5792,7 +6756,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -5804,7 +6770,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5816,7 +6784,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5828,7 +6798,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -5840,7 +6812,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5852,7 +6826,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5864,7 +6840,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5876,7 +6854,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -5888,7 +6868,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -5900,7 +6882,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -5912,7 +6896,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -5924,7 +6910,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5936,7 +6924,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5948,7 +6938,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5960,7 +6952,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -5972,7 +6966,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5984,7 +6980,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -5996,7 +6994,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6008,7 +7008,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6020,7 +7022,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6032,7 +7036,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -6044,7 +7050,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6056,7 +7064,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6068,7 +7078,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6080,7 +7092,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6092,7 +7106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -6104,7 +7120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6116,7 +7134,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -6128,7 +7148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6140,7 +7162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6152,7 +7176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6164,7 +7190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6176,7 +7204,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6188,7 +7218,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6200,7 +7232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6212,7 +7246,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -6224,7 +7260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6236,7 +7274,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6248,7 +7288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6260,7 +7302,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -6272,7 +7316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6284,7 +7330,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6296,7 +7344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6308,7 +7358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6320,7 +7372,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -6332,7 +7386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6344,7 +7400,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6356,7 +7414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6368,7 +7428,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6380,7 +7442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6392,7 +7456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6404,7 +7470,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6416,7 +7484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6428,7 +7498,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -6440,7 +7512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6452,7 +7526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6464,7 +7540,9 @@
 			"dark_vs": "entity.other.attribute-name.id.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.id.css: #800000",
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.id.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -6476,7 +7554,9 @@
 			"dark_vs": "entity.other.attribute-name.id.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.id.css: #800000",
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.id.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -6488,7 +7568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6500,7 +7582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6512,7 +7596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6524,7 +7610,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -6536,7 +7624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6548,7 +7638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6560,7 +7652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -6572,7 +7666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6584,7 +7680,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6596,7 +7694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6608,7 +7708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6620,7 +7722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6632,7 +7736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6644,7 +7750,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -6656,7 +7764,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -6668,7 +7778,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -6680,7 +7792,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6692,7 +7806,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6704,7 +7820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6716,7 +7834,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -6728,7 +7848,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -6740,7 +7862,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -6752,7 +7876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6764,7 +7890,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -6776,7 +7904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6788,7 +7918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6800,7 +7932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -6812,7 +7946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6824,7 +7960,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -6836,7 +7974,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -6848,7 +7988,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -6860,7 +8002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6872,7 +8016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6884,7 +8030,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6896,7 +8044,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6908,7 +8058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6920,7 +8072,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -6932,7 +8086,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -6944,7 +8100,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -6956,7 +8114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6968,7 +8128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -6980,7 +8142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6992,7 +8156,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7004,7 +8170,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7016,7 +8184,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -7028,7 +8198,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -7040,7 +8212,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -7052,7 +8226,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7064,7 +8240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7076,7 +8254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7088,7 +8268,9 @@
 			"dark_vs": "entity.other.attribute-name.id.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.id.css: #800000",
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.id.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -7100,7 +8282,9 @@
 			"dark_vs": "entity.other.attribute-name.id.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.id.css: #800000",
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.id.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -7112,7 +8296,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7124,7 +8310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7136,7 +8324,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7148,7 +8338,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -7160,7 +8352,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -7172,7 +8366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7184,7 +8380,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7196,7 +8394,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7208,7 +8408,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -7220,7 +8422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7232,7 +8436,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7244,7 +8450,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -7256,7 +8464,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -7268,7 +8478,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -7280,7 +8492,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -7292,7 +8506,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -7304,7 +8520,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7316,7 +8534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7328,7 +8548,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7340,7 +8562,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -7352,7 +8576,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7364,7 +8590,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7376,7 +8604,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7388,7 +8618,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -7400,7 +8632,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7412,7 +8646,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7424,7 +8660,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -7436,7 +8674,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -7448,7 +8688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7460,7 +8702,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.media: #0451A5",
 			"hc_black": "support.constant.media: #CE9178",
-			"hc_light": "support.constant.media: #0451A5"
+			"dark_plus_experimental": "support.constant.media: #CE9178",
+			"hc_light": "support.constant.media: #0451A5",
+			"light_plus_experimental": "support.constant.media: #0451A5"
 		}
 	},
 	{
@@ -7472,7 +8716,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7484,7 +8730,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7496,7 +8744,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7508,7 +8758,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7520,7 +8772,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -7532,7 +8786,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7544,7 +8800,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7556,7 +8814,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -7568,7 +8828,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7580,7 +8842,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7592,7 +8856,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7604,7 +8870,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7616,7 +8884,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -7628,7 +8898,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7640,7 +8912,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7652,7 +8926,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7664,7 +8940,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -7676,7 +8954,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7688,7 +8968,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7700,7 +8982,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7712,7 +8996,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7724,7 +9010,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -7736,7 +9024,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -7748,7 +9038,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -7760,7 +9052,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -7772,7 +9066,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -7784,7 +9080,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7796,7 +9094,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7808,7 +9108,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7820,7 +9122,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -7832,7 +9136,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7844,7 +9150,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7856,7 +9164,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7868,7 +9178,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -7880,7 +9192,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7892,7 +9206,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -7904,7 +9220,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -7916,7 +9234,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7928,7 +9248,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7940,7 +9262,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -7952,7 +9276,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7964,7 +9290,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7976,7 +9304,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -7988,7 +9318,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -8000,7 +9332,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8012,7 +9346,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8024,7 +9360,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -8036,7 +9374,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -8048,7 +9388,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8060,7 +9402,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8072,7 +9416,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8084,7 +9430,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8096,7 +9444,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8108,7 +9458,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8120,7 +9472,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -8132,7 +9486,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -8144,7 +9500,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8156,7 +9514,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8168,7 +9528,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8180,7 +9542,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8192,7 +9556,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8204,7 +9570,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8216,7 +9584,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -8228,7 +9598,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8240,7 +9612,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8252,7 +9626,9 @@
 			"dark_vs": "entity.other.attribute-name.id.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.id.css: #800000",
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.id.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -8264,7 +9640,9 @@
 			"dark_vs": "entity.other.attribute-name.id.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.id.css: #800000",
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.id.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -8276,7 +9654,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8288,7 +9668,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -8300,7 +9682,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -8312,7 +9696,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8324,7 +9710,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8336,7 +9724,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8348,7 +9738,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8360,7 +9752,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8372,7 +9766,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8384,7 +9780,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.color: #0451A5",
 			"hc_black": "support.constant.color: #CE9178",
-			"hc_light": "support.constant.color: #0451A5"
+			"dark_plus_experimental": "support.constant.color: #CE9178",
+			"hc_light": "support.constant.color: #0451A5",
+			"light_plus_experimental": "support.constant.color: #0451A5"
 		}
 	},
 	{
@@ -8396,7 +9794,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8408,7 +9808,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8420,7 +9822,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8432,7 +9836,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8444,7 +9850,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8456,7 +9864,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -8468,7 +9878,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8480,7 +9892,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8492,7 +9906,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8504,7 +9920,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8516,7 +9934,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8528,7 +9948,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8540,7 +9962,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -8552,7 +9976,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8564,7 +9990,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8576,7 +10004,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -8588,7 +10018,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -8600,7 +10032,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8612,7 +10046,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8624,7 +10060,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8636,7 +10074,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8648,7 +10088,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8660,7 +10102,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8672,7 +10116,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -8684,7 +10130,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -8696,7 +10144,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8708,7 +10158,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -8720,7 +10172,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8732,7 +10186,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8744,7 +10200,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -8756,7 +10214,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -8768,7 +10228,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -8780,7 +10242,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8792,7 +10256,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8804,7 +10270,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8816,7 +10284,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8828,7 +10298,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8840,7 +10312,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8852,7 +10326,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8864,7 +10340,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -8876,7 +10354,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8888,7 +10368,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -8900,7 +10382,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8912,7 +10396,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -8924,7 +10410,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8936,7 +10424,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8948,7 +10438,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8960,7 +10452,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8972,7 +10466,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8984,7 +10480,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8996,7 +10494,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9008,7 +10508,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -9020,7 +10522,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9032,7 +10536,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -9044,7 +10550,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9056,7 +10564,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9068,7 +10578,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9080,7 +10592,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9092,7 +10606,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -9104,7 +10620,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -9116,7 +10634,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9128,7 +10648,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -9140,7 +10662,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -9152,7 +10676,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9164,7 +10690,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -9176,7 +10704,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9188,7 +10718,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -9200,7 +10732,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -9212,7 +10746,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9224,7 +10760,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9236,7 +10774,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -9248,7 +10788,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9260,7 +10802,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9272,7 +10816,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9284,7 +10830,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -9296,7 +10844,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9308,7 +10858,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9320,7 +10872,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9332,7 +10886,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -9344,7 +10900,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9356,7 +10914,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9368,7 +10928,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9380,7 +10942,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9392,7 +10956,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -9404,7 +10970,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -9416,7 +10984,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9428,7 +10998,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -9440,7 +11012,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9452,7 +11026,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -9464,7 +11040,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9476,7 +11054,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9488,7 +11068,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9500,7 +11082,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9512,7 +11096,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -9524,7 +11110,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -9536,7 +11124,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9548,7 +11138,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -9560,7 +11152,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -9572,7 +11166,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9584,7 +11180,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -9596,7 +11194,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9608,7 +11208,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -9620,7 +11222,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -9632,7 +11236,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9644,7 +11250,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9656,7 +11264,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -9668,7 +11278,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9680,7 +11292,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9692,7 +11306,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9704,7 +11320,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -9716,7 +11334,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9728,7 +11348,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9740,7 +11362,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9752,7 +11376,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -9764,7 +11390,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9776,7 +11404,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9788,7 +11418,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9800,7 +11432,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9812,7 +11446,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -9824,7 +11460,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9836,7 +11474,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9848,7 +11488,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -9860,7 +11502,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9872,7 +11516,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9884,7 +11530,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -9896,7 +11544,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9908,7 +11558,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9920,7 +11572,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -9932,7 +11586,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9944,7 +11600,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9956,7 +11614,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -9968,7 +11628,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9980,7 +11642,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9992,7 +11656,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -10004,7 +11670,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10016,7 +11684,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10028,7 +11698,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -10040,7 +11712,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -10052,7 +11726,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -10064,7 +11740,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -10076,7 +11754,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -10088,7 +11768,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -10100,7 +11782,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -10112,7 +11796,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10124,7 +11810,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10136,7 +11824,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10148,7 +11838,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -10160,7 +11852,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -10172,7 +11866,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10184,7 +11880,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10196,7 +11894,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10208,7 +11908,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10220,7 +11922,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10232,7 +11936,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10244,7 +11950,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10256,7 +11964,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10268,7 +11978,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10280,7 +11992,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10292,7 +12006,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10304,7 +12020,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10316,7 +12034,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10328,7 +12048,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -10340,7 +12062,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10352,7 +12076,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10364,7 +12090,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10376,7 +12104,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -10388,7 +12118,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10400,7 +12132,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -10412,7 +12146,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10424,7 +12160,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10436,7 +12174,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10448,7 +12188,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10460,7 +12202,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -10472,7 +12216,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -10484,7 +12230,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10496,7 +12244,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10508,7 +12258,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10520,7 +12272,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10532,7 +12286,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10544,7 +12300,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10556,7 +12314,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10568,7 +12328,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10580,7 +12342,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10592,7 +12356,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -10604,7 +12370,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10616,7 +12384,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10628,7 +12398,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10640,7 +12412,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -10652,7 +12426,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10664,7 +12440,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -10676,7 +12454,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10688,7 +12468,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10700,7 +12482,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10712,7 +12496,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10724,7 +12510,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -10736,7 +12524,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -10748,7 +12538,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10760,7 +12552,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10772,7 +12566,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10784,7 +12580,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -10796,7 +12594,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10808,7 +12608,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10820,7 +12622,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10832,7 +12636,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -10844,7 +12650,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10856,7 +12664,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -10868,7 +12678,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10880,7 +12692,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10892,7 +12706,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10904,7 +12720,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10916,7 +12734,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -10928,7 +12748,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -10940,7 +12762,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -10952,7 +12776,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -10964,7 +12790,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10976,7 +12804,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10988,7 +12818,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11000,7 +12832,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -11012,7 +12846,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11024,7 +12860,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11036,7 +12874,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11048,7 +12888,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -11060,7 +12902,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -11072,7 +12916,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11084,7 +12930,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -11096,7 +12944,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11108,7 +12958,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11120,7 +12972,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11132,7 +12986,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11144,7 +13000,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11156,7 +13014,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -11168,7 +13028,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11180,7 +13042,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11192,7 +13056,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.color: #0451A5",
 			"hc_black": "support.constant.color: #CE9178",
-			"hc_light": "support.constant.color: #0451A5"
+			"dark_plus_experimental": "support.constant.color: #CE9178",
+			"hc_light": "support.constant.color: #0451A5",
+			"light_plus_experimental": "support.constant.color: #0451A5"
 		}
 	},
 	{
@@ -11204,7 +13070,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11216,7 +13084,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11228,7 +13098,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11240,7 +13112,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11252,7 +13126,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -11264,7 +13140,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -11276,7 +13154,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11288,7 +13168,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11300,7 +13182,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -11312,7 +13196,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11324,7 +13210,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11336,7 +13224,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.color: #0451A5",
 			"hc_black": "support.constant.color: #CE9178",
-			"hc_light": "support.constant.color: #0451A5"
+			"dark_plus_experimental": "support.constant.color: #CE9178",
+			"hc_light": "support.constant.color: #0451A5",
+			"light_plus_experimental": "support.constant.color: #0451A5"
 		}
 	},
 	{
@@ -11348,7 +13238,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11360,7 +13252,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11372,7 +13266,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11384,7 +13280,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11396,7 +13294,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -11408,7 +13308,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -11420,7 +13322,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -11432,7 +13336,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -11444,7 +13350,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -11456,7 +13364,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11468,7 +13378,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -11480,7 +13392,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11492,7 +13406,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -11504,7 +13420,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11516,7 +13434,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -11528,7 +13448,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11540,7 +13462,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -11552,7 +13476,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11564,7 +13490,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -11576,7 +13504,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11588,7 +13518,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11600,7 +13532,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11612,7 +13546,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -11624,7 +13560,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -11636,7 +13574,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11648,7 +13588,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -11660,7 +13602,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11672,7 +13616,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11684,7 +13630,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11696,7 +13644,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11708,7 +13658,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -11720,7 +13672,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11732,7 +13686,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11744,7 +13700,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -11756,7 +13714,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -11768,7 +13728,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11780,7 +13742,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11792,7 +13756,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11804,7 +13770,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -11816,7 +13784,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11828,7 +13798,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11840,7 +13812,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11852,7 +13826,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11864,7 +13840,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -11876,7 +13854,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -11888,7 +13868,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -11900,7 +13882,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -11912,7 +13896,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -11924,7 +13910,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11936,7 +13924,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -11948,7 +13938,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11960,7 +13952,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -11972,7 +13966,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11984,7 +13980,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -11996,7 +13994,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12008,7 +14008,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12020,7 +14022,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12032,7 +14036,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -12044,7 +14050,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -12056,7 +14064,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -12068,7 +14078,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -12080,7 +14092,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -12092,7 +14106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12104,7 +14120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12116,7 +14134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12128,7 +14148,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -12140,7 +14162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12152,7 +14176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12164,7 +14190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -12176,7 +14204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12188,7 +14218,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -12200,7 +14232,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -12212,7 +14246,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -12224,7 +14260,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -12236,7 +14274,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -12248,7 +14288,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -12260,7 +14302,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -12272,7 +14316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12284,7 +14330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12296,7 +14344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12308,7 +14358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12320,7 +14372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12332,7 +14386,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -12344,7 +14400,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -12356,7 +14414,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -12368,7 +14428,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -12380,7 +14442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12392,7 +14456,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -12404,7 +14470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12416,7 +14484,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -12428,7 +14498,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -12440,7 +14512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12452,7 +14526,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -12464,7 +14540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12476,7 +14554,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12488,7 +14568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12500,7 +14582,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -12512,7 +14596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12524,7 +14610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12536,7 +14624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12548,7 +14638,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -12560,7 +14652,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -12572,7 +14666,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -12584,7 +14680,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -12596,7 +14694,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -12608,7 +14708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12620,7 +14722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12632,7 +14736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12644,7 +14750,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -12656,7 +14764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12668,7 +14778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12680,7 +14792,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -12692,7 +14806,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -12704,7 +14820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12716,7 +14834,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12728,7 +14848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12740,7 +14862,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -12752,7 +14876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12764,7 +14890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12776,7 +14904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12788,7 +14918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12800,7 +14932,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -12812,7 +14946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12824,7 +14960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12836,7 +14974,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -12848,7 +14988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12860,7 +15002,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12872,7 +15016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12884,7 +15030,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -12896,7 +15044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12908,7 +15058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12920,7 +15072,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -12932,7 +15086,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -12944,7 +15100,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -12956,7 +15114,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -12968,7 +15128,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -12980,7 +15142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12992,7 +15156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -13004,7 +15170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13016,7 +15184,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -13028,7 +15198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13040,7 +15212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13052,7 +15226,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -13064,7 +15240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13076,7 +15254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13088,7 +15268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13100,7 +15282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13112,7 +15296,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -13124,7 +15310,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -13136,7 +15324,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13148,7 +15338,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -13160,7 +15352,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13172,7 +15366,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -13184,7 +15380,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13196,7 +15394,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -13208,7 +15408,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13220,7 +15422,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -13232,7 +15436,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13244,7 +15450,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -13256,7 +15464,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13268,7 +15478,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13280,7 +15492,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13292,7 +15506,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -13304,7 +15520,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -13316,7 +15534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13328,7 +15548,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13340,7 +15562,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -13352,7 +15576,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13364,7 +15590,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -13376,7 +15604,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13388,7 +15618,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13400,7 +15632,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -13412,7 +15646,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -13424,7 +15660,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -13436,7 +15674,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13448,7 +15688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13460,7 +15702,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -13472,7 +15716,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13484,7 +15730,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13496,7 +15744,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -13508,7 +15758,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13520,7 +15772,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13532,7 +15786,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -13544,7 +15800,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13556,7 +15814,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -13568,7 +15828,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13580,7 +15842,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -13592,7 +15856,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13604,7 +15870,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13616,7 +15884,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13628,7 +15898,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13640,7 +15912,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -13652,7 +15926,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13664,7 +15940,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13676,7 +15954,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -13688,7 +15968,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -13700,7 +15982,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13712,7 +15996,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13724,7 +16010,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -13736,7 +16024,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -13748,7 +16038,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13760,7 +16052,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -13772,7 +16066,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -13784,7 +16080,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -13796,7 +16094,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13808,7 +16108,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13820,7 +16122,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13832,7 +16136,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13844,7 +16150,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13856,7 +16164,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13868,7 +16178,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -13880,7 +16192,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -13892,7 +16206,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13904,7 +16220,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -13916,7 +16234,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13928,7 +16248,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -13940,7 +16262,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -13952,7 +16276,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -13964,7 +16290,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -13976,7 +16304,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -13988,7 +16318,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -14000,7 +16332,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14012,7 +16346,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -14024,7 +16360,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14036,7 +16374,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14048,7 +16388,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14060,7 +16402,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -14072,7 +16416,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14084,7 +16430,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14096,7 +16444,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14108,7 +16458,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -14120,7 +16472,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14132,7 +16486,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14144,7 +16500,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.font-name: #0451A5",
 			"hc_black": "support.constant.font-name: #CE9178",
-			"hc_light": "support.constant.font-name: #0451A5"
+			"dark_plus_experimental": "support.constant.font-name: #CE9178",
+			"hc_light": "support.constant.font-name: #0451A5",
+			"light_plus_experimental": "support.constant.font-name: #0451A5"
 		}
 	},
 	{
@@ -14156,7 +16514,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14168,7 +16528,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14180,7 +16542,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -14192,7 +16556,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14204,7 +16570,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14216,7 +16584,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -14228,7 +16598,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -14240,7 +16612,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14252,7 +16626,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14264,7 +16640,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -14276,7 +16654,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14288,7 +16668,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14300,7 +16682,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -14312,7 +16696,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14324,7 +16710,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14336,7 +16724,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14348,7 +16738,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14360,7 +16752,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -14372,7 +16766,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14384,7 +16780,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14396,7 +16794,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -14408,7 +16808,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -14420,7 +16822,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14432,7 +16836,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14444,7 +16850,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -14456,7 +16864,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -14468,7 +16878,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14480,7 +16892,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14492,7 +16906,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14504,7 +16920,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -14516,7 +16934,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -14528,7 +16948,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14540,7 +16962,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -14552,7 +16976,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14564,7 +16990,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14576,7 +17004,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -14588,7 +17018,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14600,7 +17032,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14612,7 +17046,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -14624,7 +17060,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -14636,7 +17074,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14648,7 +17088,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14660,7 +17102,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -14672,7 +17116,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -14684,7 +17130,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -14696,7 +17144,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -14708,7 +17158,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -14720,7 +17172,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14732,7 +17186,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -14744,7 +17200,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14756,7 +17214,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -14768,7 +17228,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14780,7 +17242,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -14792,7 +17256,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14804,7 +17270,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14816,7 +17284,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -14828,7 +17298,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -14840,7 +17312,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14852,7 +17326,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14864,7 +17340,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14876,7 +17354,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14888,7 +17368,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -14900,7 +17382,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14912,7 +17396,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14924,7 +17410,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14936,7 +17424,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -14948,7 +17438,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14960,7 +17452,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14972,7 +17466,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -14984,7 +17480,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -14996,7 +17494,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15008,7 +17508,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -15020,7 +17522,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15032,7 +17536,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15044,7 +17550,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -15056,7 +17564,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15068,7 +17578,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15080,7 +17592,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -15092,7 +17606,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15104,7 +17620,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15116,7 +17634,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -15128,7 +17648,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15140,7 +17662,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15152,7 +17676,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15164,7 +17690,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15176,7 +17704,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -15188,7 +17718,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15200,7 +17732,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15212,7 +17746,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15224,7 +17760,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -15236,7 +17774,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -15248,7 +17788,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15260,7 +17802,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -15272,7 +17816,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15284,7 +17830,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.color: #0451A5",
 			"hc_black": "support.constant.color: #CE9178",
-			"hc_light": "support.constant.color: #0451A5"
+			"dark_plus_experimental": "support.constant.color: #CE9178",
+			"hc_light": "support.constant.color: #0451A5",
+			"light_plus_experimental": "support.constant.color: #0451A5"
 		}
 	},
 	{
@@ -15296,7 +17844,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15308,7 +17858,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15320,7 +17872,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15332,7 +17886,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15344,7 +17900,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -15356,7 +17914,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -15368,7 +17928,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -15380,7 +17942,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -15392,7 +17956,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -15404,7 +17970,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15416,7 +17984,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -15428,7 +17998,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15440,7 +18012,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -15452,7 +18026,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15464,7 +18040,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15476,7 +18054,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15488,7 +18068,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15500,7 +18082,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15512,7 +18096,9 @@
 			"dark_vs": "support.type.vendored.property-name: #9CDCFE",
 			"light_vs": "support.type.vendored.property-name: #E50000",
 			"hc_black": "support.type.vendored.property-name: #D4D4D4",
-			"hc_light": "support.type.vendored.property-name: #264F78"
+			"dark_plus_experimental": "support.type.vendored.property-name: #9CDCFE",
+			"hc_light": "support.type.vendored.property-name: #264F78",
+			"light_plus_experimental": "support.type.vendored.property-name: #E50000"
 		}
 	},
 	{
@@ -15524,7 +18110,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15536,7 +18124,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15548,7 +18138,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -15560,7 +18152,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15572,7 +18166,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15584,7 +18180,9 @@
 			"dark_vs": "support.type.vendored.property-name: #9CDCFE",
 			"light_vs": "support.type.vendored.property-name: #E50000",
 			"hc_black": "support.type.vendored.property-name: #D4D4D4",
-			"hc_light": "support.type.vendored.property-name: #264F78"
+			"dark_plus_experimental": "support.type.vendored.property-name: #9CDCFE",
+			"hc_light": "support.type.vendored.property-name: #264F78",
+			"light_plus_experimental": "support.type.vendored.property-name: #E50000"
 		}
 	},
 	{
@@ -15596,7 +18194,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15608,7 +18208,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15620,7 +18222,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -15632,7 +18236,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15644,7 +18250,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15656,7 +18264,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -15668,7 +18278,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15680,7 +18292,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15692,7 +18306,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -15704,7 +18320,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15716,7 +18334,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15728,7 +18348,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -15740,7 +18362,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -15752,7 +18376,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15764,7 +18390,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15776,7 +18404,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15788,7 +18418,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -15800,7 +18432,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -15812,7 +18446,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15824,7 +18460,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -15836,7 +18474,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15848,7 +18488,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -15860,7 +18502,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -15872,7 +18516,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15884,7 +18530,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -15896,7 +18544,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -15908,7 +18558,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15920,7 +18572,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -15932,7 +18586,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -15944,7 +18600,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15956,7 +18614,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -15968,7 +18628,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -15980,7 +18642,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -15992,7 +18656,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -16004,7 +18670,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -16016,7 +18684,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16028,7 +18698,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -16040,7 +18712,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -16052,7 +18726,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16064,7 +18740,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -16076,7 +18754,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -16088,7 +18768,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16100,7 +18782,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -16112,7 +18796,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -16124,7 +18810,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16136,7 +18824,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16148,7 +18838,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16160,7 +18852,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -16172,7 +18866,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -16184,7 +18880,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -16196,7 +18894,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -16208,7 +18908,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -16220,7 +18922,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16232,7 +18936,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -16244,7 +18950,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16256,7 +18964,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -16268,7 +18978,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16280,7 +18992,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -16292,7 +19006,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16304,7 +19020,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -16316,7 +19034,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16328,7 +19048,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16340,7 +19062,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16352,7 +19076,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16364,7 +19090,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -16376,7 +19104,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16388,7 +19118,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16400,7 +19132,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -16412,7 +19146,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16424,7 +19160,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16436,7 +19174,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -16448,7 +19188,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16460,7 +19202,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16472,7 +19216,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -16484,7 +19230,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16496,7 +19244,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16508,7 +19258,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -16520,7 +19272,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16532,7 +19286,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16544,7 +19300,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -16556,7 +19314,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16568,7 +19328,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16580,7 +19342,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -16592,7 +19356,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16604,7 +19370,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -16616,7 +19384,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -16628,7 +19398,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16640,7 +19412,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -16652,7 +19426,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -16664,7 +19440,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16676,7 +19454,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -16688,7 +19468,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -16700,7 +19482,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16712,7 +19496,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -16724,7 +19510,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -16736,7 +19524,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16748,7 +19538,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16760,7 +19552,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16772,7 +19566,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -16784,7 +19580,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -16796,7 +19594,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16808,7 +19608,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -16820,7 +19622,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16832,7 +19636,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -16844,7 +19650,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16856,7 +19664,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16868,7 +19678,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16880,7 +19692,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16892,7 +19706,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -16904,7 +19720,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -16916,7 +19734,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -16928,7 +19748,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -16940,7 +19762,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -16952,7 +19776,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16964,7 +19790,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -16976,7 +19804,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -16988,7 +19818,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17000,7 +19832,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17012,7 +19846,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -17024,7 +19860,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17036,7 +19874,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -17048,7 +19888,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17060,7 +19902,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17072,7 +19916,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17084,7 +19930,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -17096,7 +19944,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17108,7 +19958,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17120,7 +19972,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17132,7 +19986,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17144,7 +20000,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -17156,7 +20014,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -17168,7 +20028,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17180,7 +20042,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -17192,7 +20056,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17204,7 +20070,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17216,7 +20084,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17228,7 +20098,9 @@
 			"dark_vs": "entity.other.attribute-name.id.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.id.css: #800000",
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.id.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -17240,7 +20112,9 @@
 			"dark_vs": "entity.other.attribute-name.id.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.id.css: #800000",
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.id.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -17252,7 +20126,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17264,7 +20140,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17276,7 +20154,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17288,7 +20168,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -17300,7 +20182,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17312,7 +20196,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17324,7 +20210,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -17336,7 +20224,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17348,7 +20238,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -17360,7 +20252,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -17372,7 +20266,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17384,7 +20280,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17396,7 +20294,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17408,7 +20308,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17420,7 +20322,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17432,7 +20336,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -17444,7 +20350,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -17456,7 +20364,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17468,7 +20378,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -17480,7 +20392,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17492,7 +20406,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17504,7 +20420,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17516,7 +20434,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -17528,7 +20448,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -17540,7 +20462,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17552,7 +20476,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -17564,7 +20490,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17576,7 +20504,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17588,7 +20518,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17600,7 +20532,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17612,7 +20546,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17624,7 +20560,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -17636,7 +20574,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -17648,7 +20588,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -17660,7 +20602,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17672,7 +20616,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -17684,7 +20630,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -17696,7 +20644,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -17708,7 +20658,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17720,7 +20672,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -17732,7 +20686,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17744,7 +20700,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-element.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-element.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-element.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-element.css: #800000"
 		}
 	},
 	{
@@ -17756,7 +20714,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-element.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-element.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-element.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-element.css: #800000"
 		}
 	},
 	{
@@ -17768,7 +20728,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17780,7 +20742,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17792,7 +20756,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17804,7 +20770,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -17816,7 +20784,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17828,7 +20798,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17840,7 +20812,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -17852,7 +20826,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -17864,7 +20840,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -17876,7 +20854,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17888,7 +20868,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17900,7 +20882,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -17912,7 +20896,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -17924,7 +20910,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -17936,7 +20924,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -17948,7 +20938,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -17960,7 +20952,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17972,7 +20966,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -17984,7 +20980,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -17996,7 +20994,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18008,7 +21008,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18020,7 +21022,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -18032,7 +21036,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18044,7 +21050,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18056,7 +21064,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -18068,7 +21078,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -18080,7 +21092,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18092,7 +21106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18104,7 +21120,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -18116,7 +21134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18128,7 +21148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18140,7 +21162,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -18152,7 +21176,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -18164,7 +21190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18176,7 +21204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18188,7 +21218,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -18200,7 +21232,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -18212,7 +21246,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -18224,7 +21260,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -18236,7 +21274,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -18248,7 +21288,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -18260,7 +21302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18272,7 +21316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18284,7 +21330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18296,7 +21344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18308,7 +21358,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -18320,7 +21372,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -18332,7 +21386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18344,7 +21400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18356,7 +21414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18368,7 +21428,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -18380,7 +21442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18392,7 +21456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18404,7 +21470,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -18416,7 +21484,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -18428,7 +21498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18440,7 +21512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18452,7 +21526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18464,7 +21540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18476,7 +21554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18488,7 +21568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18500,7 +21582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18512,7 +21596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18524,7 +21610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18536,7 +21624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18548,7 +21638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18560,7 +21652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.color: #0451A5",
 			"hc_black": "support.constant.color: #CE9178",
-			"hc_light": "support.constant.color: #0451A5"
+			"dark_plus_experimental": "support.constant.color: #CE9178",
+			"hc_light": "support.constant.color: #0451A5",
+			"light_plus_experimental": "support.constant.color: #0451A5"
 		}
 	},
 	{
@@ -18572,7 +21666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18584,7 +21680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18596,7 +21694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18608,7 +21708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18620,7 +21722,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -18632,7 +21736,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -18644,7 +21750,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18656,7 +21764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18668,7 +21778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18680,7 +21792,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -18692,7 +21806,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -18704,7 +21820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18716,7 +21834,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -18728,7 +21848,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -18740,7 +21862,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -18752,7 +21876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18764,7 +21890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18776,7 +21904,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -18788,7 +21918,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -18800,7 +21932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18812,7 +21946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18824,7 +21960,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -18836,7 +21974,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -18848,7 +21988,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -18860,7 +22002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18872,7 +22016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18884,7 +22030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.color: #0451A5",
 			"hc_black": "support.constant.color: #CE9178",
-			"hc_light": "support.constant.color: #0451A5"
+			"dark_plus_experimental": "support.constant.color: #CE9178",
+			"hc_light": "support.constant.color: #0451A5",
+			"light_plus_experimental": "support.constant.color: #0451A5"
 		}
 	},
 	{
@@ -18896,7 +22044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18908,7 +22058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18920,7 +22072,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -18932,7 +22086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18944,7 +22100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "support.constant.property-value: #0451A5",
 			"hc_black": "support.constant.property-value: #CE9178",
-			"hc_light": "support.constant.property-value: #0451A5"
+			"dark_plus_experimental": "support.constant.property-value: #CE9178",
+			"hc_light": "support.constant.property-value: #0451A5",
+			"light_plus_experimental": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -18956,7 +22114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -18968,7 +22128,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -18980,7 +22142,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -18992,7 +22156,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -19004,7 +22170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19016,7 +22184,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -19028,7 +22198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19040,7 +22212,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -19052,7 +22226,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19064,7 +22240,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -19076,7 +22254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19088,7 +22268,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -19100,7 +22282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19112,7 +22296,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -19124,7 +22310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "constant.other.color.rgb-value: #0451A5",
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
-			"hc_light": "constant.other.color.rgb-value: #0451A5"
+			"dark_plus_experimental": "constant.other.color.rgb-value: #CE9178",
+			"hc_light": "constant.other.color.rgb-value: #0451A5",
+			"light_plus_experimental": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -19136,7 +22324,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19148,7 +22338,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -19160,7 +22352,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19172,7 +22366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -19184,7 +22380,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19196,7 +22394,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -19208,7 +22408,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19220,7 +22422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19232,7 +22436,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -19244,7 +22450,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -19256,7 +22464,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -19268,7 +22478,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -19280,7 +22492,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -19292,7 +22506,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19304,7 +22520,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -19316,7 +22534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19328,7 +22548,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -19340,7 +22562,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19352,7 +22576,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19364,7 +22590,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19376,7 +22604,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19388,7 +22618,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19400,7 +22632,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19412,7 +22646,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -19424,7 +22660,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -19436,7 +22674,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19448,7 +22688,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -19460,7 +22702,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -19472,7 +22716,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -19484,7 +22730,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -19496,7 +22744,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19508,7 +22758,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19520,7 +22772,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -19532,7 +22786,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -19544,7 +22800,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19556,7 +22814,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -19568,7 +22828,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -19580,7 +22842,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -19592,7 +22856,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19604,7 +22870,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19616,7 +22884,9 @@
 			"dark_vs": "entity.other.attribute-name.id.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.id.css: #800000",
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.id.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -19628,7 +22898,9 @@
 			"dark_vs": "entity.other.attribute-name.id.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.id.css: #800000",
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.id.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -19640,7 +22912,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19652,7 +22926,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19664,7 +22940,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -19676,7 +22954,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19688,7 +22968,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19700,7 +22982,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -19712,7 +22996,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -19724,7 +23010,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19736,7 +23024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19748,7 +23038,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -19760,7 +23052,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -19772,7 +23066,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19784,7 +23080,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19796,7 +23094,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -19808,7 +23108,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19820,7 +23122,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19832,7 +23136,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -19844,7 +23150,9 @@
 			"dark_vs": "keyword.other.unit: #B5CEA8",
 			"light_vs": "keyword.other.unit: #098658",
 			"hc_black": "keyword.other.unit: #B5CEA8",
-			"hc_light": "keyword.other.unit: #096D48"
+			"dark_plus_experimental": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_plus_experimental": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -19856,7 +23164,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19868,7 +23178,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19880,7 +23192,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19892,7 +23206,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19904,7 +23220,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19916,7 +23234,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19928,7 +23248,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -19940,7 +23262,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -19952,7 +23276,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19964,7 +23290,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -19976,7 +23304,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -19988,7 +23318,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -20000,7 +23332,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -20012,7 +23346,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -20024,7 +23360,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20036,7 +23374,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20048,7 +23388,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20060,7 +23402,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -20072,7 +23416,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -20084,7 +23430,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -20096,7 +23444,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -20108,7 +23458,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -20120,7 +23472,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20132,7 +23486,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20144,7 +23500,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20156,7 +23514,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -20168,7 +23528,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20180,7 +23542,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20192,7 +23556,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20204,7 +23570,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20216,7 +23584,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20228,7 +23598,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -20240,7 +23612,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20252,7 +23626,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20264,7 +23640,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -20276,7 +23654,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20288,7 +23668,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -20300,7 +23682,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -20312,7 +23696,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -20324,7 +23710,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20336,7 +23724,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20348,7 +23738,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20360,7 +23752,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20372,7 +23766,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -20384,7 +23780,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -20396,7 +23794,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -20408,7 +23808,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -20420,7 +23822,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -20432,7 +23836,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -20444,7 +23850,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -20456,7 +23864,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -20468,7 +23878,9 @@
 			"dark_vs": "entity.other.attribute-name.class.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.class.css: #800000",
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.class.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -20480,7 +23892,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20492,7 +23906,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20504,7 +23920,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20516,7 +23934,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -20528,7 +23948,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -20540,7 +23962,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -20552,7 +23976,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20564,7 +23990,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20576,7 +24004,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20588,7 +24018,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -20600,7 +24032,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20612,7 +24046,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20624,7 +24060,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20636,7 +24074,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -20648,7 +24088,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -20660,7 +24102,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -20672,7 +24116,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20684,7 +24130,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20696,7 +24144,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -20708,7 +24158,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20720,7 +24172,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20732,7 +24186,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -20744,7 +24200,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -20756,7 +24214,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -20768,7 +24228,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20780,7 +24242,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -20792,7 +24256,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -20804,7 +24270,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -20816,7 +24284,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20828,7 +24298,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20840,7 +24312,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -20852,7 +24326,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20864,7 +24340,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20876,7 +24354,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20888,7 +24368,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -20900,7 +24382,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -20912,7 +24396,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -20924,7 +24410,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20936,7 +24424,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20948,7 +24438,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20960,7 +24452,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -20972,7 +24466,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20984,7 +24480,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20996,7 +24494,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -21008,7 +24508,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -21020,7 +24522,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -21032,7 +24536,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -21044,7 +24550,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -21056,7 +24564,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21068,7 +24578,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21080,7 +24592,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21092,7 +24606,9 @@
 			"dark_vs": "entity.other.attribute-name.scss: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.scss: #800000",
 			"hc_black": "entity.other.attribute-name.scss: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.scss: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.scss: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.scss: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.scss: #800000"
 		}
 	},
 	{
@@ -21104,7 +24620,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21116,7 +24634,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21128,7 +24648,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21140,7 +24662,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -21152,7 +24676,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21164,7 +24690,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21176,7 +24704,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -21188,7 +24718,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21200,7 +24732,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21212,7 +24746,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21224,7 +24760,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21236,7 +24774,9 @@
 			"dark_vs": "entity.other.attribute-name.scss: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.scss: #800000",
 			"hc_black": "entity.other.attribute-name.scss: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.scss: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.scss: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.scss: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.scss: #800000"
 		}
 	},
 	{
@@ -21248,7 +24788,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21260,7 +24802,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21272,7 +24816,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21284,7 +24830,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -21296,7 +24844,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21308,7 +24858,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21320,7 +24872,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -21332,7 +24886,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21344,7 +24900,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21356,7 +24914,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21368,7 +24928,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21380,7 +24942,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -21392,7 +24956,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -21404,7 +24970,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21416,7 +24984,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21428,7 +24998,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21440,7 +25012,9 @@
 			"dark_vs": "entity.other.attribute-name.scss: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.scss: #800000",
 			"hc_black": "entity.other.attribute-name.scss: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.scss: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.scss: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.scss: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.scss: #800000"
 		}
 	},
 	{
@@ -21452,7 +25026,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21464,7 +25040,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21476,7 +25054,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21488,7 +25068,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -21500,7 +25082,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21512,7 +25096,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21524,7 +25110,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -21536,7 +25124,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21548,7 +25138,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21560,7 +25152,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21572,7 +25166,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21584,7 +25180,9 @@
 			"dark_vs": "entity.other.attribute-name.scss: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.scss: #800000",
 			"hc_black": "entity.other.attribute-name.scss: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.scss: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.scss: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.scss: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.scss: #800000"
 		}
 	},
 	{
@@ -21596,7 +25194,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21608,7 +25208,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21620,7 +25222,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21632,7 +25236,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -21644,7 +25250,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21656,7 +25264,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21668,7 +25278,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -21680,7 +25292,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21692,7 +25306,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21704,7 +25320,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21716,7 +25334,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21728,7 +25348,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21740,7 +25362,9 @@
 			"dark_vs": "support.type.vendored.property-name: #9CDCFE",
 			"light_vs": "support.type.vendored.property-name: #E50000",
 			"hc_black": "support.type.vendored.property-name: #D4D4D4",
-			"hc_light": "support.type.vendored.property-name: #264F78"
+			"dark_plus_experimental": "support.type.vendored.property-name: #9CDCFE",
+			"hc_light": "support.type.vendored.property-name: #264F78",
+			"light_plus_experimental": "support.type.vendored.property-name: #E50000"
 		}
 	},
 	{
@@ -21752,7 +25376,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21764,7 +25390,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -21776,7 +25404,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21788,7 +25418,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21800,7 +25432,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21812,7 +25446,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21824,7 +25460,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21836,7 +25474,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -21848,7 +25488,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21860,7 +25502,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21872,7 +25516,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -21884,7 +25530,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21896,7 +25544,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21908,7 +25558,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21920,7 +25572,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21932,7 +25586,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21944,7 +25600,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21956,7 +25614,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -21968,7 +25628,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21980,7 +25642,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -21992,7 +25656,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -22004,7 +25670,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22016,7 +25684,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22028,7 +25698,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22040,7 +25712,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22052,7 +25726,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -22064,7 +25740,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -22076,7 +25754,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22088,7 +25768,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -22100,7 +25782,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22112,7 +25796,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22124,7 +25810,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22136,7 +25824,9 @@
 			"dark_vs": "entity.other.attribute-name.scss: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.scss: #800000",
 			"hc_black": "entity.other.attribute-name.scss: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.scss: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.scss: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.scss: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.scss: #800000"
 		}
 	},
 	{
@@ -22148,7 +25838,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22160,7 +25852,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22172,7 +25866,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22184,7 +25880,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -22196,7 +25894,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22208,7 +25908,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22220,7 +25922,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -22232,7 +25936,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22244,7 +25950,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22256,7 +25964,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22268,7 +25978,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22280,7 +25992,9 @@
 			"dark_vs": "entity.other.attribute-name.scss: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.scss: #800000",
 			"hc_black": "entity.other.attribute-name.scss: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.scss: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.scss: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.scss: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.scss: #800000"
 		}
 	},
 	{
@@ -22292,7 +26006,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22304,7 +26020,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22316,7 +26034,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22328,7 +26048,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name: #E50000",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name: #264F78"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name: #264F78",
+			"light_plus_experimental": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -22340,7 +26062,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22352,7 +26076,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22364,7 +26090,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -22376,7 +26104,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22388,7 +26118,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22400,7 +26132,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22412,7 +26146,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22424,7 +26160,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -22436,7 +26174,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -22448,7 +26188,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -22460,7 +26202,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22472,7 +26216,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -22484,7 +26230,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -22496,7 +26244,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -22508,7 +26258,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22520,7 +26272,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -22532,7 +26286,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22544,7 +26300,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-element.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-element.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-element.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-element.css: #800000"
 		}
 	},
 	{
@@ -22556,7 +26314,9 @@
 			"dark_vs": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
 			"light_vs": "entity.other.attribute-name.pseudo-element.css: #800000",
 			"hc_black": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
-			"hc_light": "entity.other.attribute-name.pseudo-element.css: #0F4A85"
+			"dark_plus_experimental": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
+			"hc_light": "entity.other.attribute-name.pseudo-element.css: #0F4A85",
+			"light_plus_experimental": "entity.other.attribute-name.pseudo-element.css: #800000"
 		}
 	},
 	{
@@ -22568,7 +26328,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22580,7 +26342,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22592,7 +26356,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22604,7 +26370,9 @@
 			"dark_vs": "entity.name.tag.css: #D7BA7D",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag.css: #D7BA7D",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag.css: #D7BA7D",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -22616,7 +26384,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22628,7 +26398,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -22640,7 +26412,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -22652,7 +26426,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -22664,7 +26440,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22676,7 +26454,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22688,7 +26468,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -22700,7 +26482,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -22712,7 +26496,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -22724,7 +26510,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -22736,7 +26524,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22748,7 +26538,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22760,7 +26552,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -22772,7 +26566,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -22784,7 +26580,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -22796,7 +26594,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22808,7 +26608,9 @@
 			"dark_vs": "variable.scss: #9CDCFE",
 			"light_vs": "variable.scss: #E50000",
 			"hc_black": "variable.scss: #D4D4D4",
-			"hc_light": "variable.scss: #264F78"
+			"dark_plus_experimental": "variable.scss: #9CDCFE",
+			"hc_light": "variable.scss: #264F78",
+			"light_plus_experimental": "variable.scss: #E50000"
 		}
 	},
 	{
@@ -22820,7 +26622,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22832,7 +26636,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22844,7 +26650,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -22856,7 +26664,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -22868,7 +26678,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -22880,7 +26692,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -22892,7 +26706,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -22904,7 +26720,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -22916,7 +26734,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	}
 ]
\ 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 21d19d07b940ed..ab9dd18269e49e 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_sh.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_sh.json
@@ -1,26 +1,30 @@
 [
 	{
 		"c": "#!",
-		"t": "source.shell comment.line.number-sign.shebang.shell punctuation.definition.comment.shebang.shell",
+		"t": "source.shell comment.line.number-sign.shell meta.shebang.shell punctuation.definition.comment.shebang.shell",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
 		"c": "/usr/bin/env bash",
-		"t": "source.shell comment.line.number-sign.shebang.shell",
+		"t": "source.shell comment.line.number-sign.shell meta.shebang.shell",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,23 +64,13 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
-		"c": " ",
-		"t": "source.shell meta.scope.if-block.shell meta.scope.logical-expression.shell",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
-		}
-	},
-	{
-		"c": "\"",
+		"c": " \"",
 		"t": "source.shell meta.scope.if-block.shell meta.scope.logical-expression.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
@@ -80,19 +78,23 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": "$",
-		"t": "source.shell meta.scope.if-block.shell meta.scope.logical-expression.shell string.quoted.double.shell variable.other.normal.shell punctuation.definition.variable.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.scope.logical-expression.shell string.quoted.double.shell punctuation.definition.variable.shell variable.other.normal.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -104,7 +106,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -116,7 +120,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -128,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,23 +148,13 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
-		}
-	},
-	{
-		"c": " ",
-		"t": "source.shell meta.scope.if-block.shell meta.scope.logical-expression.shell",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
-		"c": "\"",
+		"c": " \"",
 		"t": "source.shell meta.scope.if-block.shell meta.scope.logical-expression.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
@@ -164,7 +162,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -176,7 +176,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -188,7 +190,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -200,7 +204,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -212,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,19 +232,23 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": ";",
-		"t": "source.shell meta.scope.if-block.shell keyword.operator.list.shell",
+		"t": "source.shell meta.scope.if-block.shell punctuation.terminator.statement.semicolon.shell",
 		"r": {
-			"dark_plus": "keyword.operator: #D4D4D4",
-			"light_plus": "keyword.operator: #000000",
-			"dark_vs": "keyword.operator: #D4D4D4",
-			"light_vs": "keyword.operator: #000000",
-			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,31 +260,37 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": "then",
-		"t": "source.shell meta.scope.if-block.shell keyword.control.shell",
+		"t": "source.shell meta.scope.if-block.shell keyword.control.then.shell",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
 		"c": "\t",
-		"t": "source.shell meta.scope.if-block.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -296,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,259 +344,331 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": " ",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
-		"c": "[[",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.scope.logical-expression.shell punctuation.definition.logical-expression.shell",
+		"c": "[",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.scope.logical-expression.shell punctuation.definition.logical-expression.shell",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
+		}
+	},
+	{
+		"c": "[",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.scope.logical-expression.shell meta.scope.logical-expression.shell punctuation.definition.logical-expression.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": " ",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.scope.logical-expression.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.scope.logical-expression.shell meta.scope.logical-expression.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": "$",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.scope.logical-expression.shell variable.other.positional.shell punctuation.definition.variable.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.scope.logical-expression.shell meta.scope.logical-expression.shell punctuation.definition.variable.shell variable.parameter.positional.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
 		"c": "1",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.scope.logical-expression.shell variable.other.positional.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.scope.logical-expression.shell meta.scope.logical-expression.shell variable.parameter.positional.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
 		"c": " ",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.scope.logical-expression.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.scope.logical-expression.shell meta.scope.logical-expression.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": "=",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.scope.logical-expression.shell keyword.operator.logical.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.scope.logical-expression.shell meta.scope.logical-expression.shell keyword.operator.logical.shell",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
 		"c": " /",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.scope.logical-expression.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.scope.logical-expression.shell meta.scope.logical-expression.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": "*",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.scope.logical-expression.shell keyword.operator.glob.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.scope.logical-expression.shell meta.scope.logical-expression.shell keyword.operator.glob.shell",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
 		"c": " ",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.scope.logical-expression.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.scope.logical-expression.shell meta.scope.logical-expression.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
-		"c": "]]",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.scope.logical-expression.shell punctuation.definition.logical-expression.shell",
+		"c": "]",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.scope.logical-expression.shell meta.scope.logical-expression.shell punctuation.definition.logical-expression.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
+		}
+	},
+	{
+		"c": "]",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.scope.logical-expression.shell punctuation.definition.logical-expression.shell",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": " ",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": "&&",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell keyword.operator.list.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell punctuation.separator.statement.and.shell",
 		"r": {
-			"dark_plus": "keyword.operator: #D4D4D4",
-			"light_plus": "keyword.operator: #000000",
-			"dark_vs": "keyword.operator: #D4D4D4",
-			"light_vs": "keyword.operator: #000000",
-			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": " ",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": "echo",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell support.function.builtin.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell entity.name.command.shell support.function.builtin.shell",
 		"r": {
 			"dark_plus": "support.function: #DCDCAA",
 			"light_plus": "support.function: #795E26",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
 		"c": " ",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": "\"",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": "$",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell variable.other.positional.shell punctuation.definition.variable.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.variable.shell variable.parameter.positional.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
 		"c": "1",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell variable.other.positional.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell variable.parameter.positional.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
 		"c": "\"",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell punctuation.definition.string.end.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.string.end.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": " ",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -584,199 +680,247 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
 		"c": " ",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": "echo",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell support.function.builtin.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell entity.name.command.shell support.function.builtin.shell",
 		"r": {
 			"dark_plus": "support.function: #DCDCAA",
 			"light_plus": "support.function: #795E26",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
 		"c": " ",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": "\"",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": "$",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell variable.other.normal.shell punctuation.definition.variable.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.variable.shell variable.other.normal.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
 		"c": "PWD",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell variable.other.normal.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell variable.other.normal.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
 		"c": "/",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
-		"c": "${",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell variable.other.bracket.shell punctuation.definition.variable.shell",
+		"c": "$",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.variable.shell punctuation.section.bracket.curly.variable.begin.shell",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
-			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": "{",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.section.bracket.curly.variable.begin.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": "1",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell variable.other.bracket.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
-			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": "#",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell variable.other.bracket.shell keyword.operator.expansion.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell keyword.operator.expansion.shell",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
 		"c": ".",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell variable.other.bracket.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
-			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": "/",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell variable.other.bracket.shell keyword.operator.expansion.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell keyword.operator.expansion.shell",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
 		"c": "}",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell variable.other.bracket.shell punctuation.definition.variable.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.section.bracket.curly.variable.end.shell",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
-			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": "\"",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell punctuation.definition.string.end.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.string.end.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": ";",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell keyword.operator.list.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell punctuation.terminator.statement.semicolon.shell",
 		"r": {
-			"dark_plus": "keyword.operator: #D4D4D4",
-			"light_plus": "keyword.operator: #000000",
-			"dark_vs": "keyword.operator: #D4D4D4",
-			"light_vs": "keyword.operator: #000000",
-			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": " ",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -788,559 +932,1045 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
-		"c": "\tROOT=",
-		"t": "source.shell meta.scope.if-block.shell",
+		"c": "\t",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
+		}
+	},
+	{
+		"c": "ROOT",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell variable.other.assignment.shell",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell keyword.operator.assignment.shell",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
 		"c": "$(",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell punctuation.definition.string.begin.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.begin.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": "dirname",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell entity.name.command.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
-		"c": "dirname ",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell",
+		"c": " ",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": "$(",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell punctuation.definition.string.begin.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
-		"c": "dirname ",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell",
+		"c": "dirname",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell entity.name.command.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": "$(",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.interpolated.dollar.shell punctuation.definition.string.begin.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.begin.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": "realpath",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell entity.name.command.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
-		"c": "realpath ",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.interpolated.dollar.shell",
+		"c": " ",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": "\"",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": "$",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.quoted.double.shell variable.other.special.shell punctuation.definition.variable.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.variable.shell variable.parameter.positional.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
 		"c": "0",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.quoted.double.shell variable.other.special.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell variable.parameter.positional.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
 		"c": "\"",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.quoted.double.shell punctuation.definition.string.end.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.string.end.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": ")",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.interpolated.dollar.shell punctuation.definition.string.end.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.end.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": ")",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell punctuation.definition.string.end.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.end.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": ")",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell punctuation.definition.string.end.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.end.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": "else",
-		"t": "source.shell meta.scope.if-block.shell keyword.control.shell",
+		"t": "source.shell meta.scope.if-block.shell keyword.control.else.shell",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
-		"c": "\tROOT=",
-		"t": "source.shell meta.scope.if-block.shell",
+		"c": "\t",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
+		}
+	},
+	{
+		"c": "ROOT",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell variable.other.assignment.shell",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell keyword.operator.assignment.shell",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
 		"c": "$(",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell punctuation.definition.string.begin.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.begin.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": "dirname",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell entity.name.command.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
-		"c": "dirname ",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell",
+		"c": " ",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": "$(",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell punctuation.definition.string.begin.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
-		"c": "dirname ",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell",
+		"c": "dirname",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell entity.name.command.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
-		"c": "$(",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.interpolated.dollar.shell punctuation.definition.string.begin.shell",
+		"c": " ",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
-		"c": "readlink -f ",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.interpolated.dollar.shell",
+		"c": "$(",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
-		"c": "$",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.interpolated.dollar.shell variable.other.special.shell punctuation.definition.variable.shell",
+		"c": "readlink",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell entity.name.command.shell",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
-			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
-		"c": "0",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.interpolated.dollar.shell variable.other.special.shell",
+		"c": " ",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
-			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
-		"c": ")",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.interpolated.dollar.shell punctuation.definition.string.end.shell",
+		"c": "-",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell string.unquoted.argument.shell constant.other.option.dash.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
-		"c": ")",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell punctuation.definition.string.end.shell",
+		"c": "f",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell string.unquoted.argument constant.other.option",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
-		"c": ")",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell punctuation.definition.string.end.shell",
+		"c": " ",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
-		"c": "fi",
-		"t": "source.shell meta.scope.if-block.shell keyword.control.shell",
+		"c": "$",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell punctuation.definition.variable.shell variable.parameter.positional.shell",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "variable: #9CDCFE",
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
-		"c": "DEVELOPER=",
-		"t": "source.shell",
+		"c": "0",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell variable.parameter.positional.shell",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "variable: #9CDCFE",
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
-		"c": "$(",
-		"t": "source.shell string.interpolated.dollar.shell punctuation.definition.string.begin.shell",
+		"c": ")",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.end.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
-		"c": "xcode-select -print-path",
-		"t": "source.shell string.interpolated.dollar.shell",
+		"c": ")",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.end.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": ")",
-		"t": "source.shell string.interpolated.dollar.shell punctuation.definition.string.end.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.end.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
-		"c": "LIPO=",
-		"t": "source.shell",
+		"c": "fi",
+		"t": "source.shell meta.scope.if-block.shell keyword.control.shell",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
-		}
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "DEVELOPER",
+		"t": "source.shell meta.expression.assignment.shell variable.other.assignment.shell",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.shell meta.expression.assignment.shell keyword.operator.assignment.shell",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
+		}
 	},
 	{
 		"c": "$(",
-		"t": "source.shell string.interpolated.dollar.shell punctuation.definition.string.begin.shell",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
-		"c": "xcrun -sdk iphoneos -find lipo",
-		"t": "source.shell string.interpolated.dollar.shell",
+		"c": "xcode-select",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell entity.name.command.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": "-",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell string.unquoted.argument.shell constant.other.option.dash.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": "print-path",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell string.unquoted.argument constant.other.option",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": ")",
-		"t": "source.shell string.interpolated.dollar.shell punctuation.definition.string.end.shell",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.end.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
-		"c": "cat ",
-		"t": "source.shell",
+		"c": "LIPO",
+		"t": "source.shell meta.expression.assignment.shell variable.other.assignment.shell",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"hc_black": "variable: #9CDCFE",
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
-		"c": "<<",
-		"t": "source.shell string.unquoted.heredoc.expanded.no-indent.shell keyword.operator.heredoc.shell",
+		"c": "=",
+		"t": "source.shell meta.expression.assignment.shell keyword.operator.assignment.shell",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "$(",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.begin.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": "xcrun",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell entity.name.command.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": "-",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell string.unquoted.argument.shell constant.other.option.dash.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": "sdk",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell string.unquoted.argument constant.other.option",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": "iphoneos",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.argument.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": "-",
-		"t": "source.shell string.unquoted.heredoc.expanded.no-indent.shell",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell string.unquoted.argument.shell constant.other.option.dash.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": "find",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell string.unquoted.argument constant.other.option",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": "lipo",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.argument.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.end.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": "cat",
+		"t": "source.shell meta.statement.shell meta.command.shell entity.name.command.shell",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.statement.shell meta.command.shell meta.argument.shell",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
+		}
+	},
+	{
+		"c": "<<-",
+		"t": "source.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.heredoc.indent.shell keyword.operator.heredoc.shell",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
 		"c": "EOF",
-		"t": "source.shell string.unquoted.heredoc.expanded.no-indent.shell keyword.control.heredoc-token.shell",
+		"t": "source.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.heredoc.indent.shell punctuation.definition.string.heredoc.shell",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": " > /path/file",
-		"t": "source.shell string.unquoted.heredoc.expanded.no-indent.shell",
+		"t": "source.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.heredoc.indent.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": "\t# A heredoc with a variable ",
-		"t": "source.shell string.unquoted.heredoc.expanded.no-indent.shell",
+		"t": "source.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.heredoc.indent.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": "$",
-		"t": "source.shell string.unquoted.heredoc.expanded.no-indent.shell variable.other.normal.shell punctuation.definition.variable.shell",
+		"t": "source.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.heredoc.indent.shell punctuation.definition.variable.shell variable.other.normal.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
 		"c": "DEVELOPER",
-		"t": "source.shell string.unquoted.heredoc.expanded.no-indent.shell variable.other.normal.shell",
+		"t": "source.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.heredoc.indent.shell variable.other.normal.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
 		"c": "\tsome more file",
-		"t": "source.shell string.unquoted.heredoc.expanded.no-indent.shell",
+		"t": "source.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.heredoc.indent.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": "EOF",
-		"t": "source.shell string.unquoted.heredoc.expanded.no-indent.shell keyword.control.heredoc-token.shell",
+		"t": "source.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.heredoc.indent.shell punctuation.definition.string.heredoc.shell",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1352,7 +1982,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1364,7 +1996,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1376,7 +2010,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1388,7 +2024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1400,79 +2038,93 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": "\t",
-		"t": "source.shell meta.function.shell meta.scope.group.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": "cd",
-		"t": "source.shell meta.function.shell meta.scope.group.shell support.function.builtin.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell entity.name.command.shell support.function.builtin.shell",
 		"r": {
 			"dark_plus": "support.function: #DCDCAA",
 			"light_plus": "support.function: #795E26",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
 		"c": " ",
-		"t": "source.shell meta.function.shell meta.scope.group.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": "$",
-		"t": "source.shell meta.function.shell meta.scope.group.shell variable.other.normal.shell punctuation.definition.variable.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell punctuation.definition.variable.shell variable.other.normal.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
 		"c": "ROOT",
-		"t": "source.shell meta.function.shell meta.scope.group.shell variable.other.normal.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell variable.other.normal.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
 		"c": "\t",
-		"t": "source.shell meta.function.shell meta.scope.group.shell punctuation.whitespace.comment.leading.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1484,7 +2136,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1496,43 +2150,121 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
 		"c": "\t",
-		"t": "source.shell meta.function.shell meta.scope.group.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": "test",
-		"t": "source.shell meta.function.shell meta.scope.group.shell support.function.builtin.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell entity.name.command.shell support.function.builtin.shell",
 		"r": {
 			"dark_plus": "support.function: #DCDCAA",
 			"light_plus": "support.function: #795E26",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
-		"c": " -d node_modules ",
-		"t": "source.shell meta.function.shell meta.scope.group.shell",
+		"c": " ",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
+		}
+	},
+	{
+		"c": "-",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell string.unquoted.argument.shell constant.other.option.dash.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": "d",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell string.unquoted.argument constant.other.option",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
+		}
+	},
+	{
+		"c": "node_modules",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.argument.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1544,31 +2276,93 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
-		"c": " ./scripts/npm.sh install",
-		"t": "source.shell meta.function.shell meta.scope.group.shell",
+		"c": " ",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
+		}
+	},
+	{
+		"c": ".",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell entity.name.command.shell support.function.builtin.shell",
+		"r": {
+			"dark_plus": "support.function: #DCDCAA",
+			"light_plus": "support.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.function: #DCDCAA",
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
+		}
+	},
+	{
+		"c": "/scripts/npm.sh",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell entity.name.command.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
+		}
+	},
+	{
+		"c": "install",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.argument.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": "\t",
-		"t": "source.shell meta.function.shell meta.scope.group.shell punctuation.whitespace.comment.leading.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1580,7 +2374,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1592,7 +2388,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1604,43 +2402,93 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": "export",
-		"t": "source.shell meta.function.shell meta.scope.group.shell storage.modifier.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell storage.modifier.export.shell",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
-		"c": " NODE_ENV=development",
-		"t": "source.shell meta.function.shell meta.scope.group.shell",
+		"c": " ",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.expression.assignment.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
+		}
+	},
+	{
+		"c": "NODE_ENV",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.expression.assignment.shell variable.other.assignment.shell",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.expression.assignment.shell keyword.operator.assignment.shell",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "development",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.expression.assignment.shell string.unquoted.argument.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": "\t",
-		"t": "source.shell meta.function.shell meta.scope.group.shell punctuation.whitespace.comment.leading.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1652,7 +2500,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1664,7 +2514,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1676,7 +2528,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1688,7 +2542,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1700,7 +2556,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1712,23 +2570,13 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
-		"c": " ",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.scope.logical-expression.shell",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
-		}
-	},
-	{
-		"c": "\"",
+		"c": " \"",
 		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.scope.logical-expression.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
@@ -1736,19 +2584,23 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": "$",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.scope.logical-expression.shell string.quoted.double.shell variable.other.normal.shell punctuation.definition.variable.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.scope.logical-expression.shell string.quoted.double.shell punctuation.definition.variable.shell variable.other.normal.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1760,7 +2612,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1772,7 +2626,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1784,7 +2640,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1796,23 +2654,13 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
-		}
-	},
-	{
-		"c": " ",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.scope.logical-expression.shell",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
-		"c": "\"",
+		"c": " \"",
 		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.scope.logical-expression.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
@@ -1820,7 +2668,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1832,7 +2682,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1844,7 +2696,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1856,7 +2710,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1868,7 +2724,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1880,19 +2738,23 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": ";",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell keyword.operator.list.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell punctuation.terminator.statement.semicolon.shell",
 		"r": {
-			"dark_plus": "keyword.operator: #D4D4D4",
-			"light_plus": "keyword.operator: #000000",
-			"dark_vs": "keyword.operator: #D4D4D4",
-			"light_vs": "keyword.operator: #000000",
-			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1904,127 +2766,177 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": "then",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell keyword.control.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell keyword.control.then.shell",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
 		"c": "\t\t",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": "exec",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell support.function.builtin.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell entity.name.command.shell support.function.builtin.shell",
 		"r": {
 			"dark_plus": "support.function: #DCDCAA",
 			"light_plus": "support.function: #795E26",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
-		"c": " ./.build/electron/Electron.app/Contents/MacOS/Electron ",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell",
+		"c": " ",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
-		"c": ".",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell support.function.builtin.shell",
+		"c": "./.build/electron/Electron.app/Contents/MacOS/Electron",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.argument.shell",
 		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
+		}
+	},
+	{
+		"c": ".",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.argument.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": " ",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": "\"",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": "$",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell string.quoted.double.shell variable.other.special.shell punctuation.definition.variable.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.variable.shell variable.parameter.positional.all.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
 		"c": "@",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell string.quoted.double.shell variable.other.special.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell variable.parameter.positional.all.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
 		"c": "\"",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell string.quoted.double.shell punctuation.definition.string.end.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.string.end.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2036,127 +2948,177 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": "else",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell keyword.control.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell keyword.control.else.shell",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
 		"c": "\t\t",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": "exec",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell support.function.builtin.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell entity.name.command.shell support.function.builtin.shell",
 		"r": {
 			"dark_plus": "support.function: #DCDCAA",
 			"light_plus": "support.function: #795E26",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
-		"c": " ./.build/electron/electron ",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell",
+		"c": " ",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
-		"c": ".",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell support.function.builtin.shell",
+		"c": "./.build/electron/electron",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.argument.shell",
 		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
+		}
+	},
+	{
+		"c": ".",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.argument.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": " ",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": "\"",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": "$",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell string.quoted.double.shell variable.other.special.shell punctuation.definition.variable.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.variable.shell variable.parameter.positional.all.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
 		"c": "@",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell string.quoted.double.shell variable.other.special.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell variable.parameter.positional.all.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
 		"c": "\"",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell string.quoted.double.shell punctuation.definition.string.end.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.string.end.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2168,7 +3130,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2180,7 +3144,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2192,67 +3158,93 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
+		}
+	},
+	{
+		"c": "code",
+		"t": "source.shell meta.statement.shell meta.command.shell entity.name.command.shell",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
-		"c": "code ",
-		"t": "source.shell",
+		"c": " ",
+		"t": "source.shell meta.statement.shell meta.command.shell meta.argument.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": "\"",
-		"t": "source.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
+		"t": "source.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": "$",
-		"t": "source.shell string.quoted.double.shell variable.other.special.shell punctuation.definition.variable.shell",
+		"t": "source.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.variable.shell variable.parameter.positional.all.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
 		"c": "@",
-		"t": "source.shell string.quoted.double.shell variable.other.special.shell",
+		"t": "source.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell variable.parameter.positional.all.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
 		"c": "\"",
-		"t": "source.shell string.quoted.double.shell punctuation.definition.string.end.shell",
+		"t": "source.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.string.end.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	}
 ]
\ 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 bed674753b6ff0..7ea1831dd43076 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_shader.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_shader.json
@@ -8,7 +8,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.variable: #9CDCFE",
-			"hc_light": "support.variable: #001080"
+			"dark_plus_experimental": "support.variable: #9CDCFE",
+			"hc_light": "support.variable: #001080",
+			"light_plus_experimental": "support.variable: #001080"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 3c17ba83caa0e8..2bb52013d75875 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_sql.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_sql.json
@@ -8,7 +8,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 5f236526389e6a..6a0a31ef2c62e6 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_sty.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_sty.json
@@ -8,7 +8,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "constant.character: #569CD6",
-			"hc_light": "constant.character.escape: #EE0000"
+			"dark_plus_experimental": "constant.character.escape: #D7BA7D",
+			"hc_light": "constant.character.escape: #EE0000",
+			"light_plus_experimental": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 d14faa718a6984..ec5b18517d0c14 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_swift.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_swift.json
@@ -8,7 +8,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword: #569CD6",
-			"hc_light": "keyword: #0F4A85"
+			"dark_plus_experimental": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_plus_experimental": "keyword: #0000FF"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 04549af34d9ba4..3d2045c309caa6 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_tex.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_tex.json
@@ -8,7 +8,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -20,19 +22,23 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
 		"c": "[",
-		"t": "text.tex.latex meta.preamble.latex meta.parameter.optional.latex punctuation.definition.optional.arguments.begin.latex",
+		"t": "text.tex.latex meta.preamble.latex meta.parameter.optional.latex punctuation.definition.arguments.optional.begin.latex",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -44,19 +50,23 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
 		"c": "]",
-		"t": "text.tex.latex meta.preamble.latex meta.parameter.optional.latex punctuation.definition.optional.arguments.end.latex",
+		"t": "text.tex.latex meta.preamble.latex meta.parameter.optional.latex punctuation.definition.arguments.optional.end.latex",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73"
+			"dark_plus_experimental": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_plus_experimental": "support.class: #267F99"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 941549e796f832..ce087ff58dc968 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_ts.json
@@ -8,7 +8,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -2168,7 +2528,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2180,7 +2542,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2192,7 +2556,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2204,7 +2570,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2216,7 +2584,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2228,7 +2598,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2240,7 +2612,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2252,7 +2626,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2264,7 +2640,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -2276,7 +2654,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2288,7 +2668,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2300,7 +2682,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2312,7 +2696,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2324,7 +2710,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2336,7 +2724,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2348,7 +2738,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2360,7 +2752,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2372,7 +2766,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -2384,7 +2780,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2396,7 +2794,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2408,7 +2808,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2420,7 +2822,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2432,7 +2836,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2444,7 +2850,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2456,7 +2864,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2468,7 +2878,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2480,7 +2892,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2492,7 +2906,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2504,7 +2920,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -2516,7 +2934,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2528,7 +2948,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2540,7 +2962,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2552,7 +2976,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2564,7 +2990,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2576,7 +3004,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2588,7 +3018,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2600,7 +3032,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2612,7 +3046,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2624,7 +3060,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2636,7 +3074,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -2648,7 +3088,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2660,7 +3102,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2672,7 +3116,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2684,7 +3130,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2696,7 +3144,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2708,7 +3158,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2720,7 +3172,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2732,7 +3186,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -2744,7 +3200,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2756,7 +3214,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2768,7 +3228,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -2780,7 +3242,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2792,7 +3256,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2804,7 +3270,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2816,7 +3284,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2828,7 +3298,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2840,7 +3312,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2852,7 +3326,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2864,7 +3340,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2876,7 +3354,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2888,7 +3368,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2900,7 +3382,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -2912,7 +3396,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2924,7 +3410,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2936,7 +3424,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2948,7 +3438,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2960,7 +3452,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2972,7 +3466,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2984,7 +3480,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2996,7 +3494,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3008,7 +3508,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -3020,7 +3522,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3032,7 +3536,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3044,7 +3550,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3056,7 +3564,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3068,7 +3578,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3080,7 +3592,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3092,7 +3606,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3104,7 +3620,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3116,7 +3634,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -3128,7 +3648,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3140,7 +3662,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3152,7 +3676,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3164,7 +3690,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3176,7 +3704,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3188,7 +3718,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -3200,7 +3732,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3212,7 +3746,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -3224,7 +3760,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3236,7 +3774,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3248,7 +3788,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3260,7 +3802,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -3272,7 +3816,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3284,7 +3830,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -3296,7 +3844,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3308,7 +3858,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3320,7 +3872,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3332,7 +3886,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3344,7 +3900,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3356,7 +3914,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -3368,7 +3928,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3380,7 +3942,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -3392,7 +3956,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3404,7 +3970,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3416,7 +3984,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3428,7 +3998,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3440,7 +4012,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3452,7 +4026,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3464,7 +4040,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3476,7 +4054,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -3488,7 +4068,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3500,7 +4082,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -3512,7 +4096,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3524,7 +4110,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3536,7 +4124,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3548,7 +4138,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3560,7 +4152,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3572,7 +4166,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3584,7 +4180,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3596,7 +4194,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -3608,7 +4208,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3620,7 +4222,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3632,7 +4236,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -3644,7 +4250,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3656,7 +4264,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3668,7 +4278,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3680,7 +4292,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3692,7 +4306,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3704,7 +4320,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3716,7 +4334,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3728,7 +4348,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3740,7 +4362,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3752,7 +4376,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3764,7 +4390,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3776,7 +4404,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -3788,7 +4418,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3800,7 +4432,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3812,7 +4446,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3824,7 +4460,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3836,7 +4474,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -3848,7 +4488,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3860,7 +4502,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3872,7 +4516,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3884,7 +4530,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3896,7 +4544,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3908,7 +4558,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3920,7 +4572,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -3932,7 +4586,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3944,7 +4600,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3956,7 +4614,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3968,7 +4628,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3980,7 +4642,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -3992,7 +4656,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4004,7 +4670,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4016,7 +4684,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4028,7 +4698,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -4040,7 +4712,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4052,7 +4726,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -4064,7 +4740,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4076,7 +4754,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4088,7 +4768,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4100,7 +4782,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4112,7 +4796,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4124,7 +4810,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -4136,7 +4824,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4148,7 +4838,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4160,7 +4852,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4172,7 +4866,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -4184,7 +4880,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4196,7 +4894,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -4208,7 +4908,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4220,7 +4922,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4232,7 +4936,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4244,7 +4950,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -4256,7 +4964,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4268,7 +4978,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -4280,7 +4992,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4292,7 +5006,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4304,7 +5020,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4316,7 +5034,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -4328,7 +5048,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4340,7 +5062,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4352,7 +5076,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -4364,7 +5090,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4376,7 +5104,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4388,7 +5118,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -4400,7 +5132,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4412,7 +5146,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4424,7 +5160,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4436,7 +5174,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -4448,7 +5188,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4460,7 +5202,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4472,7 +5216,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4484,7 +5230,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -4496,7 +5244,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4508,7 +5258,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -4520,7 +5272,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4532,7 +5286,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -4544,7 +5300,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4556,7 +5314,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -4568,7 +5328,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4580,7 +5342,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -4592,7 +5356,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4604,7 +5370,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -4616,7 +5384,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4628,7 +5398,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4640,7 +5412,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4652,7 +5426,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -4664,7 +5440,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4676,7 +5454,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -4688,7 +5468,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4700,7 +5482,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -4712,7 +5496,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4724,7 +5510,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4736,7 +5524,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4748,7 +5538,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -4760,7 +5552,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4772,7 +5566,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -4784,7 +5580,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4796,7 +5594,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -4808,7 +5608,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4820,7 +5622,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -4832,7 +5636,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4844,7 +5650,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4856,7 +5664,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4868,7 +5678,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4880,7 +5692,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4892,7 +5706,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4904,7 +5720,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4916,7 +5734,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -4928,7 +5748,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4940,7 +5762,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4952,7 +5776,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4964,7 +5790,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4976,7 +5804,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -4988,7 +5818,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -5000,7 +5832,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5012,7 +5846,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5024,7 +5860,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -5036,7 +5874,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5048,7 +5888,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -5060,7 +5902,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5072,7 +5916,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5084,7 +5930,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5096,7 +5944,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5108,7 +5958,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -5120,7 +5972,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5132,7 +5986,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -5144,7 +6000,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5156,7 +6014,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5168,7 +6028,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5180,7 +6042,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5192,7 +6056,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5204,7 +6070,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -5216,7 +6084,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5228,7 +6098,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -5240,7 +6112,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5252,7 +6126,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -5264,7 +6140,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5276,7 +6154,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5288,7 +6168,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5300,7 +6182,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -5312,7 +6196,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5324,7 +6210,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5336,7 +6224,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5348,7 +6238,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5360,7 +6252,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -5372,7 +6266,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5384,7 +6280,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -5396,7 +6294,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5408,7 +6308,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5420,7 +6322,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5432,7 +6336,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -5444,7 +6350,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5456,7 +6364,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -5468,7 +6378,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5480,7 +6392,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -5492,7 +6406,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5504,7 +6420,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5516,7 +6434,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5528,7 +6448,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -5540,7 +6462,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5552,7 +6476,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -5564,7 +6490,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5576,7 +6504,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5588,7 +6518,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5600,7 +6532,9 @@
 			"dark_vs": "keyword.operator.new: #569CD6",
 			"light_vs": "keyword.operator.new: #0000FF",
 			"hc_black": "keyword.operator.new: #569CD6",
-			"hc_light": "keyword.operator.new: #0F4A85"
+			"dark_plus_experimental": "keyword.operator.new: #569CD6",
+			"hc_light": "keyword.operator.new: #0F4A85",
+			"light_plus_experimental": "keyword.operator.new: #0000FF"
 		}
 	},
 	{
@@ -5612,7 +6546,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5624,7 +6560,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -5636,7 +6574,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5648,7 +6588,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -5660,7 +6602,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5672,7 +6616,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -5684,7 +6630,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5696,7 +6644,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5708,7 +6658,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -5720,7 +6672,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5732,7 +6686,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -5744,7 +6700,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5756,7 +6714,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5768,7 +6728,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -5780,7 +6742,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5792,7 +6756,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -5804,7 +6770,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5816,7 +6784,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5828,7 +6798,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5840,7 +6812,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -5852,7 +6826,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5864,7 +6840,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -5876,7 +6854,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5888,7 +6868,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5900,7 +6882,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5912,7 +6896,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5924,7 +6910,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5936,7 +6924,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5948,7 +6938,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5960,7 +6952,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -5972,7 +6966,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -5984,7 +6980,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5996,7 +6994,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6008,7 +7008,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6020,7 +7022,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6032,7 +7036,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6044,7 +7050,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -6056,7 +7064,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6068,7 +7078,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -6080,7 +7092,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6092,7 +7106,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6104,7 +7120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6116,7 +7134,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -6128,7 +7148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6140,7 +7162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6152,7 +7176,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6164,7 +7190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6176,7 +7204,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6188,7 +7218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6200,7 +7232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -6212,7 +7246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6224,7 +7260,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6236,7 +7274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6248,7 +7288,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6260,7 +7302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6272,7 +7316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6284,7 +7330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -6296,7 +7344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6308,7 +7358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -6320,7 +7372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6332,7 +7386,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6344,7 +7400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6356,7 +7414,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -6368,7 +7428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6380,7 +7442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6392,7 +7456,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6404,7 +7470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6416,7 +7484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -6428,7 +7498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6440,7 +7512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6452,7 +7526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6464,7 +7540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6476,7 +7554,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -6488,7 +7568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6500,7 +7582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -6512,7 +7596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6524,7 +7610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -6536,7 +7624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6548,7 +7638,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6560,7 +7652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6572,7 +7666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -6584,7 +7680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6596,7 +7694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6608,7 +7708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6620,7 +7722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6632,7 +7736,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -6644,7 +7750,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6656,7 +7764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -6668,7 +7778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6680,7 +7792,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6692,7 +7806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6704,7 +7820,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6716,7 +7834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6728,7 +7848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6740,7 +7862,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6752,7 +7876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6764,7 +7890,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -6776,7 +7904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6788,7 +7918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -6800,7 +7932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6812,7 +7946,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6824,7 +7960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6836,7 +7974,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6848,7 +7988,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6860,7 +8002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6872,7 +8016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6884,7 +8030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -6896,7 +8044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6908,7 +8058,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6920,7 +8072,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6932,7 +8086,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6944,7 +8100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6956,7 +8114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -6968,7 +8128,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6980,7 +8142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -6992,7 +8156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7004,7 +8170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7016,7 +8184,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7028,7 +8198,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -7040,7 +8212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7052,7 +8226,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -7064,7 +8240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7076,7 +8254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -7088,7 +8268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7100,7 +8282,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7112,7 +8296,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7124,7 +8310,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7136,7 +8324,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7148,7 +8338,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7160,7 +8352,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7172,7 +8366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -7184,7 +8380,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7196,7 +8394,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7208,7 +8408,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7220,7 +8422,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7232,7 +8436,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7244,7 +8450,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7256,7 +8464,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -7268,7 +8478,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7280,7 +8492,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7292,7 +8506,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7304,7 +8520,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7316,7 +8534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7328,7 +8548,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -7340,7 +8562,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7352,7 +8576,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -7364,7 +8590,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7376,7 +8604,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7388,7 +8618,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7400,7 +8632,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7412,7 +8646,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7424,7 +8660,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7436,7 +8674,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7448,7 +8688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -7460,7 +8702,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7472,7 +8716,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7484,7 +8730,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7496,7 +8744,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7508,7 +8758,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7520,7 +8772,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7532,7 +8786,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -7544,7 +8800,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7556,7 +8814,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7568,7 +8828,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -7580,7 +8842,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7592,7 +8856,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -7604,7 +8870,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7616,7 +8884,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -7628,7 +8898,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7640,7 +8912,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -7652,7 +8926,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7664,7 +8940,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -7676,7 +8954,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7688,7 +8968,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7700,7 +8982,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7712,7 +8996,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -7724,7 +9010,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7736,7 +9024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7748,7 +9038,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -7760,7 +9052,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7772,7 +9066,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -7784,7 +9080,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7796,7 +9094,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7808,7 +9108,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7820,7 +9122,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -7832,7 +9136,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7844,7 +9150,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7856,7 +9164,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7868,7 +9178,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7880,7 +9192,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -7892,7 +9206,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7904,7 +9220,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7916,7 +9234,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7928,7 +9248,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7940,7 +9262,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7952,7 +9276,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7964,7 +9290,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7976,7 +9304,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -7988,7 +9318,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8000,7 +9332,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8012,7 +9346,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8024,7 +9360,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -8036,7 +9374,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8048,7 +9388,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8060,7 +9402,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8072,7 +9416,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8084,7 +9430,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -8096,7 +9444,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8108,7 +9458,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -8120,7 +9472,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8132,7 +9486,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -8144,7 +9500,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8156,7 +9514,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8168,7 +9528,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8180,7 +9542,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -8192,7 +9556,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8204,7 +9570,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8216,7 +9584,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -8228,7 +9598,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8240,7 +9612,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8252,7 +9626,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8264,7 +9640,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -8276,7 +9654,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8288,7 +9668,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8300,7 +9682,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8312,7 +9696,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8324,7 +9710,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8336,7 +9724,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8348,7 +9738,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -8360,7 +9752,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8372,7 +9766,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8384,7 +9780,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8396,7 +9794,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8408,7 +9808,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8420,7 +9822,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8432,7 +9836,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8444,7 +9850,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -8456,7 +9864,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8468,7 +9878,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8480,7 +9892,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8492,7 +9906,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8504,7 +9920,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8516,7 +9934,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8528,7 +9948,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8540,7 +9962,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -8552,7 +9976,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8564,7 +9990,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8576,7 +10004,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8588,7 +10018,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -8600,7 +10032,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8612,7 +10046,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -8624,7 +10060,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8636,7 +10074,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8648,7 +10088,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8660,7 +10102,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -8672,7 +10116,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8684,7 +10130,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8696,7 +10144,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8708,7 +10158,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -8720,7 +10172,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8732,7 +10186,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -8744,7 +10200,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8756,7 +10214,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8768,7 +10228,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8780,7 +10242,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8792,7 +10256,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -8804,7 +10270,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8816,7 +10284,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8828,7 +10298,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8840,7 +10312,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8852,7 +10326,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -8864,7 +10340,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8876,7 +10354,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -8888,7 +10368,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8900,7 +10382,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -8912,7 +10396,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8924,7 +10410,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -8936,7 +10424,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8948,7 +10438,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8960,7 +10452,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -8972,7 +10466,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8984,7 +10480,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -8996,7 +10494,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9008,7 +10508,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9020,7 +10522,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -9032,7 +10536,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9044,7 +10550,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -9056,7 +10564,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9068,7 +10578,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9080,7 +10592,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9092,7 +10606,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9104,7 +10620,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9116,7 +10634,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9128,7 +10648,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -9140,7 +10662,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9152,7 +10676,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9164,7 +10690,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9176,7 +10704,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9188,7 +10718,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9200,7 +10732,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9212,7 +10746,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9224,7 +10760,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9236,7 +10774,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -9248,7 +10788,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9260,7 +10802,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -9272,7 +10816,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9284,7 +10830,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9296,7 +10844,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9308,7 +10858,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9320,7 +10872,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9332,7 +10886,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9344,7 +10900,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9356,7 +10914,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9368,7 +10928,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9380,7 +10942,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9392,7 +10956,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9404,7 +10970,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9416,7 +10984,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -9428,7 +10998,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9440,7 +11012,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9452,7 +11026,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9464,7 +11040,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9476,7 +11054,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9488,7 +11068,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9500,7 +11082,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9512,7 +11096,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9524,7 +11110,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9536,7 +11124,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9548,7 +11138,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -9560,7 +11152,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9572,7 +11166,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9584,7 +11180,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9596,7 +11194,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9608,7 +11208,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9620,7 +11222,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9632,7 +11236,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9644,7 +11250,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9656,7 +11264,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -9668,7 +11278,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9680,7 +11292,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -9692,7 +11306,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9704,7 +11320,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9716,7 +11334,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9728,7 +11348,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9740,7 +11362,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9752,7 +11376,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9764,7 +11390,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9776,7 +11404,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9788,7 +11418,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9800,7 +11432,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9812,7 +11446,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9824,7 +11460,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9836,7 +11474,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -9848,7 +11488,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9860,7 +11502,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9872,7 +11516,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9884,7 +11530,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9896,7 +11544,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9908,7 +11558,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9920,7 +11572,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9932,7 +11586,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9944,7 +11600,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9956,7 +11614,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9968,7 +11628,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -9980,7 +11642,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -9992,7 +11656,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -10004,7 +11670,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10016,7 +11684,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -10028,7 +11698,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10040,7 +11712,9 @@
 			"dark_vs": "keyword.operator.new: #569CD6",
 			"light_vs": "keyword.operator.new: #0000FF",
 			"hc_black": "keyword.operator.new: #569CD6",
-			"hc_light": "keyword.operator.new: #0F4A85"
+			"dark_plus_experimental": "keyword.operator.new: #569CD6",
+			"hc_light": "keyword.operator.new: #0F4A85",
+			"light_plus_experimental": "keyword.operator.new: #0000FF"
 		}
 	},
 	{
@@ -10052,7 +11726,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10064,7 +11740,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -10076,7 +11754,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10088,7 +11768,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -10100,7 +11782,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10112,7 +11796,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10124,7 +11810,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -10136,7 +11824,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10148,7 +11838,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10160,7 +11852,9 @@
 			"dark_vs": "constant.language: #569CD6",
 			"light_vs": "constant.language: #0000FF",
 			"hc_black": "constant.language: #569CD6",
-			"hc_light": "constant.language: #0F4A85"
+			"dark_plus_experimental": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_plus_experimental": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -10172,7 +11866,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10184,7 +11880,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10196,7 +11894,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10208,7 +11908,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10220,7 +11922,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10232,7 +11936,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10244,7 +11950,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -10256,7 +11964,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10268,7 +11978,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -10280,7 +11992,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10292,7 +12006,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -10304,7 +12020,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10316,7 +12034,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10328,7 +12048,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10340,7 +12062,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10352,7 +12076,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10364,7 +12090,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -10376,7 +12104,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10388,7 +12118,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -10400,7 +12132,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10412,7 +12146,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10424,7 +12160,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10436,7 +12174,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10448,7 +12188,9 @@
 			"dark_vs": "storage.modifier: #569CD6",
 			"light_vs": "storage.modifier: #0000FF",
 			"hc_black": "storage.modifier: #569CD6",
-			"hc_light": "storage.modifier: #0F4A85"
+			"dark_plus_experimental": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_plus_experimental": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -10460,7 +12202,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10472,7 +12216,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -10484,7 +12230,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10496,7 +12244,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -10508,7 +12258,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10520,7 +12272,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10532,7 +12286,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10544,7 +12300,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -10556,7 +12314,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10568,7 +12328,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10580,7 +12342,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10592,7 +12356,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10604,7 +12370,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -10616,7 +12384,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10628,7 +12398,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -10640,7 +12412,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10652,7 +12426,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -10664,7 +12440,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10676,7 +12454,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10688,7 +12468,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10700,7 +12482,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10712,7 +12496,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10724,7 +12510,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10736,7 +12524,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -10748,7 +12538,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10760,7 +12552,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -10772,7 +12566,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10784,7 +12580,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10796,7 +12594,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10808,7 +12608,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -10820,7 +12622,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10832,7 +12636,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -10844,7 +12650,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10856,7 +12664,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -10868,7 +12678,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10880,7 +12692,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -10892,7 +12706,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10904,7 +12720,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10916,7 +12734,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -10928,7 +12748,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10940,7 +12762,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -10952,7 +12776,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10964,7 +12790,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -10976,7 +12804,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -10988,7 +12818,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11000,7 +12832,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11012,7 +12846,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -11024,7 +12860,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11036,7 +12874,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11048,7 +12888,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11060,7 +12902,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11072,7 +12916,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -11084,7 +12930,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11096,7 +12944,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11108,7 +12958,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11120,7 +12972,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -11132,7 +12986,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11144,7 +13000,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11156,7 +13014,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11168,7 +13028,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11180,7 +13042,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11192,7 +13056,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11204,7 +13070,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11216,7 +13084,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -11228,7 +13098,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11240,7 +13112,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11252,7 +13126,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11264,7 +13140,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11276,7 +13154,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11288,7 +13168,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11300,7 +13182,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11312,7 +13196,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11324,7 +13210,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -11336,7 +13224,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11348,7 +13238,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11360,7 +13252,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11372,7 +13266,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11384,7 +13280,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -11396,7 +13294,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11408,7 +13308,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11420,7 +13322,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11432,7 +13336,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11444,7 +13350,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -11456,7 +13364,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11468,7 +13378,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11480,7 +13392,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11492,7 +13406,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11504,7 +13420,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11516,7 +13434,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -11528,7 +13448,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11540,7 +13462,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11552,7 +13476,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11564,7 +13490,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11576,7 +13504,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11588,7 +13518,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11600,7 +13532,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11612,7 +13546,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11624,7 +13560,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11636,7 +13574,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11648,7 +13588,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11660,7 +13602,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11672,7 +13616,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11684,7 +13630,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -11696,7 +13644,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11708,7 +13658,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11720,7 +13672,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11732,7 +13686,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11744,7 +13700,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11756,7 +13714,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -11768,7 +13728,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11780,7 +13742,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11792,7 +13756,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11804,7 +13770,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11816,7 +13784,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -11828,7 +13798,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11840,7 +13812,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11852,7 +13826,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11864,7 +13840,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -11876,7 +13854,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11888,7 +13868,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11900,7 +13882,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11912,7 +13896,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11924,7 +13910,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11936,7 +13924,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11948,7 +13938,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11960,7 +13952,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -11972,7 +13966,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -11984,7 +13980,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -11996,7 +13994,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12008,7 +14008,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12020,7 +14022,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -12032,7 +14036,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12044,7 +14050,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -12056,7 +14064,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12068,7 +14078,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -12080,7 +14092,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12092,7 +14106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -12104,7 +14120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12116,7 +14134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12128,7 +14148,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -12140,7 +14162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12152,7 +14176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -12164,7 +14190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12176,7 +14204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12188,7 +14218,9 @@
 			"dark_vs": "variable.language: #569CD6",
 			"light_vs": "variable.language: #0000FF",
 			"hc_black": "variable.language.this: #569CD6",
-			"hc_light": "variable.language: #0F4A85"
+			"dark_plus_experimental": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_plus_experimental": "variable.language: #0000FF"
 		}
 	},
 	{
@@ -12200,7 +14232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12212,7 +14246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -12224,7 +14260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12236,7 +14274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12248,7 +14288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12260,7 +14302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12272,7 +14316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12284,7 +14330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12296,7 +14344,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12308,7 +14358,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -12320,7 +14372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12332,7 +14386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -12344,7 +14400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12356,7 +14414,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12368,7 +14428,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12380,7 +14442,9 @@
 			"dark_vs": "keyword.operator.new: #569CD6",
 			"light_vs": "keyword.operator.new: #0000FF",
 			"hc_black": "keyword.operator.new: #569CD6",
-			"hc_light": "keyword.operator.new: #0F4A85"
+			"dark_plus_experimental": "keyword.operator.new: #569CD6",
+			"hc_light": "keyword.operator.new: #0F4A85",
+			"light_plus_experimental": "keyword.operator.new: #0000FF"
 		}
 	},
 	{
@@ -12392,7 +14456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12404,7 +14470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -12416,7 +14484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12428,7 +14498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -12440,7 +14512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -12452,7 +14526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ 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 2e5cdf5b960ea1..c4e5fd0b8cd7f2 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_vb.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_vb.json
@@ -8,7 +8,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.type: #4EC9B0",
-			"hc_light": "support.type: #185E73"
+			"dark_plus_experimental": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_plus_experimental": "support.type: #267F99"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC"
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.function: #DCDCAA",
-			"hc_light": "entity.name.function: #5E2CBC"
+			"dark_plus_experimental": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_plus_experimental": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1976,7 +2304,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1988,7 +2318,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2000,7 +2332,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2012,7 +2346,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2024,7 +2360,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2036,7 +2374,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2048,7 +2388,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2060,7 +2402,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2072,7 +2416,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2084,7 +2430,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2096,7 +2444,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2108,7 +2458,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2120,7 +2472,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2132,7 +2486,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2144,7 +2500,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2156,7 +2514,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2168,7 +2528,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2180,7 +2542,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2192,7 +2556,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2204,7 +2570,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2216,7 +2584,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2228,7 +2598,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2240,7 +2612,9 @@
 			"dark_vs": "keyword.operator: #D4D4D4",
 			"light_vs": "keyword.operator: #000000",
 			"hc_black": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000"
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2252,7 +2626,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -2264,7 +2640,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2276,7 +2654,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2288,7 +2668,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2300,7 +2682,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2312,7 +2696,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2324,7 +2710,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2336,7 +2724,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2348,7 +2738,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2360,7 +2752,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2372,7 +2766,9 @@
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
 			"hc_black": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85"
+			"dark_plus_experimental": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_plus_experimental": "storage.type: #0000FF"
 		}
 	}
 ]
\ 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 64b2f7bc6e864c..a2b332f9937834 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_xml.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_xml.json
@@ -8,7 +8,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1244,7 +1450,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1256,7 +1464,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1268,7 +1478,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1280,7 +1492,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1292,7 +1506,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1304,7 +1520,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1316,7 +1534,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1328,7 +1548,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1340,7 +1562,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1352,7 +1576,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1364,7 +1590,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1376,7 +1604,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1388,7 +1618,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1400,7 +1632,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1412,7 +1646,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1424,7 +1660,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1436,7 +1674,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1448,7 +1688,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1460,7 +1702,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1472,7 +1716,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1484,7 +1730,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1496,7 +1744,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1508,7 +1758,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1520,7 +1772,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1532,7 +1786,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1544,7 +1800,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1556,7 +1814,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1568,7 +1828,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1580,7 +1842,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -1592,7 +1856,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -1604,7 +1870,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -1616,7 +1884,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1628,7 +1898,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1640,7 +1912,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1652,7 +1926,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -1664,7 +1940,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -1676,7 +1954,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -1688,7 +1968,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1700,7 +1982,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1712,7 +1996,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1724,7 +2010,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1736,7 +2024,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1748,7 +2038,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1760,7 +2052,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1772,7 +2066,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -1784,7 +2080,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -1796,7 +2094,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -1808,7 +2108,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1820,7 +2122,9 @@
 			"dark_vs": "entity.other.attribute-name: #9CDCFE",
 			"light_vs": "entity.other.attribute-name: #E50000",
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
-			"hc_light": "entity.other.attribute-name: #264F78"
+			"dark_plus_experimental": "entity.other.attribute-name: #9CDCFE",
+			"hc_light": "entity.other.attribute-name: #264F78",
+			"light_plus_experimental": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1832,7 +2136,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1844,7 +2150,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -1856,7 +2164,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -1868,7 +2178,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.xml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.quoted.double.xml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.quoted.double.xml: #0F4A85",
+			"light_plus_experimental": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -1880,7 +2192,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1892,7 +2206,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1904,7 +2220,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1916,7 +2234,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1928,7 +2248,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1940,7 +2262,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1952,7 +2276,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1964,7 +2290,9 @@
 			"dark_vs": "punctuation.definition.tag: #808080",
 			"light_vs": "punctuation.definition.tag: #800000",
 			"hc_black": "punctuation.definition.tag: #808080",
-			"hc_light": "punctuation.definition.tag: #0F4A85"
+			"dark_plus_experimental": "punctuation.definition.tag: #808080",
+			"hc_light": "punctuation.definition.tag: #0F4A85",
+			"light_plus_experimental": "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 8bb04aa824fd43..1ce517cbc6da31 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_yaml.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_yaml.json
@@ -8,7 +8,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73"
+			"dark_plus_experimental": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_plus_experimental": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.unquoted.plain.out.yaml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
+			"light_plus_experimental": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -248,7 +288,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -260,7 +302,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -272,7 +316,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -284,7 +330,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -296,7 +344,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -308,7 +358,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -320,7 +372,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -332,7 +386,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.unquoted.plain.out.yaml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
+			"light_plus_experimental": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	},
 	{
@@ -344,7 +400,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -356,7 +414,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -368,7 +428,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -380,7 +442,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -392,7 +456,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -404,7 +470,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -416,7 +484,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -428,7 +498,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -440,7 +512,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -452,7 +526,9 @@
 			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668",
-			"hc_light": "comment: #515151"
+			"dark_plus_experimental": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_plus_experimental": "comment: #008000"
 		}
 	},
 	{
@@ -464,7 +540,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -476,7 +554,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -488,7 +568,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -500,7 +582,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -512,7 +596,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -524,7 +610,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -536,7 +624,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -548,7 +638,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -560,7 +652,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -572,7 +666,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -584,7 +680,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -596,7 +694,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.unquoted.plain.out.yaml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
+			"light_plus_experimental": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	},
 	{
@@ -608,7 +708,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -620,7 +722,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -632,7 +736,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -644,7 +750,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -656,7 +764,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -668,7 +778,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -680,7 +792,9 @@
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D"
+			"dark_plus_experimental": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_plus_experimental": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -692,7 +806,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
-			"hc_light": "variable: #001080"
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
@@ -704,7 +820,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -716,7 +834,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -728,7 +848,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -740,7 +862,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -752,7 +876,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -764,7 +890,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -776,7 +904,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.unquoted.plain.in.yaml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.unquoted.plain.in.yaml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.unquoted.plain.in.yaml: #0F4A85",
+			"light_plus_experimental": "string.unquoted.plain.in.yaml: #0000FF"
 		}
 	},
 	{
@@ -788,7 +918,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -800,7 +932,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -812,7 +946,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -824,7 +960,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -836,7 +974,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -848,7 +988,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -860,7 +1002,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -872,7 +1016,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -884,7 +1030,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -896,7 +1044,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -908,7 +1058,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -920,7 +1072,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -932,7 +1086,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.unquoted.plain.out.yaml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
+			"light_plus_experimental": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	},
 	{
@@ -944,7 +1100,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -956,7 +1114,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -968,7 +1128,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -980,7 +1142,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -992,7 +1156,9 @@
 			"dark_vs": "constant.numeric: #B5CEA8",
 			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8",
-			"hc_light": "constant.numeric: #096D48"
+			"dark_plus_experimental": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_plus_experimental": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1004,7 +1170,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1016,7 +1184,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1028,7 +1198,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1040,7 +1212,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1052,7 +1226,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1064,7 +1240,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.unquoted.plain.in.yaml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.unquoted.plain.in.yaml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.unquoted.plain.in.yaml: #0F4A85",
+			"light_plus_experimental": "string.unquoted.plain.in.yaml: #0000FF"
 		}
 	},
 	{
@@ -1076,7 +1254,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1088,7 +1268,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1100,7 +1282,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.unquoted.plain.in.yaml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.unquoted.plain.in.yaml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.unquoted.plain.in.yaml: #0F4A85",
+			"light_plus_experimental": "string.unquoted.plain.in.yaml: #0000FF"
 		}
 	},
 	{
@@ -1112,7 +1296,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1124,7 +1310,9 @@
 			"dark_vs": "entity.name.tag: #569CD6",
 			"light_vs": "entity.name.tag: #800000",
 			"hc_black": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85"
+			"dark_plus_experimental": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_plus_experimental": "entity.name.tag: #800000"
 		}
 	},
 	{
@@ -1136,7 +1324,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1148,7 +1338,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1160,7 +1352,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1172,7 +1366,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1184,7 +1380,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.unquoted.plain.out.yaml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
+			"light_plus_experimental": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	},
 	{
@@ -1196,7 +1394,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1208,7 +1408,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1220,7 +1422,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -1232,7 +1436,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.unquoted.plain.out.yaml: #0000FF",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
+			"light_plus_experimental": "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 b3cb4f137777a1..7348f00713ea5c 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
@@ -8,7 +8,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -20,7 +22,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -32,7 +36,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -44,7 +50,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -56,7 +64,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -68,7 +78,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -80,7 +92,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -92,7 +106,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -104,7 +120,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -116,7 +134,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -128,7 +148,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -140,7 +162,9 @@
 			"dark_vs": "support.type.property-name: #9CDCFE",
 			"light_vs": "support.type.property-name.json: #0451A5",
 			"hc_black": "support.type.property-name: #D4D4D4",
-			"hc_light": "support.type.property-name.json: #0451A5"
+			"dark_plus_experimental": "support.type.property-name: #9CDCFE",
+			"hc_light": "support.type.property-name.json: #0451A5",
+			"light_plus_experimental": "support.type.property-name.json: #0451A5"
 		}
 	},
 	{
@@ -152,7 +176,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -164,7 +190,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -176,7 +204,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -188,7 +218,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -200,7 +232,9 @@
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
 			"hc_black": "string: #CE9178",
-			"hc_light": "string: #0F4A85"
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -212,7 +246,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -224,7 +260,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -236,7 +274,9 @@
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF",
-			"hc_light": "default: #292929"
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/yaml/package.json b/extensions/yaml/package.json
index cc2de87346816c..fbbabd817092d6 100644
--- a/extensions/yaml/package.json
+++ b/extensions/yaml/package.json
@@ -62,7 +62,8 @@
       "[yaml]": {
         "editor.insertSpaces": true,
         "editor.tabSize": 2,
-        "editor.autoIndent": "advanced"
+        "editor.autoIndent": "advanced",
+        "diffEditor.ignoreTrimWhitespace": false
       },
       "[dockercompose]": {
         "editor.insertSpaces": true,
diff --git a/extensions/yarn.lock b/extensions/yarn.lock
index 87d201a9541e91..54932b98ffe3bb 100644
--- a/extensions/yarn.lock
+++ b/extensions/yarn.lock
@@ -175,10 +175,10 @@ node-gyp-build@^4.3.0:
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3"
   integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q==
 
-typescript@^4.9.3:
-  version "4.9.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.3.tgz#3aea307c1746b8c384435d8ac36b8a2e580d85db"
-  integrity sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==
+typescript@4.9.4:
+  version "4.9.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.4.tgz#a2a3d2756c079abda241d75f149df9d561091e78"
+  integrity sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==
 
 vscode-grammar-updater@^1.1.0:
   version "1.1.0"
diff --git a/package.json b/package.json
index 4ec2e0554adcaa..5581e768eba29d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
-  "version": "1.74.0",
-  "distro": "b25eac1cde09b66a76a327e1c89b35852e3d38cd",
+  "version": "1.75.0",
+  "distro": "8d3884303328a6d99b4780c5958fde57848e8df3",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -62,7 +62,7 @@
   "dependencies": {
     "@microsoft/1ds-core-js": "^3.2.2",
     "@microsoft/1ds-post-js": "^3.2.2",
-    "@parcel/watcher": "2.0.5",
+    "@parcel/watcher": "2.0.7",
     "@vscode/iconv-lite-umd": "0.7.0",
     "@vscode/ripgrep": "^1.14.2",
     "@vscode/sqlite3": "5.1.2-vscode",
@@ -75,24 +75,24 @@
     "keytar": "7.9.0",
     "minimist": "^1.2.6",
     "native-is-elevated": "0.4.3",
-    "native-keymap": "3.3.0",
-    "native-watchdog": "1.4.0",
+    "native-keymap": "3.3.2",
+    "native-watchdog": "1.4.1",
     "node-pty": "0.11.0-beta11",
     "spdlog": "^0.13.0",
     "tas-client-umd": "0.1.6",
     "v8-inspect-profiler": "^0.1.0",
-    "vscode-oniguruma": "1.6.1",
+    "vscode-oniguruma": "1.7.0",
     "vscode-policy-watcher": "^1.1.1",
     "vscode-proxy-agent": "^0.12.0",
     "vscode-regexpp": "^3.1.0",
-    "vscode-textmate": "7.0.1",
-    "xterm": "5.1.0-beta.63",
-    "xterm-addon-canvas": "0.3.0-beta.27",
+    "vscode-textmate": "8.0.0",
+    "xterm": "5.2.0-beta.2",
+    "xterm-addon-canvas": "0.4.0-beta.1",
     "xterm-addon-search": "0.11.0-beta.7",
-    "xterm-addon-serialize": "0.9.0-beta.3",
+    "xterm-addon-serialize": "0.9.0",
     "xterm-addon-unicode11": "0.5.0-beta.5",
-    "xterm-addon-webgl": "0.14.0-beta.40",
-    "xterm-headless": "5.1.0-beta.63",
+    "xterm-addon-webgl": "0.15.0-beta.1",
+    "xterm-headless": "5.2.0-beta.2",
     "yauzl": "^2.9.2",
     "yazl": "^2.4.3"
   },
@@ -128,7 +128,7 @@
     "@typescript-eslint/eslint-plugin": "^5.39.0",
     "@typescript-eslint/experimental-utils": "^5.39.0",
     "@typescript-eslint/parser": "^5.39.0",
-    "@vscode/l10n-dev": "0.0.18",
+    "@vscode/l10n-dev": "0.0.21",
     "@vscode/telemetry-extractor": "^1.9.8",
     "@vscode/test-web": "^0.0.32",
     "ansi-colors": "^3.2.3",
@@ -141,14 +141,14 @@
     "cssnano": "^4.1.11",
     "debounce": "^1.0.0",
     "deemon": "^1.8.0",
-    "electron": "19.1.6",
+    "electron": "19.1.8",
     "eslint": "8.7.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-jsdoc": "^39.3.2",
     "eslint-plugin-local": "^1.0.0",
     "event-stream": "3.3.4",
     "fancy-log": "^1.3.3",
-    "fast-plist": "0.1.2",
+    "fast-plist": "0.1.3",
     "file-loader": "^5.1.0",
     "glob": "^5.0.13",
     "gulp": "^4.0.0",
@@ -207,7 +207,7 @@
     "ts-loader": "^9.2.7",
     "ts-node": "^10.9.1",
     "tsec": "0.1.4",
-    "typescript": "^5.0.0-dev.20221108",
+    "typescript": "^5.0.0-dev.20221214",
     "typescript-formatter": "7.1.0",
     "underscore": "^1.12.1",
     "util": "^0.12.4",
@@ -237,4 +237,4 @@
     "elliptic": "^6.5.3",
     "nwmatcher": "^1.4.4"
   }
-}
\ No newline at end of file
+}
diff --git a/product.json b/product.json
index 1c5ff74f2eb0c3..3e98f0f6c59a15 100644
--- a/product.json
+++ b/product.json
@@ -24,7 +24,7 @@
 	"win32AppUserModelId": "Microsoft.CodeOSS",
 	"win32ShellNameShort": "C&ode - OSS",
 	"darwinBundleIdentifier": "com.visualstudio.code.oss",
-	"linuxIconName": "com.visualstudio.code.oss",
+	"linuxIconName": "code-oss",
 	"licenseFileName": "LICENSE.txt",
 	"reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",
 	"urlProtocol": "code-oss",
@@ -47,7 +47,7 @@
 		},
 		{
 			"name": "ms-vscode.js-debug",
-			"version": "1.72.1",
+			"version": "1.74.1",
 			"repo": "https://github.com/microsoft/vscode-js-debug",
 			"metadata": {
 				"id": "25629058-ddac-4e17-abba-74678e126c5d",
diff --git a/remote/package.json b/remote/package.json
index 8e81087fa4b8ce..b102e93051cd06 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -5,7 +5,7 @@
   "dependencies": {
     "@microsoft/1ds-core-js": "^3.2.2",
     "@microsoft/1ds-post-js": "^3.2.2",
-    "@parcel/watcher": "2.0.5",
+    "@parcel/watcher": "2.0.7",
     "@vscode/iconv-lite-umd": "0.7.0",
     "@vscode/ripgrep": "^1.14.2",
     "@vscode/vscode-languagedetection": "1.0.21",
@@ -16,21 +16,21 @@
     "jschardet": "3.0.0",
     "keytar": "7.9.0",
     "minimist": "^1.2.6",
-    "native-watchdog": "1.4.0",
+    "native-watchdog": "1.4.1",
     "node-pty": "0.11.0-beta11",
     "spdlog": "^0.13.0",
     "tas-client-umd": "0.1.6",
-    "vscode-oniguruma": "1.6.1",
+    "vscode-oniguruma": "1.7.0",
     "vscode-proxy-agent": "^0.12.0",
     "vscode-regexpp": "^3.1.0",
-    "vscode-textmate": "7.0.1",
-    "xterm": "5.1.0-beta.63",
-    "xterm-addon-canvas": "0.3.0-beta.27",
+    "vscode-textmate": "8.0.0",
+    "xterm": "5.2.0-beta.2",
+    "xterm-addon-canvas": "0.4.0-beta.1",
     "xterm-addon-search": "0.11.0-beta.7",
-    "xterm-addon-serialize": "0.9.0-beta.3",
+    "xterm-addon-serialize": "0.9.0",
     "xterm-addon-unicode11": "0.5.0-beta.5",
-    "xterm-addon-webgl": "0.14.0-beta.40",
-    "xterm-headless": "5.1.0-beta.63",
+    "xterm-addon-webgl": "0.15.0-beta.1",
+    "xterm-headless": "5.2.0-beta.2",
     "yauzl": "^2.9.2",
     "yazl": "^2.4.3"
   },
diff --git a/remote/web/package.json b/remote/web/package.json
index 91555a89f1d18c..ce81167fe59f6f 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -9,12 +9,12 @@
 		"@vscode/vscode-languagedetection": "1.0.21",
 		"jschardet": "3.0.0",
 		"tas-client-umd": "0.1.6",
-		"vscode-oniguruma": "1.6.1",
-		"vscode-textmate": "7.0.1",
-		"xterm": "5.1.0-beta.63",
-		"xterm-addon-canvas": "0.3.0-beta.27",
+		"vscode-oniguruma": "1.7.0",
+		"vscode-textmate": "8.0.0",
+		"xterm": "5.2.0-beta.2",
+		"xterm-addon-canvas": "0.4.0-beta.1",
 		"xterm-addon-search": "0.11.0-beta.7",
 		"xterm-addon-unicode11": "0.5.0-beta.5",
-		"xterm-addon-webgl": "0.14.0-beta.40"
+		"xterm-addon-webgl": "0.15.0-beta.1"
 	}
 }
diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock
index 2415f10514f76d..662f1da7cdd040 100644
--- a/remote/web/yarn.lock
+++ b/remote/web/yarn.lock
@@ -58,20 +58,20 @@ tas-client-umd@0.1.6:
   resolved "https://registry.yarnpkg.com/tas-client-umd/-/tas-client-umd-0.1.6.tgz#a0cf70a68f50d406773457630666224f0eb545a6"
   integrity sha512-eOz5IK4cuNmSZI9QlqlT0FdvgfnnHDB6rjqleFaYAbzYE4RdJzYNiM28zFIXgmOVEgESvfabMFxG8WX5M4z3HA==
 
-vscode-oniguruma@1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.6.1.tgz#2bf4dfcfe3dd2e56eb549a3068c8ee39e6c30ce5"
-  integrity sha512-vc4WhSIaVpgJ0jJIejjYxPvURJavX6QG41vu0mGhqywMkQqulezEqEQ3cO3gc8GvcOpX6ycmKGqRoROEMBNXTQ==
+vscode-oniguruma@1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz#439bfad8fe71abd7798338d1cd3dc53a8beea94b"
+  integrity sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==
 
-vscode-textmate@7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-7.0.1.tgz#8118a32b02735dccd14f893b495fa5389ad7de79"
-  integrity sha512-zQ5U/nuXAAMsh691FtV0wPz89nSkHbs+IQV8FDk+wew9BlSDhf4UmWGlWJfTR2Ti6xZv87Tj5fENzKf6Qk7aLw==
+vscode-textmate@8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-8.0.0.tgz#2c7a3b1163ef0441097e0b5d6389cd5504b59e5d"
+  integrity sha512-AFbieoL7a5LMqcnOF04ji+rpXadgOXnZsxQr//r83kLPr7biP7am3g9zbaZIaBGwBRWeSvoMD4mgPdX3e4NWBg==
 
-xterm-addon-canvas@0.3.0-beta.27:
-  version "0.3.0-beta.27"
-  resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.3.0-beta.27.tgz#8b530a71473b2c2497e04ae27aa06aba213fef7c"
-  integrity sha512-8NZYm8mZXQms4aIMZFBwufakQQomnvzkwCUw3cPlJ5emErGD7OmXvV9zgJbSmhD1rnLOF5Z8AAIUqIvM3e+KUw==
+xterm-addon-canvas@0.4.0-beta.1:
+  version "0.4.0-beta.1"
+  resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.4.0-beta.1.tgz#f2742b88cd3eb1840b9e7f986c4bfe31e0f4684f"
+  integrity sha512-EfjaN0ujHJ4D8CsVpBig3xPvfRhbzAyOh8piAbNpePZmTpBzc2OQQQvEeklPriKVNDv28WbmY0Zzl5tgYM7vwg==
 
 xterm-addon-search@0.11.0-beta.7:
   version "0.11.0-beta.7"
@@ -83,12 +83,12 @@ xterm-addon-unicode11@0.5.0-beta.5:
   resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.5.0-beta.5.tgz#6992a6f56349e67b903201d52b1ad41ba3469d93"
   integrity sha512-MaqnU34WTHCUAo7moB4KhynGn03RckI0JJ8E/gXe96EzuCP6bVJIKSc5pc9iFeLF4BX1SuemOqIHYl2Q3u3NTA==
 
-xterm-addon-webgl@0.14.0-beta.40:
-  version "0.14.0-beta.40"
-  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.14.0-beta.40.tgz#8152b293c07f921db3a7cd3c4996dfd4d90f340c"
-  integrity sha512-6E3KGqAFkTU6A32c6gUjkwCX+DfohN6y+j1IcTjwh5Cu92TWn4tMr5KwJlaULfmtO0e9BKZlhmucmuHTWi1F9w==
+xterm-addon-webgl@0.15.0-beta.1:
+  version "0.15.0-beta.1"
+  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.15.0-beta.1.tgz#bc3f784c3c467a70542b8a9a8998dbe996287796"
+  integrity sha512-8f4cNXG0+dBMqp+Nvk/ZQ8Wo8s4/KbF24b2VTHTt8DuY5QXt4wSA6+NEdnABV98VYDoHl+KfXl9yyFqkcJYr8Q==
 
-xterm@5.1.0-beta.63:
-  version "5.1.0-beta.63"
-  resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.1.0-beta.63.tgz#c811680494922eab873bd36ac6fd9f5404a9e944"
-  integrity sha512-ar7SMARh6j3GUXb4tRgbqAO+kiNu4JTPx5FYXSDHr+HHt0jBgZ+lPh4AqIFwwG1pc90lRx2cvczpE5cJhG9sdw==
+xterm@5.2.0-beta.2:
+  version "5.2.0-beta.2"
+  resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.2.0-beta.2.tgz#67369235a54f41179922e662df40ff4c7c974787"
+  integrity sha512-MRAdWRfV80ae0Q3Caq/mfmCwnZZZ89Z8i/sAleio5g5dpsst9IXc0zeFpPnOvUWmtVy5P1LbfU9YCy47449DWw==
diff --git a/remote/yarn.lock b/remote/yarn.lock
index b80a0805098944..7d5f6cad2b44fc 100644
--- a/remote/yarn.lock
+++ b/remote/yarn.lock
@@ -38,10 +38,10 @@
   resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.6.tgz#6fe03468862861f5f88ac4c3959a652b3797f1bc"
   integrity sha512-D1Oivw1A4bIXhzBIy3/BBPn3p2On+kpO2NiYt9shICDK7L/w+cR6FFBUsBZ05l6iqzTeL+Jm8lAYn0g6G7DmDg==
 
-"@parcel/watcher@2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.0.5.tgz#f913a54e1601b0aac972803829b0eece48de215b"
-  integrity sha512-x0hUbjv891omnkcHD7ZOhiyyUqUUR6MNjq89JhEI3BxppeKWAm6NPQsqqRrAkCJBogdT/o/My21sXtTI9rJIsw==
+"@parcel/watcher@2.0.7":
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.0.7.tgz#c95fe1370e8c6237cb9729c9c075264acc7e21a5"
+  integrity sha512-gc3hoS6e+2XdIQ4HHljDB1l0Yx2EWh/sBBtCEFNKGSMlwASWeAQsOY/fPbxOBcZ/pg0jBh4Ga+4xHlZc4faAEQ==
   dependencies:
     node-addon-api "^3.2.1"
     node-gyp-build "^4.3.0"
@@ -432,10 +432,10 @@ napi-build-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806"
   integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==
 
-native-watchdog@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/native-watchdog/-/native-watchdog-1.4.0.tgz#547a1f9f88754c38089c622d405ed1e324c7a545"
-  integrity sha512-4FynAeGtTpoQ2+5AxVJXGEGsOzPsNYDh8Xmawjgs7YWJe+bbbgt7CYlA/Qx6X+kwtN5Ey1aNSm9MqZa0iNKkGw==
+native-watchdog@1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/native-watchdog/-/native-watchdog-1.4.1.tgz#f5462cb878796c75f8a6c3c71aa0aa52d4992e05"
+  integrity sha512-RzGXNgoe54BmkkIFwegz7eeJm7xovTj/VG5qREfF+KeSqiVzHGnVwFoLzNLlYsqSSdIOIYoCOFlEhoS+asRVyQ==
 
 node-abi@^3.3.0:
   version "3.8.0"
@@ -733,10 +733,10 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
-vscode-oniguruma@1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.6.1.tgz#2bf4dfcfe3dd2e56eb549a3068c8ee39e6c30ce5"
-  integrity sha512-vc4WhSIaVpgJ0jJIejjYxPvURJavX6QG41vu0mGhqywMkQqulezEqEQ3cO3gc8GvcOpX6ycmKGqRoROEMBNXTQ==
+vscode-oniguruma@1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz#439bfad8fe71abd7798338d1cd3dc53a8beea94b"
+  integrity sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==
 
 vscode-proxy-agent@^0.12.0:
   version "0.12.0"
@@ -757,10 +757,10 @@ vscode-regexpp@^3.1.0:
   resolved "https://registry.yarnpkg.com/vscode-regexpp/-/vscode-regexpp-3.1.0.tgz#42d059b6fffe99bd42939c0d013f632f0cad823f"
   integrity sha512-pqtN65VC1jRLawfluX4Y80MMG0DHJydWhe5ZwMHewZD6sys4LbU6lHwFAHxeuaVE6Y6+xZOtAw+9hvq7/0ejkg==
 
-vscode-textmate@7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-7.0.1.tgz#8118a32b02735dccd14f893b495fa5389ad7de79"
-  integrity sha512-zQ5U/nuXAAMsh691FtV0wPz89nSkHbs+IQV8FDk+wew9BlSDhf4UmWGlWJfTR2Ti6xZv87Tj5fENzKf6Qk7aLw==
+vscode-textmate@8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-8.0.0.tgz#2c7a3b1163ef0441097e0b5d6389cd5504b59e5d"
+  integrity sha512-AFbieoL7a5LMqcnOF04ji+rpXadgOXnZsxQr//r83kLPr7biP7am3g9zbaZIaBGwBRWeSvoMD4mgPdX3e4NWBg==
 
 vscode-windows-ca-certs@^0.3.0:
   version "0.3.0"
@@ -788,40 +788,40 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-xterm-addon-canvas@0.3.0-beta.27:
-  version "0.3.0-beta.27"
-  resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.3.0-beta.27.tgz#8b530a71473b2c2497e04ae27aa06aba213fef7c"
-  integrity sha512-8NZYm8mZXQms4aIMZFBwufakQQomnvzkwCUw3cPlJ5emErGD7OmXvV9zgJbSmhD1rnLOF5Z8AAIUqIvM3e+KUw==
+xterm-addon-canvas@0.4.0-beta.1:
+  version "0.4.0-beta.1"
+  resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.4.0-beta.1.tgz#f2742b88cd3eb1840b9e7f986c4bfe31e0f4684f"
+  integrity sha512-EfjaN0ujHJ4D8CsVpBig3xPvfRhbzAyOh8piAbNpePZmTpBzc2OQQQvEeklPriKVNDv28WbmY0Zzl5tgYM7vwg==
 
 xterm-addon-search@0.11.0-beta.7:
   version "0.11.0-beta.7"
   resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.11.0-beta.7.tgz#d90bcbe9e8f9238c18ba6145bd7ec2f8e3240052"
   integrity sha512-i/c774V0/Eon3BIFRsRR3OjKTnMGkccBo12yDkOa40tnAD4aa8FjspE3bxW/Hh1mUEhCSgBSLnMDlK/GwnUC+g==
 
-xterm-addon-serialize@0.9.0-beta.3:
-  version "0.9.0-beta.3"
-  resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.9.0-beta.3.tgz#bb4ed416db5748bcbe55a4b6d4c2151368fdae74"
-  integrity sha512-LaFuowtdxNdeuLm+KmtsoR4mgPOLu/I9k0hlWXbzAd1okJhthwMH4Y6cuL0/pFk1AclP5s+L42glv8PV0GnVsg==
+xterm-addon-serialize@0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.9.0.tgz#3eee5f5c34b16e48891ec59b213716bab2354bf4"
+  integrity sha512-qJju2YJFh8c8pbtCYtHaG7gDDHBpDJ4a4JQZvOzuiMxOjgeM1oCnFNjbhzMuK/fOUa59FmvIUGQyqn3WL9q7qw==
 
 xterm-addon-unicode11@0.5.0-beta.5:
   version "0.5.0-beta.5"
   resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.5.0-beta.5.tgz#6992a6f56349e67b903201d52b1ad41ba3469d93"
   integrity sha512-MaqnU34WTHCUAo7moB4KhynGn03RckI0JJ8E/gXe96EzuCP6bVJIKSc5pc9iFeLF4BX1SuemOqIHYl2Q3u3NTA==
 
-xterm-addon-webgl@0.14.0-beta.40:
-  version "0.14.0-beta.40"
-  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.14.0-beta.40.tgz#8152b293c07f921db3a7cd3c4996dfd4d90f340c"
-  integrity sha512-6E3KGqAFkTU6A32c6gUjkwCX+DfohN6y+j1IcTjwh5Cu92TWn4tMr5KwJlaULfmtO0e9BKZlhmucmuHTWi1F9w==
+xterm-addon-webgl@0.15.0-beta.1:
+  version "0.15.0-beta.1"
+  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.15.0-beta.1.tgz#bc3f784c3c467a70542b8a9a8998dbe996287796"
+  integrity sha512-8f4cNXG0+dBMqp+Nvk/ZQ8Wo8s4/KbF24b2VTHTt8DuY5QXt4wSA6+NEdnABV98VYDoHl+KfXl9yyFqkcJYr8Q==
 
-xterm-headless@5.1.0-beta.63:
-  version "5.1.0-beta.63"
-  resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-5.1.0-beta.63.tgz#0b152dbd356fdb2426b387759630946806fb223e"
-  integrity sha512-jNh5ZPQLUUVdAmkjiyhv4XBUWM9WIaz48JwK3fMiZKFYg8+VjN4my+AnoqhMhZy+BOmB+9NWWqb80KTVhQ4GDA==
+xterm-headless@5.2.0-beta.2:
+  version "5.2.0-beta.2"
+  resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-5.2.0-beta.2.tgz#db8d4cc45a2bba062622d7784a2264030aa7d56d"
+  integrity sha512-aP3+K47bJu5AkdtekML5LZZUh/zAkDc5ONNFgQ+7eUBh7RkFy3JYRuaG5Nj3LbdkUMjWqQZXzc3BW5Vo9KQNgA==
 
-xterm@5.1.0-beta.63:
-  version "5.1.0-beta.63"
-  resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.1.0-beta.63.tgz#c811680494922eab873bd36ac6fd9f5404a9e944"
-  integrity sha512-ar7SMARh6j3GUXb4tRgbqAO+kiNu4JTPx5FYXSDHr+HHt0jBgZ+lPh4AqIFwwG1pc90lRx2cvczpE5cJhG9sdw==
+xterm@5.2.0-beta.2:
+  version "5.2.0-beta.2"
+  resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.2.0-beta.2.tgz#67369235a54f41179922e662df40ff4c7c974787"
+  integrity sha512-MRAdWRfV80ae0Q3Caq/mfmCwnZZZ89Z8i/sAleio5g5dpsst9IXc0zeFpPnOvUWmtVy5P1LbfU9YCy47449DWw==
 
 yallist@^4.0.0:
   version "4.0.0"
diff --git a/src/main.js b/src/main.js
index 1cb2b8721fa819..b85f99ff17beee 100644
--- a/src/main.js
+++ b/src/main.js
@@ -100,15 +100,17 @@ if (locale) {
 }
 
 // Pass in the locale to Electron so that the
-// Windows Control Overlay is rendered correctly on Windows,
-// and so that the traffic lights are rendered properly
-// on macOS when using a custom titlebar.
+// Windows Control Overlay is rendered correctly on Windows.
+// For now, don't pass in the locale on macOS due to
+// https://github.com/microsoft/vscode/issues/167543.
 // If the locale is `qps-ploc`, the Microsoft
 // Pseudo Language Language Pack is being used.
 // In that case, use `en` as the Electron locale.
 
-const electronLocale = (!locale || locale === 'qps-ploc') ? 'en' : locale;
-app.commandLine.appendSwitch('lang', electronLocale);
+if (process.platform === 'win32') {
+	const electronLocale = (!locale || locale === 'qps-ploc') ? 'en' : locale;
+	app.commandLine.appendSwitch('lang', electronLocale);
+}
 
 // Load our code once ready
 app.once('ready', function () {
@@ -181,7 +183,7 @@ function configureCommandlineSwitchesSync(cliArgs) {
 		// Persistently enable proposed api via argv.json: https://github.com/microsoft/vscode/issues/99775
 		'enable-proposed-api',
 
-		// Log level to use. Default is 'info'. Allowed values are 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'.
+		// Log level to use. Default is 'info'. Allowed values are 'error', 'warn', 'info', 'debug', 'trace', 'off'.
 		'log-level'
 	];
 
@@ -237,11 +239,6 @@ function configureCommandlineSwitchesSync(cliArgs) {
 	 */
 	app.commandLine.appendSwitch('disable-features', 'CalculateNativeWinOcclusion');
 
-	/* Following features are enabled from the runtime.
-	 * `AutoDisableAccessibility` - https://github.com/microsoft/vscode/issues/162331#issue-1390744354
-	 */
-	app.commandLine.appendSwitch('enable-features', 'AutoDisableAccessibility');
-
 	// Support JS Flags
 	const jsFlags = getJSFlags(cliArgs);
 	if (jsFlags) {
@@ -578,11 +575,11 @@ async function resolveNlsConfiguration() {
 		// VS Code moves to Electron 22.
 		// Ref https://github.com/microsoft/vscode/issues/159813
 		// and https://github.com/electron/electron/pull/36035
-		if ('getPreferredSystemLanguages' in app
-			&& typeof app.getPreferredSystemLanguages === 'function'
-			&& app.getPreferredSystemLanguages().length) {
-			appLocale = app.getPreferredSystemLanguages()[0];
-		}
+		// if ('getPreferredSystemLanguages' in app
+		// 	&& typeof app.getPreferredSystemLanguages === 'function'
+		// 	&& app.getPreferredSystemLanguages().length) {
+		// 	appLocale = app.getPreferredSystemLanguages()[0];
+		// }
 		if (!appLocale) {
 			nlsConfiguration = { locale: 'en', availableLanguages: {} };
 		} else {
diff --git a/src/vs/base/browser/browser.ts b/src/vs/base/browser/browser.ts
index cd5a4254fc81b4..4194d976db257a 100644
--- a/src/vs/base/browser/browser.ts
+++ b/src/vs/base/browser/browser.ts
@@ -73,7 +73,7 @@ class DevicePixelRatioMonitor extends Disposable {
 	private _handleChange(fireEvent: boolean): void {
 		this._mediaQueryList?.removeEventListener('change', this._listener);
 
-		this._mediaQueryList = matchMedia(`(resolution: ${window.devicePixelRatio}dppx)`);
+		this._mediaQueryList = window.matchMedia(`(resolution: ${window.devicePixelRatio}dppx)`);
 		this._mediaQueryList.addEventListener('change', this._listener);
 
 		if (fireEvent) {
@@ -211,6 +211,9 @@ export function isStandalone(): boolean {
 	return standalone;
 }
 
-export function isWCOVisible(): boolean {
+// Visible means that the feature is enabled, not necessarily being rendered
+// e.g. visible is true even in fullscreen mode where the controls are hidden
+// See docs at https://developer.mozilla.org/en-US/docs/Web/API/WindowControlsOverlay/visible
+export function isWCOEnabled(): boolean {
 	return (navigator as any)?.windowControlsOverlay?.visible;
 }
diff --git a/src/vs/base/browser/dnd.ts b/src/vs/base/browser/dnd.ts
index 8b557e01bef0c1..ead39defe80947 100644
--- a/src/vs/base/browser/dnd.ts
+++ b/src/vs/base/browser/dnd.ts
@@ -74,11 +74,19 @@ export const DataTransfers = {
 	TEXT: Mimes.text
 };
 
-export function applyDragImage(event: DragEvent, label: string | null, clazz: string): void {
+export function applyDragImage(event: DragEvent, label: string | null, clazz: string, backgroundColor?: string | null, foregroundColor?: string | null): void {
 	const dragImage = document.createElement('div');
 	dragImage.className = clazz;
 	dragImage.textContent = label;
 
+	if (foregroundColor) {
+		dragImage.style.color = foregroundColor;
+	}
+
+	if (backgroundColor) {
+		dragImage.style.background = backgroundColor;
+	}
+
 	if (event.dataTransfer) {
 		document.body.appendChild(dragImage);
 		event.dataTransfer.setDragImage(dragImage, -10, -10);
diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts
index 90590b5deae754..9cc2c31c4c63c8 100644
--- a/src/vs/base/browser/dom.ts
+++ b/src/vs/base/browser/dom.ts
@@ -825,6 +825,12 @@ export interface EventLike {
 	stopPropagation(): void;
 }
 
+export function isEventLike(obj: unknown): obj is EventLike {
+	const candidate = obj as EventLike | undefined;
+
+	return !!(candidate && typeof candidate.preventDefault === 'function' && typeof candidate.stopPropagation === 'function');
+}
+
 export const EventHelper = {
 	stop: <T extends EventLike>(e: T, cancelBubble?: boolean): T => {
 		e.preventDefault();
@@ -1753,23 +1759,6 @@ type TagToRecord<TTag> = TagToElementAndId<TTag> extends { element: infer TEleme
 	: never;
 
 type Child = HTMLElement | string | Record<string, HTMLElement>;
-type Children = []
-	| [Child]
-	| [Child, Child]
-	| [Child, Child, Child]
-	| [Child, Child, Child, Child]
-	| [Child, Child, Child, Child, Child]
-	| [Child, Child, Child, Child, Child, Child]
-	| [Child, Child, Child, Child, Child, Child, Child]
-	| [Child, Child, Child, Child, Child, Child, Child, Child]
-	| [Child, Child, Child, Child, Child, Child, Child, Child, Child]
-	| [Child, Child, Child, Child, Child, Child, Child, Child, Child, Child]
-	| [Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child]
-	| [Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child]
-	| [Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child]
-	| [Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child]
-	| [Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child]
-	| [Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child];
 
 const H_REGEX = /(?<tag>[\w\-]+)?(?:#(?<id>[\w\-]+))?(?<class>(?:\.(?:[\w\-]+))*)(?:@(?<name>(?:[\w\_])+))?/;
 
@@ -1792,16 +1781,16 @@ export function h<TTag extends string>
 	(tag: TTag):
 	TagToRecord<TTag> extends infer Y ? { [TKey in keyof Y]: Y[TKey] } : never;
 
-export function h<TTag extends string, T extends Children>
-	(tag: TTag, children: T):
+export function h<TTag extends string, T extends Child[]>
+	(tag: TTag, children: [...T]):
 	(ArrayToObj<T> & TagToRecord<TTag>) extends infer Y ? { [TKey in keyof Y]: Y[TKey] } : never;
 
 export function h<TTag extends string>
 	(tag: TTag, attributes: Partial<ElementAttributes<TagToElement<TTag>>>):
 	TagToRecord<TTag> extends infer Y ? { [TKey in keyof Y]: Y[TKey] } : never;
 
-export function h<TTag extends string, T extends Children>
-	(tag: TTag, attributes: Partial<ElementAttributes<TagToElement<TTag>>>, children: T):
+export function h<TTag extends string, T extends Child[]>
+	(tag: TTag, attributes: Partial<ElementAttributes<TagToElement<TTag>>>, children: [...T]):
 	(ArrayToObj<T> & TagToRecord<TTag>) extends infer Y ? { [TKey in keyof Y]: Y[TKey] } : never;
 
 export function h(tag: string, ...args: [] | [attributes: { $: string } & Partial<ElementAttributes<HTMLElement>> | Record<string, any>, children?: any[]] | [children: any[]]): Record<string, HTMLElement> {
diff --git a/src/vs/base/browser/event.ts b/src/vs/base/browser/event.ts
index b3f53f90f60afb..760f8646b0ec23 100644
--- a/src/vs/base/browser/event.ts
+++ b/src/vs/base/browser/event.ts
@@ -20,6 +20,9 @@ export interface DOMEventMap extends HTMLElementEventMap, DocumentEventMap, Wind
 	'-monaco-gesturestart': GestureEvent;
 	'-monaco-gesturesend': GestureEvent;
 	'-monaco-gesturecontextmenu': GestureEvent;
+	'compositionstart': CompositionEvent;
+	'compositionupdate': CompositionEvent;
+	'compositionend': CompositionEvent;
 }
 
 export class DomEmitter<K extends keyof DOMEventMap> implements IDisposable {
diff --git a/src/vs/base/browser/formattedTextRenderer.ts b/src/vs/base/browser/formattedTextRenderer.ts
index 2ae545682cdca5..0355a7ac51d85d 100644
--- a/src/vs/base/browser/formattedTextRenderer.ts
+++ b/src/vs/base/browser/formattedTextRenderer.ts
@@ -4,11 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as DOM from 'vs/base/browser/dom';
+import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { IMouseEvent } from 'vs/base/browser/mouseEvent';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 
 export interface IContentActionHandler {
-	callback: (content: string, event: IMouseEvent) => void;
+	callback: (content: string, event: IMouseEvent | IKeyboardEvent) => void;
 	readonly disposables: DisposableStore;
 }
 
diff --git a/src/vs/base/browser/keyboardEvent.ts b/src/vs/base/browser/keyboardEvent.ts
index e7267d73408d0d..3b184305529709 100644
--- a/src/vs/base/browser/keyboardEvent.ts
+++ b/src/vs/base/browser/keyboardEvent.ts
@@ -58,6 +58,7 @@ export interface IKeyboardEvent {
 	readonly shiftKey: boolean;
 	readonly altKey: boolean;
 	readonly metaKey: boolean;
+	readonly altGraphKey: boolean;
 	readonly keyCode: KeyCode;
 	readonly code: string;
 
@@ -121,6 +122,7 @@ export class StandardKeyboardEvent implements IKeyboardEvent {
 	public readonly shiftKey: boolean;
 	public readonly altKey: boolean;
 	public readonly metaKey: boolean;
+	public readonly altGraphKey: boolean;
 	public readonly keyCode: KeyCode;
 	public readonly code: string;
 
@@ -137,6 +139,7 @@ export class StandardKeyboardEvent implements IKeyboardEvent {
 		this.shiftKey = e.shiftKey;
 		this.altKey = e.altKey;
 		this.metaKey = e.metaKey;
+		this.altGraphKey = e.getModifierState('AltGraph');
 		this.keyCode = extractKeyCode(e);
 		this.code = e.code;
 
diff --git a/src/vs/base/browser/markdownRenderer.ts b/src/vs/base/browser/markdownRenderer.ts
index aadf5d2c87a32e..035c9498cb84ac 100644
--- a/src/vs/base/browser/markdownRenderer.ts
+++ b/src/vs/base/browser/markdownRenderer.ts
@@ -7,6 +7,7 @@ import * as DOM from 'vs/base/browser/dom';
 import * as dompurify from 'vs/base/browser/dompurify/dompurify';
 import { DomEmitter } from 'vs/base/browser/event';
 import { createElement, FormattedTextRenderOptions } from 'vs/base/browser/formattedTextRenderer';
+import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
 import { onUnexpectedError } from 'vs/base/common/errors';
@@ -14,6 +15,7 @@ import { Event } from 'vs/base/common/event';
 import { IMarkdownString, escapeDoubleQuotes, parseHrefAndDimensions, removeMarkdownEscapes, MarkdownStringTrustedOptions } from 'vs/base/common/htmlContent';
 import { markdownEscapeEscapedIcons } from 'vs/base/common/iconLabels';
 import { defaultGenerator } from 'vs/base/common/idGenerator';
+import { KeyCode } from 'vs/base/common/keyCodes';
 import { Lazy } from 'vs/base/common/lazy';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { marked } from 'vs/base/common/marked/marked';
@@ -158,15 +160,8 @@ export function renderMarkdown(markdown: IMarkdownString, options: MarkdownRende
 	}
 
 	if (options.actionHandler) {
-		const onClick = options.actionHandler.disposables.add(new DomEmitter(element, 'click'));
-		const onAuxClick = options.actionHandler.disposables.add(new DomEmitter(element, 'auxclick'));
-		options.actionHandler.disposables.add(Event.any(onClick.event, onAuxClick.event)(e => {
-			const mouseEvent = new StandardMouseEvent(e);
-			if (!mouseEvent.leftButton && !mouseEvent.middleButton) {
-				return;
-			}
-
-			let target: HTMLElement | null = mouseEvent.target;
+		const _activateLink = function (event: StandardMouseEvent | StandardKeyboardEvent): void {
+			let target: HTMLElement | null = event.target;
 			if (target.tagName !== 'A') {
 				target = target.parentElement;
 				if (!target || target.tagName !== 'A') {
@@ -179,13 +174,29 @@ export function renderMarkdown(markdown: IMarkdownString, options: MarkdownRende
 					if (markdown.baseUri) {
 						href = resolveWithBaseUri(URI.from(markdown.baseUri), href);
 					}
-					options.actionHandler!.callback(href, mouseEvent);
+					options.actionHandler!.callback(href, event);
 				}
 			} catch (err) {
 				onUnexpectedError(err);
 			} finally {
-				mouseEvent.preventDefault();
+				event.preventDefault();
+			}
+		};
+		const onClick = options.actionHandler.disposables.add(new DomEmitter(element, 'click'));
+		const onAuxClick = options.actionHandler.disposables.add(new DomEmitter(element, 'auxclick'));
+		options.actionHandler.disposables.add(Event.any(onClick.event, onAuxClick.event)(e => {
+			const mouseEvent = new StandardMouseEvent(e);
+			if (!mouseEvent.leftButton && !mouseEvent.middleButton) {
+				return;
+			}
+			_activateLink(mouseEvent);
+		}));
+		options.actionHandler.disposables.add(DOM.addDisposableListener(element, 'keydown', (e) => {
+			const keyboardEvent = new StandardKeyboardEvent(e);
+			if (!keyboardEvent.equals(KeyCode.Space) && !keyboardEvent.equals(KeyCode.Enter)) {
+				return;
 			}
+			_activateLink(keyboardEvent);
 		}));
 	}
 
@@ -246,7 +257,7 @@ export function renderMarkdown(markdown: IMarkdownString, options: MarkdownRende
 	markdownHtmlDoc.body.querySelectorAll('a')
 		.forEach(a => {
 			const href = a.getAttribute('href'); // Get the raw 'href' attribute value as text, not the resolved 'href'
-			a.setAttribute('href', ''); // Clear out href. We use the `data-href` for handling clicks instead
+			a.removeAttribute('href'); // Clear out href. We use the `data-href` for handling clicks instead
 			if (
 				!href
 				|| /^data:|javascript:/i.test(href)
diff --git a/src/vs/base/browser/ui/actionbar/actionViewItems.ts b/src/vs/base/browser/ui/actionbar/actionViewItems.ts
index 7722ef6b3d835e..26288a54bc68f8 100644
--- a/src/vs/base/browser/ui/actionbar/actionViewItems.ts
+++ b/src/vs/base/browser/ui/actionbar/actionViewItems.ts
@@ -253,7 +253,7 @@ export class BaseActionViewItem extends Disposable implements IActionViewItem {
 			this.element.remove();
 			this.element = undefined;
 		}
-
+		this._context = undefined;
 		super.dispose();
 	}
 }
diff --git a/src/vs/base/browser/ui/actionbar/actionbar.ts b/src/vs/base/browser/ui/actionbar/actionbar.ts
index 0b2da4a1e855ef..ef49b8945765c3 100644
--- a/src/vs/base/browser/ui/actionbar/actionbar.ts
+++ b/src/vs/base/browser/ui/actionbar/actionbar.ts
@@ -579,6 +579,7 @@ export class ActionBar extends Disposable implements IActionRunner {
 	}
 
 	override dispose(): void {
+		this._context = undefined;
 		this.viewItems = dispose(this.viewItems);
 		this.getContainer().remove();
 		super.dispose();
diff --git a/src/vs/base/browser/ui/aria/aria.ts b/src/vs/base/browser/ui/aria/aria.ts
index 3d793d5729bbfd..69e31279111e1f 100644
--- a/src/vs/base/browser/ui/aria/aria.ts
+++ b/src/vs/base/browser/ui/aria/aria.ts
@@ -93,3 +93,77 @@ function insertMessage(target: HTMLElement, msg: string): void {
 	target.style.visibility = 'hidden';
 	target.style.visibility = 'visible';
 }
+
+// Copied from @types/react which original came from https://www.w3.org/TR/wai-aria-1.1/#role_definitions
+export type AriaRole =
+	| 'alert'
+	| 'alertdialog'
+	| 'application'
+	| 'article'
+	| 'banner'
+	| 'button'
+	| 'cell'
+	| 'checkbox'
+	| 'columnheader'
+	| 'combobox'
+	| 'complementary'
+	| 'contentinfo'
+	| 'definition'
+	| 'dialog'
+	| 'directory'
+	| 'document'
+	| 'feed'
+	| 'figure'
+	| 'form'
+	| 'grid'
+	| 'gridcell'
+	| 'group'
+	| 'heading'
+	| 'img'
+	| 'link'
+	| 'list'
+	| 'listbox'
+	| 'listitem'
+	| 'log'
+	| 'main'
+	| 'marquee'
+	| 'math'
+	| 'menu'
+	| 'menubar'
+	| 'menuitem'
+	| 'menuitemcheckbox'
+	| 'menuitemradio'
+	| 'navigation'
+	| 'none'
+	| 'note'
+	| 'option'
+	| 'presentation'
+	| 'progressbar'
+	| 'radio'
+	| 'radiogroup'
+	| 'region'
+	| 'row'
+	| 'rowgroup'
+	| 'rowheader'
+	| 'scrollbar'
+	| 'search'
+	| 'searchbox'
+	| 'separator'
+	| 'slider'
+	| 'spinbutton'
+	| 'status'
+	| 'switch'
+	| 'tab'
+	| 'table'
+	| 'tablist'
+	| 'tabpanel'
+	| 'term'
+	| 'textbox'
+	| 'timer'
+	| 'toolbar'
+	| 'tooltip'
+	| 'tree'
+	| 'treegrid'
+	| 'treeitem'
+	| (string & {}) // Prevent type collapsing to `string`
+	;
diff --git a/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts b/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts
index be32475e007819..8cb667d9e902a6 100644
--- a/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts
+++ b/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts
@@ -8,7 +8,6 @@ import { IMouseEvent } from 'vs/base/browser/mouseEvent';
 import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
 import { commonPrefixLength } from 'vs/base/common/arrays';
 import { CSSIcon } from 'vs/base/common/codicons';
-import { Color } from 'vs/base/common/color';
 import { Emitter, Event } from 'vs/base/common/event';
 import { DisposableStore, dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
@@ -21,11 +20,11 @@ export abstract class BreadcrumbsItem {
 }
 
 export interface IBreadcrumbsWidgetStyles {
-	breadcrumbsBackground?: Color;
-	breadcrumbsForeground?: Color;
-	breadcrumbsHoverForeground?: Color;
-	breadcrumbsFocusForeground?: Color;
-	breadcrumbsFocusAndSelectionForeground?: Color;
+	readonly breadcrumbsBackground: string | undefined;
+	readonly breadcrumbsForeground: string | undefined;
+	readonly breadcrumbsHoverForeground: string | undefined;
+	readonly breadcrumbsFocusForeground: string | undefined;
+	readonly breadcrumbsFocusAndSelectionForeground: string | undefined;
 }
 
 export interface IBreadcrumbsItemEvent {
@@ -39,7 +38,6 @@ export class BreadcrumbsWidget {
 
 	private readonly _disposables = new DisposableStore();
 	private readonly _domNode: HTMLDivElement;
-	private readonly _styleElement: HTMLStyleElement;
 	private readonly _scrollable: DomScrollableElement;
 
 	private readonly _onDidSelectItem = new Emitter<IBreadcrumbsItemEvent>();
@@ -65,7 +63,8 @@ export class BreadcrumbsWidget {
 	constructor(
 		container: HTMLElement,
 		horizontalScrollbarSize: number,
-		separatorIcon: CSSIcon
+		separatorIcon: CSSIcon,
+		styles: IBreadcrumbsWidgetStyles
 	) {
 		this._domNode = document.createElement('div');
 		this._domNode.className = 'monaco-breadcrumbs';
@@ -83,7 +82,8 @@ export class BreadcrumbsWidget {
 		this._disposables.add(dom.addStandardDisposableListener(this._domNode, 'click', e => this._onClick(e)));
 		container.appendChild(this._scrollable.getDomNode());
 
-		this._styleElement = dom.createStyleSheet(this._domNode);
+		const styleElement = dom.createStyleSheet(this._domNode);
+		this._style(styleElement, styles);
 
 		const focusTracker = dom.trackFocus(this._domNode);
 		this._disposables.add(focusTracker);
@@ -142,7 +142,7 @@ export class BreadcrumbsWidget {
 		});
 	}
 
-	style(style: IBreadcrumbsWidgetStyles): void {
+	private _style(styleElement: HTMLStyleElement, style: IBreadcrumbsWidgetStyles): void {
 		let content = '';
 		if (style.breadcrumbsBackground) {
 			content += `.monaco-breadcrumbs { background-color: ${style.breadcrumbsBackground}}`;
@@ -159,9 +159,7 @@ export class BreadcrumbsWidget {
 		if (style.breadcrumbsHoverForeground) {
 			content += `.monaco-breadcrumbs:not(.disabled	) .monaco-breadcrumb-item:hover:not(.focused):not(.selected) { color: ${style.breadcrumbsHoverForeground}}\n`;
 		}
-		if (this._styleElement.innerText !== content) {
-			this._styleElement.innerText = content;
-		}
+		styleElement.innerText = content;
 	}
 
 	setEnabled(value: boolean) {
@@ -232,6 +230,10 @@ export class BreadcrumbsWidget {
 		}
 	}
 
+	revealLast(): void {
+		this._reveal(this._items.length - 1, false);
+	}
+
 	private _reveal(nth: number, minimal: boolean): void {
 		const node = this._nodes[nth];
 		if (node) {
diff --git a/src/vs/base/browser/ui/button/button.css b/src/vs/base/browser/ui/button/button.css
index dff0019cfee927..7784199763ea34 100644
--- a/src/vs/base/browser/ui/button/button.css
+++ b/src/vs/base/browser/ui/button/button.css
@@ -13,6 +13,8 @@
 	cursor: pointer;
 	justify-content: center;
 	align-items: center;
+	border: 1px solid var(--vscode-button-border, transparent);
+	line-height: 18px;
 }
 
 .monaco-text-button:focus {
diff --git a/src/vs/base/browser/ui/button/button.ts b/src/vs/base/browser/ui/button/button.ts
index 45d213b4781c1d..77f1da2f670bb4 100644
--- a/src/vs/base/browser/ui/button/button.ts
+++ b/src/vs/base/browser/ui/button/button.ts
@@ -82,13 +82,10 @@ export class Button extends Disposable implements IButton {
 
 		const background = options.secondary ? options.buttonSecondaryBackground : options.buttonBackground;
 		const foreground = options.secondary ? options.buttonSecondaryForeground : options.buttonForeground;
-		const border = options.buttonBorder;
 
 		this._element.style.color = foreground || '';
 		this._element.style.backgroundColor = background || '';
-		if (border) {
-			this._element.style.border = `1px solid ${border}`;
-		}
+
 
 		container.appendChild(this._element);
 
diff --git a/src/vs/base/browser/ui/codicons/codicon/codicon.ttf b/src/vs/base/browser/ui/codicons/codicon/codicon.ttf
index bab11139af89dc..cc4c7aeaa79588 100644
Binary files a/src/vs/base/browser/ui/codicons/codicon/codicon.ttf and b/src/vs/base/browser/ui/codicons/codicon/codicon.ttf differ
diff --git a/src/vs/base/browser/ui/contextview/contextview.ts b/src/vs/base/browser/ui/contextview/contextview.ts
index 27958b235afff0..04931cca3f09d2 100644
--- a/src/vs/base/browser/ui/contextview/contextview.ts
+++ b/src/vs/base/browser/ui/contextview/contextview.ts
@@ -366,12 +366,6 @@ const SHADOW_ROOT_CSS = /* css */ `
 		all: initial; /* 1st rule so subsequent properties are reset. */
 	}
 
-	@font-face {
-		font-family: "codicon";
-		font-display: block;
-		src: url("./codicon.ttf?5d4d76ab2ce5108968ad644d591a16a6") format("truetype");
-	}
-
 	.codicon[class*='codicon-'] {
 		font: normal normal normal 16px/1 codicon;
 		display: inline-block;
diff --git a/src/vs/base/browser/ui/countBadge/countBadge.ts b/src/vs/base/browser/ui/countBadge/countBadge.ts
index f0185c65c73a8e..0ee88d005d0a5b 100644
--- a/src/vs/base/browser/ui/countBadge/countBadge.ts
+++ b/src/vs/base/browser/ui/countBadge/countBadge.ts
@@ -4,49 +4,35 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { $, append } from 'vs/base/browser/dom';
-import { Color } from 'vs/base/common/color';
-import { mixin } from 'vs/base/common/objects';
 import { format } from 'vs/base/common/strings';
-import { IThemable } from 'vs/base/common/styler';
 import 'vs/css!./countBadge';
 
-export interface ICountBadgeOptions extends ICountBadgetyles {
-	count?: number;
-	countFormat?: string;
-	titleFormat?: string;
+export interface ICountBadgeOptions {
+	readonly count?: number;
+	readonly countFormat?: string;
+	readonly titleFormat?: string;
 }
 
-export interface ICountBadgetyles {
-	badgeBackground?: Color;
-	badgeForeground?: Color;
-	badgeBorder?: Color;
+export interface ICountBadgeStyles {
+	readonly badgeBackground: string | undefined;
+	readonly badgeForeground: string | undefined;
+	readonly badgeBorder: string | undefined;
 }
 
-const defaultOpts = {
-	badgeBackground: Color.fromHex('#4D4D4D'),
-	badgeForeground: Color.fromHex('#FFFFFF')
+export const unthemedCountStyles: ICountBadgeStyles = {
+	badgeBackground: '#4D4D4D',
+	badgeForeground: '#FFFFFF',
+	badgeBorder: undefined
 };
 
-export class CountBadge implements IThemable {
+export class CountBadge {
 
 	private element: HTMLElement;
 	private count: number = 0;
 	private countFormat: string;
 	private titleFormat: string;
 
-	private badgeBackground: Color | undefined;
-	private badgeForeground: Color | undefined;
-	private badgeBorder: Color | undefined;
-
-	private options: ICountBadgeOptions;
-
-	constructor(container: HTMLElement, options?: ICountBadgeOptions) {
-		this.options = options || Object.create(null);
-		mixin(this.options, defaultOpts, false);
-
-		this.badgeBackground = this.options.badgeBackground;
-		this.badgeForeground = this.options.badgeForeground;
-		this.badgeBorder = this.options.badgeBorder;
+	constructor(container: HTMLElement, private readonly options: ICountBadgeOptions, private readonly styles: ICountBadgeStyles) {
 
 		this.element = append(container, $('.monaco-count-badge'));
 		this.countFormat = this.options.countFormat || '{0}';
@@ -73,29 +59,11 @@ export class CountBadge implements IThemable {
 		this.element.textContent = format(this.countFormat, this.count);
 		this.element.title = format(this.titleFormat, this.count);
 
-		this.applyStyles();
-	}
-
-	style(styles: ICountBadgetyles): void {
-		this.badgeBackground = styles.badgeBackground;
-		this.badgeForeground = styles.badgeForeground;
-		this.badgeBorder = styles.badgeBorder;
-
-		this.applyStyles();
-	}
-
-	private applyStyles(): void {
-		if (this.element) {
-			const background = this.badgeBackground ? this.badgeBackground.toString() : '';
-			const foreground = this.badgeForeground ? this.badgeForeground.toString() : '';
-			const border = this.badgeBorder ? this.badgeBorder.toString() : '';
-
-			this.element.style.backgroundColor = background;
-			this.element.style.color = foreground;
+		this.element.style.backgroundColor = this.styles.badgeBackground ?? '';
+		this.element.style.color = this.styles.badgeForeground ?? '';
 
-			this.element.style.borderWidth = border ? '1px' : '';
-			this.element.style.borderStyle = border ? 'solid' : '';
-			this.element.style.borderColor = border;
+		if (this.styles.badgeBorder) {
+			this.element.style.border = `1px solid ${this.styles.badgeBorder}`;
 		}
 	}
 }
diff --git a/src/vs/base/browser/ui/dropdown/dropdown.ts b/src/vs/base/browser/ui/dropdown/dropdown.ts
index b0f07682dd6099..85d37a7123fed2 100644
--- a/src/vs/base/browser/ui/dropdown/dropdown.ts
+++ b/src/vs/base/browser/ui/dropdown/dropdown.ts
@@ -7,7 +7,7 @@ import { IContextMenuProvider } from 'vs/base/browser/contextmenu';
 import { $, addDisposableListener, append, EventHelper, EventType } from 'vs/base/browser/dom';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { EventType as GestureEventType, Gesture } from 'vs/base/browser/touch';
-import { AnchorAlignment, IAnchor, IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
+import { AnchorAlignment } from 'vs/base/browser/ui/contextview/contextview';
 import { IMenuOptions } from 'vs/base/browser/ui/menu/menu';
 import { ActionRunner, IAction } from 'vs/base/common/actions';
 import { Emitter } from 'vs/base/common/event';
@@ -19,12 +19,12 @@ export interface ILabelRenderer {
 	(container: HTMLElement): IDisposable | null;
 }
 
-export interface IBaseDropdownOptions {
+interface IBaseDropdownOptions {
 	label?: string;
 	labelRenderer?: ILabelRenderer;
 }
 
-export class BaseDropdown extends ActionRunner {
+class BaseDropdown extends ActionRunner {
 	private _element: HTMLElement;
 	private boxContainer?: HTMLElement;
 	private _label?: HTMLElement;
@@ -148,58 +148,6 @@ export class BaseDropdown extends ActionRunner {
 	}
 }
 
-export interface IDropdownOptions extends IBaseDropdownOptions {
-	contextViewProvider: IContextViewProvider;
-}
-
-export class Dropdown extends BaseDropdown {
-	private contextViewProvider: IContextViewProvider;
-
-	constructor(container: HTMLElement, options: IDropdownOptions) {
-		super(container, options);
-
-		this.contextViewProvider = options.contextViewProvider;
-	}
-
-	override show(): void {
-		super.show();
-
-		this.element.classList.add('active');
-
-		this.contextViewProvider.showContextView({
-			getAnchor: () => this.getAnchor(),
-
-			render: (container) => {
-				return this.renderContents(container);
-			},
-
-			onDOMEvent: (e, activeElement) => {
-				this.onEvent(e, activeElement);
-			},
-
-			onHide: () => this.onHide()
-		});
-	}
-
-	protected getAnchor(): HTMLElement | IAnchor {
-		return this.element;
-	}
-
-	protected onHide(): void {
-		this.element.classList.remove('active');
-	}
-
-	override hide(): void {
-		super.hide();
-
-		this.contextViewProvider?.hideContextView();
-	}
-
-	protected renderContents(container: HTMLElement): IDisposable | null {
-		return null;
-	}
-}
-
 export interface IActionProvider {
 	getActions(): readonly IAction[];
 }
diff --git a/src/vs/base/browser/ui/grid/gridview.ts b/src/vs/base/browser/ui/grid/gridview.ts
index bcd35d6c1f8c18..a15dcfbc88425f 100644
--- a/src/vs/base/browser/ui/grid/gridview.ts
+++ b/src/vs/base/browser/ui/grid/gridview.ts
@@ -255,8 +255,12 @@ class BranchNode implements ISplitView<ILayoutContext>, IDisposable {
 	private _orthogonalSize: number;
 	get orthogonalSize(): number { return this._orthogonalSize; }
 
-	private absoluteOffset: number = 0;
-	private absoluteOrthogonalOffset: number = 0;
+	private _absoluteOffset: number = 0;
+	get absoluteOffset(): number { return this._absoluteOffset; }
+
+	private _absoluteOrthogonalOffset: number = 0;
+	get absoluteOrthogonalOffset(): number { return this._absoluteOrthogonalOffset; }
+
 	private absoluteOrthogonalSize: number = 0;
 
 	private _styles: IGridViewStyles;
@@ -271,11 +275,11 @@ class BranchNode implements ISplitView<ILayoutContext>, IDisposable {
 	}
 
 	get top(): number {
-		return this.orientation === Orientation.HORIZONTAL ? this.absoluteOffset : this.absoluteOrthogonalOffset;
+		return this.orientation === Orientation.HORIZONTAL ? this._absoluteOffset : this._absoluteOrthogonalOffset;
 	}
 
 	get left(): number {
-		return this.orientation === Orientation.HORIZONTAL ? this.absoluteOrthogonalOffset : this.absoluteOffset;
+		return this.orientation === Orientation.HORIZONTAL ? this._absoluteOrthogonalOffset : this._absoluteOffset;
 	}
 
 	get minimumSize(): number {
@@ -460,14 +464,14 @@ class BranchNode implements ISplitView<ILayoutContext>, IDisposable {
 		// branch nodes should flip the normal/orthogonal directions
 		this._size = ctx.orthogonalSize;
 		this._orthogonalSize = size;
-		this.absoluteOffset = ctx.absoluteOffset + offset;
-		this.absoluteOrthogonalOffset = ctx.absoluteOrthogonalOffset;
+		this._absoluteOffset = ctx.absoluteOffset + offset;
+		this._absoluteOrthogonalOffset = ctx.absoluteOrthogonalOffset;
 		this.absoluteOrthogonalSize = ctx.absoluteOrthogonalSize;
 
 		this.splitview.layout(ctx.orthogonalSize, {
 			orthogonalSize: size,
-			absoluteOffset: this.absoluteOrthogonalOffset,
-			absoluteOrthogonalOffset: this.absoluteOffset,
+			absoluteOffset: this._absoluteOrthogonalOffset,
+			absoluteOrthogonalOffset: this._absoluteOffset,
 			absoluteSize: ctx.absoluteOrthogonalSize,
 			absoluteOrthogonalSize: ctx.absoluteSize
 		});
@@ -705,8 +709,8 @@ class BranchNode implements ISplitView<ILayoutContext>, IDisposable {
 	}
 
 	private updateSplitviewEdgeSnappingEnablement(): void {
-		this.splitview.startSnappingEnabled = this._edgeSnapping || this.absoluteOrthogonalOffset > 0;
-		this.splitview.endSnappingEnabled = this._edgeSnapping || this.absoluteOrthogonalOffset + this._size < this.absoluteOrthogonalSize;
+		this.splitview.startSnappingEnabled = this._edgeSnapping || this._absoluteOrthogonalOffset > 0;
+		this.splitview.endSnappingEnabled = this._edgeSnapping || this._absoluteOrthogonalOffset + this._size < this.absoluteOrthogonalSize;
 	}
 
 	dispose(): void {
@@ -1097,9 +1101,9 @@ export class GridView implements IDisposable {
 			return;
 		}
 
-		const { size, orthogonalSize } = this._root;
+		const { size, orthogonalSize, absoluteOffset, absoluteOrthogonalOffset } = this._root;
 		this.root = flipNode(this._root, orthogonalSize, size);
-		this.root.layout(size, 0, { orthogonalSize, absoluteOffset: 0, absoluteOrthogonalOffset: 0, absoluteSize: size, absoluteOrthogonalSize: orthogonalSize });
+		this.root.layout(size, 0, { orthogonalSize, absoluteOffset: absoluteOrthogonalOffset, absoluteOrthogonalOffset: absoluteOffset, absoluteSize: size, absoluteOrthogonalSize: orthogonalSize });
 		this.boundarySashes = this.boundarySashes;
 	}
 
diff --git a/src/vs/base/browser/ui/hover/hover.css b/src/vs/base/browser/ui/hover/hover.css
index a6e7e29854839e..3190089a9d18a4 100644
--- a/src/vs/base/browser/ui/hover/hover.css
+++ b/src/vs/base/browser/ui/hover/hover.css
@@ -38,10 +38,25 @@
 
 .monaco-hover p,
 .monaco-hover .code,
-.monaco-hover ul {
+.monaco-hover ul,
+.monaco-hover h1,
+.monaco-hover h2,
+.monaco-hover h3,
+.monaco-hover h4,
+.monaco-hover h5,
+.monaco-hover h6 {
 	margin: 8px 0;
 }
 
+.monaco-hover h1,
+.monaco-hover h2,
+.monaco-hover h3,
+.monaco-hover h4,
+.monaco-hover h5,
+.monaco-hover h6 {
+	line-height: 1.1;
+}
+
 .monaco-hover code {
 	font-family: var(--monaco-monospace-font);
 }
diff --git a/src/vs/base/browser/ui/hover/hoverWidget.ts b/src/vs/base/browser/ui/hover/hoverWidget.ts
index e598c1fe87fca8..96e99cbec4a2f1 100644
--- a/src/vs/base/browser/ui/hover/hoverWidget.ts
+++ b/src/vs/base/browser/ui/hover/hoverWidget.ts
@@ -72,9 +72,9 @@ export class HoverAction extends Disposable {
 			actionOptions.run(this.actionContainer);
 		}));
 
-		this._register(dom.addDisposableListener(this.actionContainer, dom.EventType.KEY_UP, e => {
+		this._register(dom.addDisposableListener(this.actionContainer, dom.EventType.KEY_DOWN, e => {
 			const event = new StandardKeyboardEvent(e);
-			if (event.equals(KeyCode.Enter)) {
+			if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
 				e.stopPropagation();
 				e.preventDefault();
 				actionOptions.run(this.actionContainer);
diff --git a/src/vs/base/browser/ui/iconLabel/iconLabel.ts b/src/vs/base/browser/ui/iconLabel/iconLabel.ts
index fd9f321a7d9105..599abeaf6a1779 100644
--- a/src/vs/base/browser/ui/iconLabel/iconLabel.ts
+++ b/src/vs/base/browser/ui/iconLabel/iconLabel.ts
@@ -147,10 +147,10 @@ export class IconLabel extends Disposable {
 		if (description || this.descriptionNode) {
 			const descriptionNode = this.getOrCreateDescriptionNode();
 			if (descriptionNode instanceof HighlightedLabel) {
-				descriptionNode.set(description || '', options ? options.descriptionMatches : undefined);
+				descriptionNode.set(description || '', options ? options.descriptionMatches : undefined, undefined, options?.labelEscapeNewLines);
 				this.setupHover(descriptionNode.element, options?.descriptionTitle);
 			} else {
-				descriptionNode.textContent = description || '';
+				descriptionNode.textContent = description && options?.labelEscapeNewLines ? HighlightedLabel.escapeNewLines(description, []) : (description || '');
 				this.setupHover(descriptionNode.element, options?.descriptionTitle || '');
 				descriptionNode.empty = !description;
 			}
diff --git a/src/vs/base/browser/ui/list/listView.ts b/src/vs/base/browser/ui/list/listView.ts
index e2255cc2ead18e..472c1426d8f14c 100644
--- a/src/vs/base/browser/ui/list/listView.ts
+++ b/src/vs/base/browser/ui/list/listView.ts
@@ -22,6 +22,7 @@ import { RangeMap, shift } from 'vs/base/browser/ui/list/rangeMap';
 import { IRow, RowCache } from 'vs/base/browser/ui/list/rowCache';
 import { IObservableValue } from 'vs/base/common/observableValue';
 import { BugIndicatingError } from 'vs/base/common/errors';
+import { AriaRole } from 'vs/base/browser/ui/aria/aria';
 
 interface IItem<T> {
 	readonly id: string;
@@ -49,7 +50,7 @@ export interface IListViewDragAndDrop<T> extends IListDragAndDrop<T> {
 export interface IListViewAccessibilityProvider<T> {
 	getSetSize?(element: T, index: number, listLength: number): number;
 	getPosInSet?(element: T, index: number): number;
-	getRole?(element: T): string | undefined;
+	getRole?(element: T): AriaRole | undefined;
 	isChecked?(element: T): boolean | IObservableValue<boolean> | undefined;
 }
 
@@ -179,7 +180,7 @@ class ListViewAccessibilityProvider<T> implements Required<IListViewAccessibilit
 
 	readonly getSetSize: (element: any, index: number, listLength: number) => number;
 	readonly getPosInSet: (element: any, index: number) => number;
-	readonly getRole: (element: T) => string | undefined;
+	readonly getRole: (element: T) => AriaRole | undefined;
 	readonly isChecked: (element: T) => boolean | IObservableValue<boolean> | undefined;
 
 	constructor(accessibilityProvider?: IListViewAccessibilityProvider<T>) {
@@ -759,17 +760,19 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
 			}
 		}
 
-		for (const range of rangesToInsert) {
-			for (let i = range.start; i < range.end; i++) {
-				this.insertItemInDOM(i, beforeElement);
+		this.cache.transact(() => {
+			for (const range of rangesToRemove) {
+				for (let i = range.start; i < range.end; i++) {
+					this.removeItemFromDOM(i);
+				}
 			}
-		}
 
-		for (const range of rangesToRemove) {
-			for (let i = range.start; i < range.end; i++) {
-				this.removeItemFromDOM(i);
+			for (const range of rangesToInsert) {
+				for (let i = range.start; i < range.end; i++) {
+					this.insertItemInDOM(i, beforeElement);
+				}
 			}
-		}
+		});
 
 		if (renderLeft !== undefined) {
 			this.rowsContainer.style.left = `-${renderLeft}px`;
@@ -790,8 +793,15 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
 	private insertItemInDOM(index: number, beforeElement: HTMLElement | null, row?: IRow): void {
 		const item = this.items[index];
 
+		let isStale = false;
 		if (!item.row) {
-			item.row = row ?? this.cache.alloc(item.templateId);
+			if (row) {
+				item.row = row;
+			} else {
+				const result = this.cache.alloc(item.templateId);
+				item.row = result.row;
+				isStale = result.isReusingConnectedDomNode;
+			}
 		}
 
 		const role = this.accessibilityProvider.getRole(item.element) || 'listitem';
@@ -807,7 +817,7 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
 			item.checkedDisposable = checked.onDidChange(update);
 		}
 
-		if (!item.row.domNode.parentElement) {
+		if (isStale || !item.row.domNode.parentElement) {
 			if (beforeElement) {
 				this.rowsContainer.insertBefore(item.row.domNode, beforeElement);
 			} else {
@@ -1373,7 +1383,7 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
 			return item.size - size;
 		}
 
-		const row = this.cache.alloc(item.templateId);
+		const { row } = this.cache.alloc(item.templateId);
 		row.domNode.style.height = '';
 		this.rowsContainer.appendChild(row.domNode);
 
diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts
index 2c3660486af52e..fe0532090dd35c 100644
--- a/src/vs/base/browser/ui/list/listWidget.ts
+++ b/src/vs/base/browser/ui/list/listWidget.ts
@@ -8,7 +8,7 @@ import { createStyleSheet, Dimension, EventHelper } from 'vs/base/browser/dom';
 import { DomEmitter } from 'vs/base/browser/event';
 import { IKeyboardEvent, StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { Gesture } from 'vs/base/browser/touch';
-import { alert } from 'vs/base/browser/ui/aria/aria';
+import { alert, AriaRole } from 'vs/base/browser/ui/aria/aria';
 import { CombinedSpliceable } from 'vs/base/browser/ui/list/splice';
 import { ScrollableElementChangeOptions } from 'vs/base/browser/ui/scrollbar/scrollableElementOptions';
 import { binarySearch, firstOrDefault, range } from 'vs/base/common/arrays';
@@ -782,7 +782,7 @@ export interface IStyleController {
 export interface IListAccessibilityProvider<T> extends IListViewAccessibilityProvider<T> {
 	getAriaLabel(element: T): string | null;
 	getWidgetAriaLabel(): string;
-	getWidgetRole?(): string;
+	getWidgetRole?(): AriaRole;
 	getAriaLevel?(element: T): number | undefined;
 	onDidChangeActiveDescendant?: Event<void>;
 	getActiveDescendantId?(element: T): string | undefined;
@@ -905,10 +905,18 @@ export class DefaultStyleController implements IStyleController {
 
 		if (styles.tableColumnsBorder) {
 			content.push(`
-				.monaco-table:hover > .monaco-split-view2,
-				.monaco-table:hover > .monaco-split-view2 .monaco-sash.vertical::before {
+				.monaco-table > .monaco-split-view2,
+				.monaco-table > .monaco-split-view2 .monaco-sash.vertical::before,
+				.monaco-workbench:not(.reduce-motion) .monaco-table:hover > .monaco-split-view2,
+				.monaco-workbench:not(.reduce-motion) .monaco-table:hover > .monaco-split-view2 .monaco-sash.vertical::before {
 					border-color: ${styles.tableColumnsBorder};
-			}`);
+				}
+
+				.monaco-workbench:not(.reduce-motion) .monaco-table > .monaco-split-view2,
+				.monaco-workbench:not(.reduce-motion) .monaco-table > .monaco-split-view2 .monaco-sash.vertical::before {
+					border-color: transparent;
+				}
+			`);
 		}
 
 		if (styles.tableOddRowsBackgroundColor) {
diff --git a/src/vs/base/browser/ui/list/rowCache.ts b/src/vs/base/browser/ui/list/rowCache.ts
index a5c4b7e07c2ea2..f71bdfd01f394d 100644
--- a/src/vs/base/browser/ui/list/rowCache.ts
+++ b/src/vs/base/browser/ui/list/rowCache.ts
@@ -25,23 +25,34 @@ export class RowCache<T> implements IDisposable {
 
 	private cache = new Map<string, IRow[]>();
 
+	private readonly transactionNodesPendingRemoval = new Set<HTMLElement>();
+	private inTransaction = false;
+
 	constructor(private renderers: Map<string, IListRenderer<T, any>>) { }
 
 	/**
 	 * Returns a row either by creating a new one or reusing
 	 * a previously released row which shares the same templateId.
+	 *
+	 * @returns A row and `isReusingConnectedDomNode` if the row's node is already in the dom in a stale position.
 	 */
-	alloc(templateId: string): IRow {
+	alloc(templateId: string): { row: IRow; isReusingConnectedDomNode: boolean } {
 		let result = this.getTemplateCache(templateId).pop();
 
-		if (!result) {
+		let isStale = false;
+		if (result) {
+			isStale = this.transactionNodesPendingRemoval.has(result.domNode);
+			if (isStale) {
+				this.transactionNodesPendingRemoval.delete(result.domNode);
+			}
+		} else {
 			const domNode = $('.monaco-list-row');
 			const renderer = this.getRenderer(templateId);
 			const templateData = renderer.renderTemplate(domNode);
 			result = { domNode, templateId, templateData };
 		}
 
-		return result;
+		return { row: result, isReusingConnectedDomNode: isStale };
 	}
 
 	/**
@@ -55,17 +66,47 @@ export class RowCache<T> implements IDisposable {
 		this.releaseRow(row);
 	}
 
+	/**
+	 * Begin a set of changes that use the cache. This lets us skip work when a row is removed and then inserted again.
+	 */
+	transact(makeChanges: () => void) {
+		if (this.inTransaction) {
+			throw new Error('Already in transaction');
+		}
+
+		this.inTransaction = true;
+
+		try {
+			makeChanges();
+		} finally {
+			for (const domNode of this.transactionNodesPendingRemoval) {
+				this.doRemoveNode(domNode);
+			}
+
+			this.transactionNodesPendingRemoval.clear();
+			this.inTransaction = false;
+		}
+	}
+
 	private releaseRow(row: IRow): void {
 		const { domNode, templateId } = row;
 		if (domNode) {
-			domNode.classList.remove('scrolling');
-			removeFromParent(domNode);
+			if (this.inTransaction) {
+				this.transactionNodesPendingRemoval.add(domNode);
+			} else {
+				this.doRemoveNode(domNode);
+			}
 		}
 
 		const cache = this.getTemplateCache(templateId);
 		cache.push(row);
 	}
 
+	private doRemoveNode(domNode: HTMLElement) {
+		domNode.classList.remove('scrolling');
+		removeFromParent(domNode);
+	}
+
 	private getTemplateCache(templateId: string): IRow[] {
 		let result = this.cache.get(templateId);
 
@@ -87,6 +128,7 @@ export class RowCache<T> implements IDisposable {
 		});
 
 		this.cache.clear();
+		this.transactionNodesPendingRemoval.clear();
 	}
 
 	private getRenderer(templateId: string): IListRenderer<T, any> {
diff --git a/src/vs/base/browser/ui/scrollbar/scrollableElement.ts b/src/vs/base/browser/ui/scrollbar/scrollableElement.ts
index b6b6c32a1dce05..87d4ed4d9fa381 100644
--- a/src/vs/base/browser/ui/scrollbar/scrollableElement.ts
+++ b/src/vs/base/browser/ui/scrollbar/scrollableElement.ts
@@ -86,6 +86,17 @@ export class MouseWheelClassifier {
 		return (score <= 0.5);
 	}
 
+	public acceptStandardWheelEvent(e: StandardWheelEvent): void {
+		const osZoomFactor = window.devicePixelRatio / getZoomFactor();
+		if (platform.isWindows || platform.isLinux) {
+			// On Windows and Linux, the incoming delta events are multiplied with the OS zoom factor.
+			// The OS zoom factor can be reverse engineered by using the device pixel ratio and the configured zoom factor into account.
+			this.accept(Date.now(), e.deltaX / osZoomFactor, e.deltaY / osZoomFactor);
+		} else {
+			this.accept(Date.now(), e.deltaX, e.deltaY);
+		}
+	}
+
 	public accept(timestamp: number, deltaX: number, deltaY: number): void {
 		const item = new MouseWheelClassifierItem(timestamp, deltaX, deltaY);
 		item.score = this._computeScore(item);
@@ -365,14 +376,7 @@ export abstract class AbstractScrollableElement extends Widget {
 
 		const classifier = MouseWheelClassifier.INSTANCE;
 		if (SCROLL_WHEEL_SMOOTH_SCROLL_ENABLED) {
-			const osZoomFactor = window.devicePixelRatio / getZoomFactor();
-			if (platform.isWindows || platform.isLinux) {
-				// On Windows and Linux, the incoming delta events are multiplied with the OS zoom factor.
-				// The OS zoom factor can be reverse engineered by using the device pixel ratio and the configured zoom factor into account.
-				classifier.accept(Date.now(), e.deltaX / osZoomFactor, e.deltaY / osZoomFactor);
-			} else {
-				classifier.accept(Date.now(), e.deltaX, e.deltaY);
-			}
+			classifier.acceptStandardWheelEvent(e);
 		}
 
 		// console.log(`${Date.now()}, ${e.deltaY}, ${e.deltaX}`);
diff --git a/src/vs/base/browser/ui/selectBox/selectBox.css b/src/vs/base/browser/ui/selectBox/selectBox.css
index d4a46f25f86c18..55910937a00c8f 100644
--- a/src/vs/base/browser/ui/selectBox/selectBox.css
+++ b/src/vs/base/browser/ui/selectBox/selectBox.css
@@ -23,7 +23,7 @@
 
 .monaco-action-bar .action-item .monaco-select-box {
 	cursor: pointer;
-	min-width: 110px;
+	min-width: 100px;
 	min-height: 18px;
 	padding: 2px 23px 2px 8px;
 }
diff --git a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
index cfdaca03d755bd..22ae08dfca4bd1 100644
--- a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
+++ b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
@@ -147,7 +147,7 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi
 	// IDelegate - List renderer
 
 	getHeight(): number {
-		return 18;
+		return 22;
 	}
 
 	getTemplateId(): string {
diff --git a/src/vs/base/browser/ui/table/table.css b/src/vs/base/browser/ui/table/table.css
index 6bc44f4345b9ac..2266437d7bc966 100644
--- a/src/vs/base/browser/ui/table/table.css
+++ b/src/vs/base/browser/ui/table/table.css
@@ -51,12 +51,7 @@
 	border-left: 1px solid transparent;
 }
 
-.monaco-table > .monaco-split-view2,
-.monaco-table > .monaco-split-view2 .monaco-sash.vertical::before {
+.monaco-workbench:not(.reduce-motion) .monaco-table > .monaco-split-view2,
+.monaco-workbench:not(.reduce-motion) .monaco-table > .monaco-split-view2 .monaco-sash.vertical::before {
 	transition: border-color 0.2s ease-out;
 }
-/*
-.monaco-table:hover > .monaco-split-view2,
-.monaco-table:hover > .monaco-split-view2 .monaco-sash.vertical::before {
-	border-color: rgba(204, 204, 204, 0.2);
-} */
diff --git a/src/vs/base/browser/ui/toolbar/toolbar.ts b/src/vs/base/browser/ui/toolbar/toolbar.ts
index 6ebd8c2a853e96..5cc460d758ab92 100644
--- a/src/vs/base/browser/ui/toolbar/toolbar.ts
+++ b/src/vs/base/browser/ui/toolbar/toolbar.ts
@@ -185,6 +185,10 @@ export class ToolBar extends Disposable {
 		});
 	}
 
+	isEmpty(): boolean {
+		return this.actionBar.isEmpty();
+	}
+
 	private getKeybindingLabel(action: IAction): string | undefined {
 		const key = this.lookupKeybindings ? this.options.getKeyBinding?.(action) : undefined;
 
diff --git a/src/vs/base/browser/ui/tree/abstractTree.ts b/src/vs/base/browser/ui/tree/abstractTree.ts
index 85e4a5f97108f4..92c1ad8e9fb672 100644
--- a/src/vs/base/browser/ui/tree/abstractTree.ts
+++ b/src/vs/base/browser/ui/tree/abstractTree.ts
@@ -369,6 +369,11 @@ class TreeRenderer<T, TFilterData, TRef, TTemplateData> implements IListRenderer
 
 			if (shouldRenderIndentGuides !== this.shouldRenderIndentGuides) {
 				this.shouldRenderIndentGuides = shouldRenderIndentGuides;
+
+				for (const [node, templateData] of this.renderedNodes) {
+					this._renderIndentGuides(node, templateData);
+				}
+
 				this.indentGuidesDisposable.dispose();
 
 				if (shouldRenderIndentGuides) {
@@ -469,6 +474,10 @@ class TreeRenderer<T, TFilterData, TRef, TTemplateData> implements IListRenderer
 			templateData.twistie.classList.remove('collapsible', 'collapsed');
 		}
 
+		this._renderIndentGuides(node, templateData);
+	}
+
+	private _renderIndentGuides(node: ITreeNode<T, TFilterData>, templateData: ITreeListTemplateData<TTemplateData>): void {
 		clearNode(templateData.indent);
 		templateData.indentGuidesDisposable.dispose();
 
diff --git a/src/vs/base/common/async.ts b/src/vs/base/common/async.ts
index 910af8de46a073..43ea5d6539c647 100644
--- a/src/vs/base/common/async.ts
+++ b/src/vs/base/common/async.ts
@@ -875,6 +875,13 @@ export class RunOnceScheduler implements IDisposable {
 		return this.timeoutToken !== -1;
 	}
 
+	flush(): void {
+		if (this.isScheduled()) {
+			this.cancel();
+			this.doRun();
+		}
+	}
+
 	private onTimeout() {
 		this.timeoutToken = -1;
 		if (this.runner) {
@@ -961,6 +968,7 @@ export class ProcessTimeRunOnceScheduler {
 }
 
 export class RunOnceWorker<T> extends RunOnceScheduler {
+
 	private units: T[] = [];
 
 	constructor(runner: (units: T[]) => void, timeout: number) {
@@ -1068,7 +1076,9 @@ export class ThrottledWorker<T> extends Disposable {
 		}
 
 		// Add to pending units first
-		this.pendingWork.push(...units);
+		for (const unit of units) {
+			this.pendingWork.push(unit);
+		}
 
 		// If not throttled, start working directly
 		// Otherwise, when the throttle delay has
@@ -1543,7 +1553,7 @@ export interface AsyncIterableEmitter<T> {
 /**
  * An executor for the `AsyncIterableObject` that has access to an emitter.
  */
-export interface AyncIterableExecutor<T> {
+export interface AsyncIterableExecutor<T> {
 	/**
 	 * @param emitter An object that allows to emit async values valid only for the duration of the executor.
 	 */
@@ -1590,7 +1600,7 @@ export class AsyncIterableObject<T> implements AsyncIterable<T> {
 	private _error: Error | null;
 	private readonly _onStateChanged: Emitter<void>;
 
-	constructor(executor: AyncIterableExecutor<T>) {
+	constructor(executor: AsyncIterableExecutor<T>) {
 		this._state = AsyncIterableSourceState.Initial;
 		this._results = [];
 		this._error = null;
@@ -1744,7 +1754,7 @@ export class AsyncIterableObject<T> implements AsyncIterable<T> {
 export class CancelableAsyncIterableObject<T> extends AsyncIterableObject<T> {
 	constructor(
 		private readonly _source: CancellationTokenSource,
-		executor: AyncIterableExecutor<T>
+		executor: AsyncIterableExecutor<T>
 	) {
 		super(executor);
 	}
diff --git a/src/vs/base/common/codicons.ts b/src/vs/base/common/codicons.ts
index 604d4f872c5ce1..16fe54a59b0ead 100644
--- a/src/vs/base/common/codicons.ts
+++ b/src/vs/base/common/codicons.ts
@@ -557,6 +557,7 @@ export class Codicon implements CSSIcon {
 	public static readonly gitPullRequestGoToChanges = new Codicon('git-pull-request-go-to-changes', { fontCharacter: '\\ec0b' });
 	public static readonly gitPullRequestNewChanges = new Codicon('git-pull-request-new-changes', { fontCharacter: '\\ec0c' });
 	public static readonly searchFuzzy = new Codicon('search-fuzzy', { fontCharacter: '\\ec0d' });
+	public static readonly commentDraft = new Codicon('comment-draft', { fontCharacter: '\\ec0e' });
 
 
 	// derived icons, that could become separate icons
diff --git a/src/vs/base/common/comparers.ts b/src/vs/base/common/comparers.ts
index 8ca910e3555740..c56fcd6b4a9fb3 100644
--- a/src/vs/base/common/comparers.ts
+++ b/src/vs/base/common/comparers.ts
@@ -88,26 +88,6 @@ export function compareFileNamesUnicode(one: string | null, other: string | null
 	return one < other ? -1 : 1;
 }
 
-export function noIntlCompareFileNames(one: string | null, other: string | null, caseSensitive = false): number {
-	if (!caseSensitive) {
-		one = one && one.toLowerCase();
-		other = other && other.toLowerCase();
-	}
-
-	const [oneName, oneExtension] = extractNameAndExtension(one);
-	const [otherName, otherExtension] = extractNameAndExtension(other);
-
-	if (oneName !== otherName) {
-		return oneName < otherName ? -1 : 1;
-	}
-
-	if (oneExtension === otherExtension) {
-		return 0;
-	}
-
-	return oneExtension < otherExtension ? -1 : 1;
-}
-
 /** Compares filenames by extension, then by name. Disambiguates by unicode comparison. */
 export function compareFileExtensions(one: string | null, other: string | null): number {
 	const [oneName, oneExtension] = extractNameAndExtension(one);
diff --git a/src/vs/base/common/filters.ts b/src/vs/base/common/filters.ts
index ebad3f5805de95..4810526f6a1f29 100644
--- a/src/vs/base/common/filters.ts
+++ b/src/vs/base/common/filters.ts
@@ -381,7 +381,7 @@ export function matchesFuzzy2(pattern: string, word: string): IMatch[] | null {
 export function anyScore(pattern: string, lowPattern: string, patternPos: number, word: string, lowWord: string, wordPos: number): FuzzyScore {
 	const max = Math.min(13, pattern.length);
 	for (; patternPos < max; patternPos++) {
-		const result = fuzzyScore(pattern, lowPattern, patternPos, word, lowWord, wordPos, { firstMatchCanBeWeak: false, boostFullMatch: true });
+		const result = fuzzyScore(pattern, lowPattern, patternPos, word, lowWord, wordPos, { firstMatchCanBeWeak: true, boostFullMatch: true });
 		if (result) {
 			return result;
 		}
diff --git a/src/vs/base/common/glob.ts b/src/vs/base/common/glob.ts
index d226e583080bbc..0bc40172eadf67 100644
--- a/src/vs/base/common/glob.ts
+++ b/src/vs/base/common/glob.ts
@@ -729,7 +729,7 @@ function parseExpressionPattern(pattern: string, value: boolean | SiblingClause,
 					return null;
 				}
 
-				const clausePattern = when.replace('$(basename)', name!);
+				const clausePattern = when.replace('$(basename)', () => name!);
 				const matched = hasSibling(clausePattern);
 				return isThenable(matched) ?
 					matched.then(match => match ? pattern : null) :
diff --git a/src/vs/base/common/htmlContent.ts b/src/vs/base/common/htmlContent.ts
index d43cc4d11b4090..107ee2c4feb07d 100644
--- a/src/vs/base/common/htmlContent.ts
+++ b/src/vs/base/common/htmlContent.ts
@@ -140,7 +140,7 @@ export function markdownStringEqual(a: IMarkdownString, b: IMarkdownString): boo
 
 export function escapeMarkdownSyntaxTokens(text: string): string {
 	// escape markdown syntax tokens: http://daringfireball.net/projects/markdown/syntax#backslash
-	return text.replace(/[\\`*_{}[\]()#+\-!]/g, '\\$&');
+	return text.replace(/[\\`*_{}[\]()#+\-!~]/g, '\\$&');
 }
 
 export function escapeDoubleQuotes(input: string) {
@@ -151,7 +151,7 @@ export function removeMarkdownEscapes(text: string): string {
 	if (!text) {
 		return text;
 	}
-	return text.replace(/\\([\\`*_{}[\]()#+\-.!])/g, '$1');
+	return text.replace(/\\([\\`*_{}[\]()#+\-.!~])/g, '$1');
 }
 
 export function parseHrefAndDimensions(href: string): { href: string; dimensions: string[] } {
diff --git a/src/vs/base/common/iconLabels.ts b/src/vs/base/common/iconLabels.ts
index 2579e137480da5..cf98f2c55d5629 100644
--- a/src/vs/base/common/iconLabels.ts
+++ b/src/vs/base/common/iconLabels.ts
@@ -10,7 +10,6 @@ import { ltrim } from 'vs/base/common/strings';
 const iconStartMarker = '$(';
 
 const iconsRegex = new RegExp(`\\$\\(${CSSIcon.iconNameExpression}(?:${CSSIcon.iconModifierExpression})?\\)`, 'g'); // no capturing groups
-const iconNameCharacterRegexp = new RegExp(CSSIcon.iconNameCharacter);
 
 const escapeIconsRegex = new RegExp(`(\\\\)?${iconsRegex.source}`, 'g');
 export function escapeIcons(text: string): string {
@@ -38,99 +37,37 @@ export interface IParsedLabelWithIcons {
 	readonly iconOffsets?: readonly number[];
 }
 
-export function parseLabelWithIcons(text: string): IParsedLabelWithIcons {
-	const firstIconIndex = text.indexOf(iconStartMarker);
-	if (firstIconIndex === -1) {
-		return { text }; // return early if the word does not include an icon
-	}
-
-	return doParseLabelWithIcons(text, firstIconIndex);
-}
+const _parseIconsRegex = new RegExp(`\\$\\(${CSSIcon.iconNameCharacter}+\\)`, 'g');
 
-function doParseLabelWithIcons(text: string, firstIconIndex: number): IParsedLabelWithIcons {
-	const iconOffsets: number[] = [];
-	let textWithoutIcons: string = '';
-
-	function appendChars(chars: string) {
-		if (chars) {
-			textWithoutIcons += chars;
+export function parseLabelWithIcons(input: string): IParsedLabelWithIcons {
 
-			for (const _ of chars) {
-				iconOffsets.push(iconsOffset); // make sure to fill in icon offsets
-			}
-		}
-	}
+	_parseIconsRegex.lastIndex = 0;
 
-	let currentIconStart = -1;
-	let currentIconValue: string = '';
+	let text = '';
+	const iconOffsets: number[] = [];
 	let iconsOffset = 0;
 
-	let char: string;
-	let nextChar: string;
-
-	let offset = firstIconIndex;
-	const length = text.length;
-
-	// Append all characters until the first icon
-	appendChars(text.substr(0, firstIconIndex));
-
-	// example: $(file-symlink-file) my cool $(other-icon) entry
-	while (offset < length) {
-		char = text[offset];
-		nextChar = text[offset + 1];
+	while (true) {
+		const pos = _parseIconsRegex.lastIndex;
+		const match = _parseIconsRegex.exec(input);
 
-		// beginning of icon: some value $( <--
-		if (char === iconStartMarker[0] && nextChar === iconStartMarker[1]) {
-			currentIconStart = offset;
-
-			// if we had a previous potential icon value without
-			// the closing ')', it was actually not an icon and
-			// so we have to add it to the actual value
-			appendChars(currentIconValue);
-
-			currentIconValue = iconStartMarker;
-
-			offset++; // jump over '('
-		}
-
-		// end of icon: some value $(some-icon) <--
-		else if (char === ')' && currentIconStart !== -1) {
-			const currentIconLength = offset - currentIconStart + 1; // +1 to include the closing ')'
-			iconsOffset += currentIconLength;
-			currentIconStart = -1;
-			currentIconValue = '';
-		}
-
-		// within icon
-		else if (currentIconStart !== -1) {
-			// Make sure this is a real icon name
-			if (iconNameCharacterRegexp.test(char)) {
-				currentIconValue += char;
-			} else {
-				// This is not a real icon, treat it as text
-				appendChars(currentIconValue);
-
-				currentIconStart = -1;
-				currentIconValue = '';
+		const chars = input.substring(pos, match?.index);
+		if (chars.length > 0) {
+			text += chars;
+			for (let i = 0; i < chars.length; i++) {
+				iconOffsets.push(iconsOffset);
 			}
 		}
-
-		// any value outside of icon
-		else {
-			appendChars(char);
+		if (!match) {
+			break;
 		}
-
-		offset++;
+		iconsOffset += match[0].length;
 	}
 
-	// if we had a previous potential icon value without
-	// the closing ')', it was actually not an icon and
-	// so we have to add it to the actual value
-	appendChars(currentIconValue);
-
-	return { text: textWithoutIcons, iconOffsets };
+	return { text, iconOffsets };
 }
 
+
 export function matchesFuzzyIconAware(query: string, target: IParsedLabelWithIcons, enableSeparateSubstringMatching = false): IMatch[] | null {
 	const { text, iconOffsets } = target;
 
diff --git a/src/vs/base/common/path.ts b/src/vs/base/common/path.ts
index 00d948acd88597..83140948bbabab 100644
--- a/src/vs/base/common/path.ts
+++ b/src/vs/base/common/path.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 // NOTE: VSCode's copy of nodejs path library to be usable in common (non-node) namespace
-// Copied from: https://github.com/nodejs/node/blob/v14.16.0/lib/path.js
+// Copied from: https://github.com/nodejs/node/blob/v16.14.2/lib/path.js
 
 /**
  * Copyright Joyent, Inc. and other Node contributors.
@@ -63,12 +63,20 @@ class ErrorInvalidArgType extends Error {
 	}
 }
 
+function validateObject(pathObject: object, name: string) {
+	if (pathObject === null || typeof pathObject !== 'object') {
+		throw new ErrorInvalidArgType(name, 'Object', pathObject);
+	}
+}
+
 function validateString(value: string, name: string) {
 	if (typeof value !== 'string') {
 		throw new ErrorInvalidArgType(name, 'string', value);
 	}
 }
 
+const platformIsWin32 = (process.platform === 'win32');
+
 function isPathSeparator(code: number | undefined) {
 	return code === CHAR_FORWARD_SLASH || code === CHAR_BACKWARD_SLASH;
 }
@@ -152,9 +160,7 @@ function normalizeString(path: string, allowAboveRoot: boolean, separator: strin
 }
 
 function _format(sep: string, pathObject: ParsedPath) {
-	if (pathObject === null || typeof pathObject !== 'object') {
-		throw new ErrorInvalidArgType('pathObject', 'Object', pathObject);
-	}
+	validateObject(pathObject, 'pathObject');
 	const dir = pathObject.dir || pathObject.root;
 	const base = pathObject.base ||
 		`${pathObject.name || ''}${pathObject.ext || ''}`;
@@ -634,14 +640,10 @@ export const win32: IPath = {
 
 	toNamespacedPath(path: string): string {
 		// Note: this will *probably* throw somewhere.
-		if (typeof path !== 'string') {
+		if (typeof path !== 'string' || path.length === 0) {
 			return path;
 		}
 
-		if (path.length === 0) {
-			return '';
-		}
-
 		const resolvedPath = win32.resolve(path);
 
 		if (resolvedPath.length <= 2) {
@@ -1069,6 +1071,21 @@ export const win32: IPath = {
 	posix: null
 };
 
+const posixCwd = (() => {
+	if (platformIsWin32) {
+		// Converts Windows' backslash path separators to POSIX forward slashes
+		// and truncates any drive indicator
+		const regexp = /\\/g;
+		return () => {
+			const cwd = process.cwd().replace(regexp, '/');
+			return cwd.slice(cwd.indexOf('/'));
+		};
+	}
+
+	// We're already on POSIX, no need for any transformations
+	return () => process.cwd();
+})();
+
 export const posix: IPath = {
 	// path.resolve([from ...], to)
 	resolve(...pathSegments: string[]): string {
@@ -1076,7 +1093,7 @@ export const posix: IPath = {
 		let resolvedAbsolute = false;
 
 		for (let i = pathSegments.length - 1; i >= -1 && !resolvedAbsolute; i--) {
-			const path = i >= 0 ? pathSegments[i] : process.cwd();
+			const path = i >= 0 ? pathSegments[i] : posixCwd();
 
 			validateString(path, 'path');
 
@@ -1491,16 +1508,16 @@ export const posix: IPath = {
 posix.win32 = win32.win32 = win32;
 posix.posix = win32.posix = posix;
 
-export const normalize = (process.platform === 'win32' ? win32.normalize : posix.normalize);
-export const isAbsolute = (process.platform === 'win32' ? win32.isAbsolute : posix.isAbsolute);
-export const join = (process.platform === 'win32' ? win32.join : posix.join);
-export const resolve = (process.platform === 'win32' ? win32.resolve : posix.resolve);
-export const relative = (process.platform === 'win32' ? win32.relative : posix.relative);
-export const dirname = (process.platform === 'win32' ? win32.dirname : posix.dirname);
-export const basename = (process.platform === 'win32' ? win32.basename : posix.basename);
-export const extname = (process.platform === 'win32' ? win32.extname : posix.extname);
-export const format = (process.platform === 'win32' ? win32.format : posix.format);
-export const parse = (process.platform === 'win32' ? win32.parse : posix.parse);
-export const toNamespacedPath = (process.platform === 'win32' ? win32.toNamespacedPath : posix.toNamespacedPath);
-export const sep = (process.platform === 'win32' ? win32.sep : posix.sep);
-export const delimiter = (process.platform === 'win32' ? win32.delimiter : posix.delimiter);
+export const normalize = (platformIsWin32 ? win32.normalize : posix.normalize);
+export const isAbsolute = (platformIsWin32 ? win32.isAbsolute : posix.isAbsolute);
+export const join = (platformIsWin32 ? win32.join : posix.join);
+export const resolve = (platformIsWin32 ? win32.resolve : posix.resolve);
+export const relative = (platformIsWin32 ? win32.relative : posix.relative);
+export const dirname = (platformIsWin32 ? win32.dirname : posix.dirname);
+export const basename = (platformIsWin32 ? win32.basename : posix.basename);
+export const extname = (platformIsWin32 ? win32.extname : posix.extname);
+export const format = (platformIsWin32 ? win32.format : posix.format);
+export const parse = (platformIsWin32 ? win32.parse : posix.parse);
+export const toNamespacedPath = (platformIsWin32 ? win32.toNamespacedPath : posix.toNamespacedPath);
+export const sep = (platformIsWin32 ? win32.sep : posix.sep);
+export const delimiter = (platformIsWin32 ? win32.delimiter : posix.delimiter);
diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
index cdca05f3f85615..897d806cc626ce 100644
--- a/src/vs/base/common/product.ts
+++ b/src/vs/base/common/product.ts
@@ -160,9 +160,6 @@ export interface IProductConfiguration {
 
 	readonly 'editSessions.store'?: Omit<ConfigurationSyncStore, 'insidersUrl' | 'stableUrl'>;
 	readonly darwinUniversalAssetId?: string;
-
-	// experimental
-	readonly enableSyncingProfiles?: boolean;
 }
 
 export interface ITunnelApplicationConfig {
diff --git a/src/vs/base/common/ternarySearchTree.ts b/src/vs/base/common/ternarySearchTree.ts
index 91f4301ffa97f3..c16704e3e5e084 100644
--- a/src/vs/base/common/ternarySearchTree.ts
+++ b/src/vs/base/common/ternarySearchTree.ts
@@ -654,6 +654,12 @@ export class TernarySearchTree<K, V> {
 	}
 
 	findSuperstr(key: K): IterableIterator<[K, V]> | undefined {
+		return this._findSuperstrOrElement(key, false);
+	}
+
+	private _findSuperstrOrElement(key: K, allowValue: true): IterableIterator<[K, V]> | V | undefined;
+	private _findSuperstrOrElement(key: K, allowValue: false): IterableIterator<[K, V]> | undefined;
+	private _findSuperstrOrElement(key: K, allowValue: boolean): IterableIterator<[K, V]> | V | undefined {
 		const iter = this._iter.reset(key);
 		let node = this._root;
 		while (node) {
@@ -671,7 +677,11 @@ export class TernarySearchTree<K, V> {
 			} else {
 				// collect
 				if (!node.mid) {
-					return undefined;
+					if (allowValue) {
+						return node.value;
+					} else {
+						return undefined;
+					}
 				} else {
 					return this._entries(node.mid);
 				}
@@ -680,6 +690,10 @@ export class TernarySearchTree<K, V> {
 		return undefined;
 	}
 
+	hasElementOrSubtree(key: K): boolean {
+		return this._findSuperstrOrElement(key, true) !== undefined;
+	}
+
 	forEach(callback: (value: V, index: K) => any): void {
 		for (const [key, value] of this) {
 			callback(value, key);
diff --git a/src/vs/base/common/uri.ts b/src/vs/base/common/uri.ts
index 744afa00f0c4c8..fc34316fab0589 100644
--- a/src/vs/base/common/uri.ts
+++ b/src/vs/base/common/uri.ts
@@ -497,7 +497,7 @@ const encodeTable: { [ch: number]: string } = {
 	[CharCode.Space]: '%20',
 };
 
-function encodeURIComponentFast(uriComponent: string, allowSlash: boolean): string {
+function encodeURIComponentFast(uriComponent: string, isPath: boolean, isAuthority: boolean): string {
 	let res: string | undefined = undefined;
 	let nativeEncodePos = -1;
 
@@ -513,7 +513,10 @@ function encodeURIComponentFast(uriComponent: string, allowSlash: boolean): stri
 			|| code === CharCode.Period
 			|| code === CharCode.Underline
 			|| code === CharCode.Tilde
-			|| (allowSlash && code === CharCode.Slash)
+			|| (isPath && code === CharCode.Slash)
+			|| (isAuthority && code === CharCode.OpenSquareBracket)
+			|| (isAuthority && code === CharCode.CloseSquareBracket)
+			|| (isAuthority && code === CharCode.Colon)
 		) {
 			// check if we are delaying native encode
 			if (nativeEncodePos !== -1) {
@@ -631,24 +634,24 @@ function _asFormatted(uri: URI, skipEncoding: boolean): string {
 			// <user>@<auth>
 			const userinfo = authority.substr(0, idx);
 			authority = authority.substr(idx + 1);
-			idx = userinfo.indexOf(':');
+			idx = userinfo.lastIndexOf(':');
 			if (idx === -1) {
-				res += encoder(userinfo, false);
+				res += encoder(userinfo, false, false);
 			} else {
 				// <user>:<pass>@<auth>
-				res += encoder(userinfo.substr(0, idx), false);
+				res += encoder(userinfo.substr(0, idx), false, false);
 				res += ':';
-				res += encoder(userinfo.substr(idx + 1), false);
+				res += encoder(userinfo.substr(idx + 1), false, true);
 			}
 			res += '@';
 		}
 		authority = authority.toLowerCase();
-		idx = authority.indexOf(':');
+		idx = authority.lastIndexOf(':');
 		if (idx === -1) {
-			res += encoder(authority, false);
+			res += encoder(authority, false, true);
 		} else {
 			// <auth>:<port>
-			res += encoder(authority.substr(0, idx), false);
+			res += encoder(authority.substr(0, idx), false, true);
 			res += authority.substr(idx);
 		}
 	}
@@ -666,15 +669,15 @@ function _asFormatted(uri: URI, skipEncoding: boolean): string {
 			}
 		}
 		// encode the rest of the path
-		res += encoder(path, true);
+		res += encoder(path, true, false);
 	}
 	if (query) {
 		res += '?';
-		res += encoder(query, false);
+		res += encoder(query, false, false);
 	}
 	if (fragment) {
 		res += '#';
-		res += !skipEncoding ? encodeURIComponentFast(fragment, false) : fragment;
+		res += !skipEncoding ? encodeURIComponentFast(fragment, false, false) : fragment;
 	}
 	return res;
 }
diff --git a/src/vs/base/node/shell.ts b/src/vs/base/node/shell.ts
index 3df529ecafaaf1..9da701ffec3b32 100644
--- a/src/vs/base/node/shell.ts
+++ b/src/vs/base/node/shell.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { release, userInfo } from 'os';
+import { userInfo } from 'os';
 import * as platform from 'vs/base/common/platform';
 import { getFirstAvailablePowerShellInstallation } from 'vs/base/node/powershell';
 import * as processes from 'vs/base/node/processes';
@@ -25,18 +25,6 @@ export async function getSystemShell(os: platform.OperatingSystem, env: platform
 	return getSystemShellUnixLike(os, env);
 }
 
-export function getSystemShellSync(os: platform.OperatingSystem, env: platform.IProcessEnvironment): string {
-	if (os === platform.OperatingSystem.Windows) {
-		if (platform.isWindows) {
-			return getSystemShellWindowsSync(env);
-		}
-		// Don't detect Windows shell when not on Windows
-		return processes.getWindowsShell(env);
-	}
-
-	return getSystemShellUnixLike(os, env);
-}
-
 let _TERMINAL_DEFAULT_SHELL_UNIX_LIKE: string | null = null;
 function getSystemShellUnixLike(os: platform.OperatingSystem, env: platform.IProcessEnvironment): string {
 	// Only use $SHELL for the current OS
@@ -80,14 +68,3 @@ async function getSystemShellWindows(): Promise<string> {
 	}
 	return _TERMINAL_DEFAULT_SHELL_WINDOWS;
 }
-
-function getSystemShellWindowsSync(env: platform.IProcessEnvironment): string {
-	if (_TERMINAL_DEFAULT_SHELL_WINDOWS) {
-		return _TERMINAL_DEFAULT_SHELL_WINDOWS;
-	}
-
-	const isAtLeastWindows10 = platform.isWindows && parseFloat(release()) >= 10;
-	const is32ProcessOn64Windows = env.hasOwnProperty('PROCESSOR_ARCHITEW6432');
-	const powerShellPath = `${env['windir']}\\${is32ProcessOn64Windows ? 'Sysnative' : 'System32'}\\WindowsPowerShell\\v1.0\\powershell.exe`;
-	return isAtLeastWindows10 ? powerShellPath : processes.getWindowsShell(env);
-}
diff --git a/src/vs/base/parts/ipc/common/ipc.net.ts b/src/vs/base/parts/ipc/common/ipc.net.ts
index be20275f7e708f..2ba8902448c62a 100644
--- a/src/vs/base/parts/ipc/common/ipc.net.ts
+++ b/src/vs/base/parts/ipc/common/ipc.net.ts
@@ -3,9 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { IntervalTimer } from 'vs/base/common/async';
 import { VSBuffer } from 'vs/base/common/buffer';
 import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
 import { IIPCLogger, IMessagePassingProtocol, IPCClient } from 'vs/base/parts/ipc/common/ipc';
 
 export const enum SocketDiagnosticsEventType {
@@ -264,6 +265,8 @@ const enum ProtocolMessageType {
 	Pause = 7,
 	Resume = 8,
 	KeepAlive = 9,
+	LatencyMeasurementRequest = 10,
+	LatencyMeasurementResponse = 11,
 }
 
 function protocolMessageTypeToString(messageType: ProtocolMessageType) {
@@ -277,6 +280,8 @@ function protocolMessageTypeToString(messageType: ProtocolMessageType) {
 		case ProtocolMessageType.Pause: return 'PauseWriting';
 		case ProtocolMessageType.Resume: return 'ResumeWriting';
 		case ProtocolMessageType.KeepAlive: return 'KeepAlive';
+		case ProtocolMessageType.LatencyMeasurementRequest: return 'LatencyMeasurementRequest';
+		case ProtocolMessageType.LatencyMeasurementResponse: return 'LatencyMeasurementResponse';
 	}
 }
 
@@ -300,6 +305,26 @@ export const enum ProtocolConstants {
 	 * Maximal grace time between the first and the last reconnection...
 	 */
 	ReconnectionShortGraceTime = 5 * 60 * 1000, // 5min
+	/**
+	 * Send a message every 5 seconds to avoid that the connection is closed by the OS.
+	 */
+	KeepAliveSendTime = 5000, // 5 seconds
+	/**
+	 * Measure the latency every 1 minute.
+	 */
+	LatencySampleTime = 1 * 60 * 1000, // 1 minute
+	/**
+	 * Keep the last 5 samples for latency measurement.
+	 */
+	LatencySampleCount = 5,
+	/**
+	 * A latency over 1s will be considered high.
+	 */
+	HighLatencyTimeThreshold = 1000,
+	/**
+	 * Having 3 or more samples with high latency will trigger a high latency event.
+	 */
+	HighLatencySampleThreshold = 3,
 }
 
 class ProtocolMessage {
@@ -778,6 +803,75 @@ export interface ILoadEstimator {
 	hasHighLoad(): boolean;
 }
 
+export const enum ConnectionHealth {
+	/**
+	 * The connection health is considered good when a certain number of recent round trip time measurements are below a certain threshold.
+	 * @see ProtocolConstants.HighLatencyTimeThreshold @see ProtocolConstants.HighLatencySampleThreshold
+	 */
+	Good,
+	/**
+	 * The connection health is considered poor when a certain number of recent round trip time measurements are above a certain threshold.
+	 * @see ProtocolConstants.HighLatencyTimeThreshold @see ProtocolConstants.HighLatencySampleThreshold
+	 */
+	Poor
+}
+
+export function connectionHealthToString(connectionHealth: ConnectionHealth): 'good' | 'poor' {
+	switch (connectionHealth) {
+		case ConnectionHealth.Good: return 'good';
+		case ConnectionHealth.Poor: return 'poor';
+	}
+}
+
+/**
+ * An event describing that the connection health has changed.
+ */
+export class ConnectionHealthChangedEvent {
+	constructor(
+		public readonly connectionHealth: ConnectionHealth
+	) { }
+}
+
+/**
+ * An event describing that a round trip time measurement was above a certain threshold.
+ */
+export class HighRoundTripTimeEvent {
+	constructor(
+		/**
+		 * The round trip time in milliseconds.
+		 */
+		public readonly roundTripTime: number,
+		/**
+		 * The number of recent round trip time measurements that were above the threshold.
+		 * @see ProtocolConstants.HighLatencyTimeThreshold @see ProtocolConstants.HighLatencySampleThreshold
+		 */
+		public readonly recentHighRoundTripCount: number
+	) { }
+}
+
+export interface PersistentProtocolOptions {
+	/**
+	 * The socket to use.
+	 */
+	socket: ISocket;
+	/**
+	 * The initial chunk of data that has already been received from the socket.
+	 */
+	initialChunk?: VSBuffer | null;
+	/**
+	 * The CPU load estimator to use.
+	 */
+	loadEstimator?: ILoadEstimator;
+	/**
+	 * Whether to measure round trip time. Defaults to false.
+	 */
+	measureRoundTripTime?: boolean;
+	/**
+	 * Whether to send keep alive messages. Defaults to true.
+	 */
+	sendKeepAlive?: boolean;
+}
+
 /**
  * Same as Protocol, but will actually track messages and acks.
  * Moreover, it will ensure no messages are lost if there are no event listeners.
@@ -804,9 +898,12 @@ export class PersistentProtocol implements IMessagePassingProtocol {
 	private _socket: ISocket;
 	private _socketWriter: ProtocolWriter;
 	private _socketReader: ProtocolReader;
-	private _socketDisposables: IDisposable[];
+	private _socketLatencyMonitor: LatencyMonitor;
+	private _socketDisposables: DisposableStore;
 
 	private readonly _loadEstimator: ILoadEstimator;
+	private readonly _measureRoundTripTime: boolean;
+	private readonly _shouldSendKeepAlive: boolean;
 
 	private readonly _onControlMessage = new BufferedEmitter<VSBuffer>();
 	readonly onControlMessage: Event<VSBuffer> = this._onControlMessage.event;
@@ -823,12 +920,20 @@ export class PersistentProtocol implements IMessagePassingProtocol {
 	private readonly _onSocketTimeout = new BufferedEmitter<SocketTimeoutEvent>();
 	readonly onSocketTimeout: Event<SocketTimeoutEvent> = this._onSocketTimeout.event;
 
+	private readonly _onHighRoundTripTime = new BufferedEmitter<HighRoundTripTimeEvent>();
+	readonly onHighRoundTripTime = this._onHighRoundTripTime.event;
+
+	private readonly _onDidChangeConnectionHealth = new BufferedEmitter<ConnectionHealth>();
+	readonly onDidChangeConnectionHealth = this._onDidChangeConnectionHealth.event;
+
 	public get unacknowledgedCount(): number {
 		return this._outgoingMsgId - this._outgoingAckId;
 	}
 
-	constructor(socket: ISocket, initialChunk: VSBuffer | null = null, loadEstimator: ILoadEstimator = LoadEstimator.getInstance()) {
-		this._loadEstimator = loadEstimator;
+	constructor(opts: PersistentProtocolOptions) {
+		this._loadEstimator = opts.loadEstimator ?? LoadEstimator.getInstance();
+		this._measureRoundTripTime = opts.measureRoundTripTime ?? false;
+		this._shouldSendKeepAlive = opts.sendKeepAlive ?? true;
 		this._isReconnecting = false;
 		this._outgoingUnackMsg = new Queue<ProtocolMessage>();
 		this._outgoingMsgId = 0;
@@ -843,22 +948,31 @@ export class PersistentProtocol implements IMessagePassingProtocol {
 		this._lastReplayRequestTime = 0;
 		this._lastSocketTimeoutTime = Date.now();
 
-		this._socketDisposables = [];
-		this._socket = socket;
-		this._socketWriter = new ProtocolWriter(this._socket);
-		this._socketDisposables.push(this._socketWriter);
-		this._socketReader = new ProtocolReader(this._socket);
-		this._socketDisposables.push(this._socketReader);
-		this._socketDisposables.push(this._socketReader.onMessage(msg => this._receiveMessage(msg)));
-		this._socketDisposables.push(this._socket.onClose((e) => this._onSocketClose.fire(e)));
-		if (initialChunk) {
-			this._socketReader.acceptChunk(initialChunk);
+		this._socketDisposables = new DisposableStore();
+		this._socket = opts.socket;
+		this._socketWriter = this._socketDisposables.add(new ProtocolWriter(this._socket));
+		this._socketReader = this._socketDisposables.add(new ProtocolReader(this._socket));
+		this._socketDisposables.add(this._socketReader.onMessage(msg => this._receiveMessage(msg)));
+		this._socketDisposables.add(this._socket.onClose(e => this._onSocketClose.fire(e)));
+		this._socketLatencyMonitor = this._socketDisposables.add(new LatencyMonitor()); // is started immediately
+		this._socketDisposables.add(this._socketLatencyMonitor.onSendLatencyRequest(buffer => this._sendLatencyMeasurementRequest(buffer)));
+		this._socketDisposables.add(this._socketLatencyMonitor.onHighRoundTripTime(e => this._onHighRoundTripTime.fire(e)));
+		this._socketDisposables.add(this._socketLatencyMonitor.onDidChangeConnectionHealth(e => this._onDidChangeConnectionHealth.fire(e)));
+		if (this._measureRoundTripTime) {
+			this._socketLatencyMonitor.start();
+		}
+
+		if (opts.initialChunk) {
+			this._socketReader.acceptChunk(opts.initialChunk);
 		}
 
-		// send a message every 5s
-		this._keepAliveInterval = setInterval(() => {
-			this._sendKeepAlive();
-		}, 5000);
+		if (this._shouldSendKeepAlive) {
+			this._keepAliveInterval = setInterval(() => {
+				this._sendKeepAlive();
+			}, ProtocolConstants.KeepAliveSendTime);
+		} else {
+			this._keepAliveInterval = null;
+		}
 	}
 
 	dispose(): void {
@@ -874,7 +988,7 @@ export class PersistentProtocol implements IMessagePassingProtocol {
 			clearInterval(this._keepAliveInterval);
 			this._keepAliveInterval = null;
 		}
-		this._socketDisposables = dispose(this._socketDisposables);
+		this._socketDisposables.dispose();
 	}
 
 	drain(): Promise<void> {
@@ -912,7 +1026,8 @@ export class PersistentProtocol implements IMessagePassingProtocol {
 	public beginAcceptReconnection(socket: ISocket, initialDataChunk: VSBuffer | null): void {
 		this._isReconnecting = true;
 
-		this._socketDisposables = dispose(this._socketDisposables);
+		this._socketDisposables.dispose();
+		this._socketDisposables = new DisposableStore();
 		this._onControlMessage.flushBuffer();
 		this._onSocketClose.flushBuffer();
 		this._onSocketTimeout.flushBuffer();
@@ -922,17 +1037,23 @@ export class PersistentProtocol implements IMessagePassingProtocol {
 		this._lastSocketTimeoutTime = Date.now();
 
 		this._socket = socket;
-		this._socketWriter = new ProtocolWriter(this._socket);
-		this._socketDisposables.push(this._socketWriter);
-		this._socketReader = new ProtocolReader(this._socket);
-		this._socketDisposables.push(this._socketReader);
-		this._socketDisposables.push(this._socketReader.onMessage(msg => this._receiveMessage(msg)));
-		this._socketDisposables.push(this._socket.onClose((e) => this._onSocketClose.fire(e)));
+		this._socketWriter = this._socketDisposables.add(new ProtocolWriter(this._socket));
+		this._socketReader = this._socketDisposables.add(new ProtocolReader(this._socket));
+		this._socketDisposables.add(this._socketReader.onMessage(msg => this._receiveMessage(msg)));
+		this._socketDisposables.add(this._socket.onClose(e => this._onSocketClose.fire(e)));
+		this._socketLatencyMonitor = this._socketDisposables.add(new LatencyMonitor()); // will be started later
+		this._socketDisposables.add(this._socketLatencyMonitor.onSendLatencyRequest(buffer => this._sendLatencyMeasurementRequest(buffer)));
+		this._socketDisposables.add(this._socketLatencyMonitor.onHighRoundTripTime(e => this._onHighRoundTripTime.fire(e)));
+		this._socketDisposables.add(this._socketLatencyMonitor.onDidChangeConnectionHealth(e => this._onDidChangeConnectionHealth.fire(e)));
+
 		this._socketReader.acceptChunk(initialDataChunk);
 	}
 
 	public endAcceptReconnection(): void {
 		this._isReconnecting = false;
+		if (this._measureRoundTripTime) {
+			this._socketLatencyMonitor.start();
+		}
 
 		// After a reconnection, let the other party know (again) which messages have been received.
 		// (perhaps the other party didn't receive a previous ACK)
@@ -1023,6 +1144,15 @@ export class PersistentProtocol implements IMessagePassingProtocol {
 				// nothing to do
 				break;
 			}
+			case ProtocolMessageType.LatencyMeasurementRequest: {
+				// we just send the data back
+				this._sendLatencyMeasurementResponse(msg.data);
+				break;
+			}
+			case ProtocolMessageType.LatencyMeasurementResponse: {
+				this._socketLatencyMonitor.handleResponse(msg.data);
+				break;
+			}
 		}
 	}
 
@@ -1148,9 +1278,96 @@ export class PersistentProtocol implements IMessagePassingProtocol {
 	}
 
 	private _sendKeepAlive(): void {
-		const msg = new ProtocolMessage(ProtocolMessageType.KeepAlive, 0, 0, getEmptyBuffer());
+		this._incomingAckId = this._incomingMsgId;
+		const msg = new ProtocolMessage(ProtocolMessageType.KeepAlive, 0, this._incomingAckId, getEmptyBuffer());
+		this._socketWriter.write(msg);
+	}
+
+	private _sendLatencyMeasurementRequest(buffer: VSBuffer): void {
+		this._incomingAckId = this._incomingMsgId;
+		const msg = new ProtocolMessage(ProtocolMessageType.LatencyMeasurementRequest, 0, this._incomingAckId, buffer);
 		this._socketWriter.write(msg);
 	}
+
+	private _sendLatencyMeasurementResponse(buffer: VSBuffer): void {
+		this._incomingAckId = this._incomingMsgId;
+		const msg = new ProtocolMessage(ProtocolMessageType.LatencyMeasurementResponse, 0, this._incomingAckId, buffer);
+		this._socketWriter.write(msg);
+	}
+}
+
+class LatencyMonitor extends Disposable {
+
+	private readonly _onSendLatencyRequest = this._register(new Emitter<VSBuffer>());
+	readonly onSendLatencyRequest: Event<VSBuffer> = this._onSendLatencyRequest.event;
+
+	private readonly _onHighRoundTripTime = this._register(new Emitter<HighRoundTripTimeEvent>());
+	public readonly onHighRoundTripTime = this._onHighRoundTripTime.event;
+
+	private readonly _onDidChangeConnectionHealth = this._register(new Emitter<ConnectionHealth>());
+	public readonly onDidChangeConnectionHealth = this._onDidChangeConnectionHealth.event;
+
+	private readonly _measureLatencyTimer = this._register(new IntervalTimer());
+
+	/**
+	 * Timestamp of our last latency request message sent to the other host.
+	 */
+	private _lastLatencyMeasurementSent: number = -1;
+
+	/**
+	 * ID separate from the regular message IDs. Used to match up latency
+	 * requests with responses so we know we're timing the right message
+	 * even if a reconnection occurs.
+	 */
+	private _lastLatencyMeasurementId: number = 0;
+
+	/**
+	 * Circular buffer of latency measurements
+	 */
+	private _latencySamples: number[] = Array.from({ length: ProtocolConstants.LatencySampleCount }, (_) => 0);
+	private _latencySampleIndex: number = 0;
+	private _connectionHealth = ConnectionHealth.Good;
+
+	constructor() {
+		super();
+	}
+
+	public start(): void {
+		this._measureLatencyTimer.cancelAndSet(() => {
+			this._lastLatencyMeasurementSent = Date.now();
+			const measurementId = ++this._lastLatencyMeasurementId;
+			const buffer = VSBuffer.alloc(4);
+			buffer.writeUInt32BE(measurementId, 0);
+			this._onSendLatencyRequest.fire(buffer);
+		}, ProtocolConstants.LatencySampleTime);
+	}
+
+	public handleResponse(buffer: VSBuffer): void {
+		if (buffer.byteLength !== 4) {
+			// invalid measurementId
+			return;
+		}
+		const measurementId = buffer.readUInt32BE(0);
+		if (this._lastLatencyMeasurementSent <= 0 || measurementId !== this._lastLatencyMeasurementId) {
+			// invalid measurementId
+			return;
+		}
+
+		const roundtripTime = Date.now() - this._lastLatencyMeasurementSent;
+		const sampleIndex = this._latencySampleIndex++;
+		this._latencySamples[sampleIndex % this._latencySamples.length] = roundtripTime;
+
+		const previousConnectionHealth = this._connectionHealth;
+		const highLatencySampleCount = this._latencySamples.filter(s => s >= ProtocolConstants.HighLatencyTimeThreshold).length;
+		this._connectionHealth = (highLatencySampleCount >= ProtocolConstants.HighLatencySampleThreshold ? ConnectionHealth.Poor : ConnectionHealth.Good);
+
+		if (roundtripTime > ProtocolConstants.HighLatencyTimeThreshold) {
+			this._onHighRoundTripTime.fire(new HighRoundTripTimeEvent(roundtripTime, highLatencySampleCount));
+		}
+		if (previousConnectionHealth !== this._connectionHealth) {
+			this._onDidChangeConnectionHealth.fire(this._connectionHealth);
+		}
+	}
 }
 
 // (() => {
diff --git a/src/vs/base/parts/ipc/common/ipc.ts b/src/vs/base/parts/ipc/common/ipc.ts
index 90041425e03e37..1d8c4a45efaf12 100644
--- a/src/vs/base/parts/ipc/common/ipc.ts
+++ b/src/vs/base/parts/ipc/common/ipc.ts
@@ -164,7 +164,50 @@ interface IWriter {
 	write(buffer: VSBuffer): void;
 }
 
-class BufferReader implements IReader {
+
+/**
+ * @see https://en.wikipedia.org/wiki/Variable-length_quantity
+ */
+function readIntVQL(reader: IReader) {
+	let value = 0;
+	for (let n = 0; ; n += 7) {
+		const next = reader.read(1);
+		value |= (next.buffer[0] & 0b01111111) << n;
+		if (!(next.buffer[0] & 0b10000000)) {
+			return value;
+		}
+	}
+}
+
+const vqlZero = createOneByteBuffer(0);
+
+/**
+ * @see https://en.wikipedia.org/wiki/Variable-length_quantity
+ */
+function writeInt32VQL(writer: IWriter, value: number) {
+	if (value === 0) {
+		writer.write(vqlZero);
+		return;
+	}
+
+	let len = 0;
+	for (let v2 = value; v2 !== 0; v2 = v2 >>> 7) {
+		len++;
+	}
+
+	const scratch = VSBuffer.alloc(len);
+	for (let i = 0; value !== 0; i++) {
+		scratch.buffer[i] = value & 0b01111111;
+		value = value >>> 7;
+		if (value > 0) {
+			scratch.buffer[i] |= 0b10000000;
+		}
+	}
+
+	writer.write(scratch);
+}
+
+export class BufferReader implements IReader {
 
 	private pos = 0;
 
@@ -177,7 +220,7 @@ class BufferReader implements IReader {
 	}
 }
 
-class BufferWriter implements IWriter {
+export class BufferWriter implements IWriter {
 
 	private buffers: VSBuffer[] = [];
 
@@ -196,17 +239,8 @@ enum DataType {
 	Buffer = 2,
 	VSBuffer = 3,
 	Array = 4,
-	Object = 5
-}
-
-function createSizeBuffer(size: number): VSBuffer {
-	const result = VSBuffer.alloc(4);
-	result.writeUInt32BE(size, 0);
-	return result;
-}
-
-function readSizeBuffer(reader: IReader): number {
-	return reader.read(4).readUInt32BE(0);
+	Object = 5,
+	Int = 6
 }
 
 function createOneByteBuffer(value: number): VSBuffer {
@@ -222,53 +256,58 @@ const BufferPresets = {
 	VSBuffer: createOneByteBuffer(DataType.VSBuffer),
 	Array: createOneByteBuffer(DataType.Array),
 	Object: createOneByteBuffer(DataType.Object),
+	Uint: createOneByteBuffer(DataType.Int),
 };
 
 declare const Buffer: any;
 const hasBuffer = (typeof Buffer !== 'undefined');
 
-function serialize(writer: IWriter, data: any): void {
+export function serialize(writer: IWriter, data: any): void {
 	if (typeof data === 'undefined') {
 		writer.write(BufferPresets.Undefined);
 	} else if (typeof data === 'string') {
 		const buffer = VSBuffer.fromString(data);
 		writer.write(BufferPresets.String);
-		writer.write(createSizeBuffer(buffer.byteLength));
+		writeInt32VQL(writer, buffer.byteLength);
 		writer.write(buffer);
 	} else if (hasBuffer && Buffer.isBuffer(data)) {
 		const buffer = VSBuffer.wrap(data);
 		writer.write(BufferPresets.Buffer);
-		writer.write(createSizeBuffer(buffer.byteLength));
+		writeInt32VQL(writer, buffer.byteLength);
 		writer.write(buffer);
 	} else if (data instanceof VSBuffer) {
 		writer.write(BufferPresets.VSBuffer);
-		writer.write(createSizeBuffer(data.byteLength));
+		writeInt32VQL(writer, data.byteLength);
 		writer.write(data);
 	} else if (Array.isArray(data)) {
 		writer.write(BufferPresets.Array);
-		writer.write(createSizeBuffer(data.length));
+		writeInt32VQL(writer, data.length);
 
 		for (const el of data) {
 			serialize(writer, el);
 		}
+	} else if (typeof data === 'number' && (data | 0) === data) {
+		// write a vql if it's a number that we can do bitwise operations on
+		writer.write(BufferPresets.Uint);
+		writeInt32VQL(writer, data);
 	} else {
 		const buffer = VSBuffer.fromString(JSON.stringify(data));
 		writer.write(BufferPresets.Object);
-		writer.write(createSizeBuffer(buffer.byteLength));
+		writeInt32VQL(writer, buffer.byteLength);
 		writer.write(buffer);
 	}
 }
 
-function deserialize(reader: IReader): any {
+export function deserialize(reader: IReader): any {
 	const type = reader.read(1).readUInt8(0);
 
 	switch (type) {
 		case DataType.Undefined: return undefined;
-		case DataType.String: return reader.read(readSizeBuffer(reader)).toString();
-		case DataType.Buffer: return reader.read(readSizeBuffer(reader)).buffer;
-		case DataType.VSBuffer: return reader.read(readSizeBuffer(reader));
+		case DataType.String: return reader.read(readIntVQL(reader)).toString();
+		case DataType.Buffer: return reader.read(readIntVQL(reader)).buffer;
+		case DataType.VSBuffer: return reader.read(readIntVQL(reader));
 		case DataType.Array: {
-			const length = readSizeBuffer(reader);
+			const length = readIntVQL(reader);
 			const result: any[] = [];
 
 			for (let i = 0; i < length; i++) {
@@ -277,7 +316,8 @@ function deserialize(reader: IReader): any {
 
 			return result;
 		}
-		case DataType.Object: return JSON.parse(reader.read(readSizeBuffer(reader)).toString());
+		case DataType.Object: return JSON.parse(reader.read(readIntVQL(reader)).toString());
+		case DataType.Int: return readIntVQL(reader);
 	}
 }
 
diff --git a/src/vs/base/parts/ipc/test/common/ipc.test.ts b/src/vs/base/parts/ipc/test/common/ipc.test.ts
index d4a9a4bbb0847c..eaead87178e1aa 100644
--- a/src/vs/base/parts/ipc/test/common/ipc.test.ts
+++ b/src/vs/base/parts/ipc/test/common/ipc.test.ts
@@ -11,7 +11,7 @@ import { canceled } from 'vs/base/common/errors';
 import { Emitter, Event } from 'vs/base/common/event';
 import { isEqual } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
-import { ClientConnectionEvent, IChannel, IMessagePassingProtocol, IPCClient, IPCServer, IServerChannel, ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
+import { BufferReader, BufferWriter, ClientConnectionEvent, deserialize, IChannel, IMessagePassingProtocol, IPCClient, IPCServer, IServerChannel, ProxyChannel, serialize } from 'vs/base/parts/ipc/common/ipc';
 
 class QueueProtocol implements IMessagePassingProtocol {
 
@@ -319,6 +319,22 @@ suite('Base IPC', function () {
 			const r = await ipcService.buffersLength([VSBuffer.alloc(2), VSBuffer.alloc(3)]);
 			return assert.strictEqual(r, 5);
 		});
+
+		test('round trips numbers', () => {
+			const input = [
+				0,
+				1,
+				-1,
+				12345,
+				-12345,
+				42.6,
+				123412341234
+			];
+
+			const writer = new BufferWriter();
+			serialize(writer, input);
+			assert.deepStrictEqual(deserialize(new BufferReader(writer.buffer)), input);
+		});
 	});
 
 	suite('one to one (proxy)', function () {
diff --git a/src/vs/base/parts/ipc/test/node/ipc.net.test.ts b/src/vs/base/parts/ipc/test/node/ipc.net.test.ts
index ce1a1d8bc697bf..ed797697982ede 100644
--- a/src/vs/base/parts/ipc/test/node/ipc.net.test.ts
+++ b/src/vs/base/parts/ipc/test/node/ipc.net.test.ts
@@ -194,9 +194,9 @@ suite('PersistentProtocol reconnection', () => {
 
 	test('acks get piggybacked with messages', async () => {
 		const ether = new Ether();
-		const a = new PersistentProtocol(new NodeSocket(ether.a));
+		const a = new PersistentProtocol({ socket: new NodeSocket(ether.a) });
 		const aMessages = new MessageStream(a);
-		const b = new PersistentProtocol(new NodeSocket(ether.b));
+		const b = new PersistentProtocol({ socket: new NodeSocket(ether.b) });
 		const bMessages = new MessageStream(b);
 
 		a.send(VSBuffer.fromString('a1'));
@@ -257,10 +257,10 @@ suite('PersistentProtocol reconnection', () => {
 			};
 			const ether = new Ether();
 			const aSocket = new NodeSocket(ether.a);
-			const a = new PersistentProtocol(aSocket, null, loadEstimator);
+			const a = new PersistentProtocol({ socket: aSocket, loadEstimator });
 			const aMessages = new MessageStream(a);
 			const bSocket = new NodeSocket(ether.b);
-			const b = new PersistentProtocol(bSocket, null, loadEstimator);
+			const b = new PersistentProtocol({ socket: bSocket, loadEstimator });
 			const bMessages = new MessageStream(b);
 
 			// send one message A -> B
@@ -302,10 +302,10 @@ suite('PersistentProtocol reconnection', () => {
 				};
 				const ether = new Ether();
 				const aSocket = new NodeSocket(ether.a);
-				const a = new PersistentProtocol(aSocket, null, loadEstimator);
+				const a = new PersistentProtocol({ socket: aSocket, loadEstimator, sendKeepAlive: false });
 				const aMessages = new MessageStream(a);
 				const bSocket = new NodeSocket(ether.b);
-				const b = new PersistentProtocol(bSocket, null, loadEstimator);
+				const b = new PersistentProtocol({ socket: bSocket, loadEstimator, sendKeepAlive: false });
 				const bMessages = new MessageStream(b);
 
 				// send message a1 before reconnection to get _recvAckCheck() scheduled
@@ -384,10 +384,10 @@ suite('PersistentProtocol reconnection', () => {
 				const wireLatency = 1000;
 				const ether = new Ether(wireLatency);
 				const aSocket = new NodeSocket(ether.a);
-				const a = new PersistentProtocol(aSocket, null, loadEstimator);
+				const a = new PersistentProtocol({ socket: aSocket, loadEstimator });
 				const aMessages = new MessageStream(a);
 				const bSocket = new NodeSocket(ether.b);
-				const b = new PersistentProtocol(bSocket, null, loadEstimator);
+				const b = new PersistentProtocol({ socket: bSocket, loadEstimator });
 				const bMessages = new MessageStream(b);
 
 				// send message a1 to have something unacknowledged
@@ -445,10 +445,10 @@ suite('PersistentProtocol reconnection', () => {
 				};
 				const ether = new Ether();
 				const aSocket = new NodeSocket(ether.a);
-				const a = new PersistentProtocol(aSocket, null, loadEstimator);
+				const a = new PersistentProtocol({ socket: aSocket, loadEstimator });
 				const aMessages = new MessageStream(a);
 				const bSocket = new NodeSocket(ether.b);
-				const b = new PersistentProtocol(bSocket, null, loadEstimator);
+				const b = new PersistentProtocol({ socket: bSocket, loadEstimator });
 				const bMessages = new MessageStream(b);
 
 				// never receive acks
@@ -490,10 +490,10 @@ suite('PersistentProtocol reconnection', () => {
 			};
 			const ether = new Ether();
 			const aSocket = new NodeSocket(ether.a);
-			const a = new PersistentProtocol(aSocket, null, loadEstimator);
+			const a = new PersistentProtocol({ socket: aSocket, loadEstimator });
 			const aMessages = new MessageStream(a);
 			const bSocket = new NodeSocket(ether.b);
-			const b = new PersistentProtocol(bSocket, null, loadEstimator);
+			const b = new PersistentProtocol({ socket: bSocket, loadEstimator });
 			const bMessages = new MessageStream(b);
 
 			// send one message A -> B
diff --git a/src/vs/base/parts/quickinput/browser/media/quickInput.css b/src/vs/base/parts/quickinput/browser/media/quickInput.css
index d197bf0ffa0141..5e92c271f9eeb6 100644
--- a/src/vs/base/parts/quickinput/browser/media/quickInput.css
+++ b/src/vs/base/parts/quickinput/browser/media/quickInput.css
@@ -11,12 +11,14 @@
 	right: 0;
 	margin: 0 auto;
 	-webkit-app-region: no-drag;
-	border-radius: 4px;
+	border-radius: 6px;
 }
 
 .quick-input-titlebar {
 	display: flex;
 	align-items: center;
+	border-top-left-radius: 5px; /* match border radius of quick input widget */
+	border-top-right-radius: 5px;
 }
 
 .quick-input-left-action-bar {
@@ -58,8 +60,7 @@
 
 .quick-input-header {
 	display: flex;
-	padding: 8px 6px 0px 6px;
-	margin-bottom: -2px;
+	padding: 8px 6px 6px 6px;
 }
 
 .quick-input-widget.hidden-input .quick-input-header {
@@ -125,7 +126,7 @@
 	font-size: 11px;
 	padding: 0 6px;
 	display: flex;
-	height: 27.5px;
+	height: 25px;
 	align-items: center;
 }
 
@@ -151,8 +152,6 @@
 
 .quick-input-list {
 	line-height: 22px;
-	margin-top: 6px;
-	padding: 1px;
 }
 
 .quick-input-widget.hidden-input .quick-input-list {
@@ -163,6 +162,7 @@
 .quick-input-list .monaco-list {
 	overflow: hidden;
 	max-height: calc(20 * 22px);
+	padding-bottom: 5px;
 }
 
 .quick-input-list .monaco-scrollable-element {
diff --git a/src/vs/base/parts/quickinput/browser/quickInput.ts b/src/vs/base/parts/quickinput/browser/quickInput.ts
index f0a8d48412620a..3f2a26679ace35 100644
--- a/src/vs/base/parts/quickinput/browser/quickInput.ts
+++ b/src/vs/base/parts/quickinput/browser/quickInput.ts
@@ -8,7 +8,7 @@ import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
 import { Button, IButtonStyles } from 'vs/base/browser/ui/button/button';
-import { CountBadge, ICountBadgetyles } from 'vs/base/browser/ui/countBadge/countBadge';
+import { CountBadge, ICountBadgeStyles } from 'vs/base/browser/ui/countBadge/countBadge';
 import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
 import { IInputBoxStyles } from 'vs/base/browser/ui/inputbox/inputBox';
 import { IKeybindingLabelStyles } from 'vs/base/browser/ui/keybindingLabel/keybindingLabel';
@@ -57,7 +57,7 @@ export interface IQuickInputStyles {
 	widget: IQuickInputWidgetStyles;
 	inputBox: IInputBoxStyles;
 	toggle: IToggleStyles;
-	countBadge: ICountBadgetyles;
+	countBadge: ICountBadgeStyles;
 	button: IButtonStyles;
 	progressBar: IProgressBarStyles;
 	keybindingLabel: IKeybindingLabelStyles;
@@ -68,7 +68,7 @@ export interface IQuickInputWidgetStyles {
 	quickInputBackground?: Color;
 	quickInputForeground?: Color;
 	quickInputTitleBackground?: Color;
-	contrastBorder?: Color;
+	widgetBorder?: Color;
 	widgetShadow?: Color;
 }
 
@@ -147,12 +147,14 @@ class QuickInput extends Disposable implements IQuickInput {
 	private _busy = false;
 	private _ignoreFocusOut = false;
 	private _buttons: IQuickInputButton[] = [];
+	private buttonsUpdated = false;
+	private _toggles: IQuickInputToggle[] = [];
+	private togglesUpdated = false;
 	protected noValidationMessage = QuickInput.noPromptMessage;
 	private _validationMessage: string | undefined;
 	private _lastValidationMessage: string | undefined;
 	private _severity: Severity = Severity.Ignore;
 	private _lastSeverity: Severity | undefined;
-	private buttonsUpdated = false;
 	private readonly onDidTriggerButtonEmitter = this._register(new Emitter<IQuickInputButton>());
 	private readonly onDidHideEmitter = this._register(new Emitter<IQuickInputHideEvent>());
 	private readonly onDisposeEmitter = this._register(new Emitter<void>());
@@ -252,6 +254,16 @@ class QuickInput extends Disposable implements IQuickInput {
 		this.update();
 	}
 
+	get toggles() {
+		return this._toggles;
+	}
+
+	set toggles(toggles: IQuickInputToggle[]) {
+		this._toggles = toggles ?? [];
+		this.togglesUpdated = true;
+		this.update();
+	}
+
 	get validationMessage() {
 		return this._validationMessage;
 	}
@@ -296,6 +308,11 @@ class QuickInput extends Disposable implements IQuickInput {
 			// rerender them.
 			this.buttonsUpdated = true;
 		}
+		if (this.toggles.length) {
+			// if there are toggles, the ui.show() clears them out of the UI so we should
+			// rerender them.
+			this.togglesUpdated = true;
+		}
 
 		this.update();
 	}
@@ -366,6 +383,14 @@ class QuickInput extends Disposable implements IQuickInput {
 				return action;
 			}), { icon: true, label: false });
 		}
+		if (this.togglesUpdated) {
+			this.togglesUpdated = false;
+			// HACK: Filter out toggles here that are not concrete Toggle objects. This is to workaround
+			// a layering issue as quick input's interface is in common but Toggle is in browser and
+			// it requires a HTMLElement on its interface
+			const concreteToggles = this.toggles?.filter(opts => opts instanceof Toggle) as Toggle[] ?? [];
+			this.ui.inputBox.toggles = concreteToggles;
+		}
 		this.ui.ignoreFocusOut = this.ignoreFocusOut;
 		this.ui.setEnabled(this.enabled);
 		this.ui.setContextKey(this.contextKey);
@@ -743,14 +768,6 @@ class QuickPick<T extends IQuickPickItem> extends QuickInput implements IQuickPi
 		this.update();
 	}
 
-	set toggles(toggles: IQuickInputToggle[] | undefined) {
-		// HACK: Filter out toggles here that are not concrete Toggle objects. This is to workaround
-		// a layering issue as quick input's interface is in common but Toggle is in browser and
-		// it requires a HTMLElement on its interface
-		const concreteToggles = toggles?.filter(opts => opts instanceof Toggle) as Toggle[];
-		this.ui.inputBox.toggles = concreteToggles;
-	}
-
 	onDidChangeSelection = this.onDidChangeSelectionEmitter.event;
 
 	onDidTriggerItemButton = this.onDidTriggerItemButtonEmitter.event;
@@ -975,15 +992,14 @@ class QuickPick<T extends IQuickPickItem> extends QuickInput implements IQuickPi
 		}
 		// store the scrollTop before it is reset
 		const scrollTopBefore = this.keepScrollPosition ? this.scrollTop : 0;
-		const hideInput = !!this._hideInput && this._items.length > 0;
-		this.ui.container.classList.toggle('hidden-input', hideInput && !this.description);
+		const hasDescription = !!this.description;
 		const visibilities: Visibilities = {
 			title: !!this.title || !!this.step || !!this.buttons.length,
-			description: !!this.description,
+			description: hasDescription,
 			checkAll: this.canSelectMany && !this._hideCheckAll,
 			checkBox: this.canSelectMany,
-			inputBox: !hideInput,
-			progressBar: !hideInput,
+			inputBox: !this._hideInput,
+			progressBar: !this._hideInput || hasDescription,
 			visibleCount: true,
 			count: this.canSelectMany,
 			ok: this.ok === 'default' ? this.canSelectMany : this.ok,
@@ -1289,11 +1305,11 @@ export class QuickInputController extends Disposable {
 		const visibleCountContainer = dom.append(filterContainer, $('.quick-input-visible-count'));
 		visibleCountContainer.setAttribute('aria-live', 'polite');
 		visibleCountContainer.setAttribute('aria-atomic', 'true');
-		const visibleCount = new CountBadge(visibleCountContainer, { countFormat: localize({ key: 'quickInput.visibleCount', comment: ['This tells the user how many items are shown in a list of items to select from. The items can be anything. Currently not visible, but read by screen readers.'] }, "{0} Results") });
+		const visibleCount = new CountBadge(visibleCountContainer, { countFormat: localize({ key: 'quickInput.visibleCount', comment: ['This tells the user how many items are shown in a list of items to select from. The items can be anything. Currently not visible, but read by screen readers.'] }, "{0} Results") }, this.styles.countBadge);
 
 		const countContainer = dom.append(filterContainer, $('.quick-input-count'));
 		countContainer.setAttribute('aria-live', 'polite');
-		const count = new CountBadge(countContainer, { countFormat: localize({ key: 'quickInput.countSelected', comment: ['This tells the user how many items are selected in a list of items to select from. The items can be anything.'] }, "{0} Selected") });
+		const count = new CountBadge(countContainer, { countFormat: localize({ key: 'quickInput.countSelected', comment: ['This tells the user how many items are selected in a list of items to select from. The items can be anything.'] }, "{0} Selected") }, this.styles.countBadge);
 
 		const okContainer = dom.append(headerContainer, $('.quick-input-action'));
 		const ok = new Button(okContainer, this.styles.button);
@@ -1311,6 +1327,9 @@ export class QuickInputController extends Disposable {
 
 		const message = dom.append(extraContainer, $(`#${this.idPrefix}message.quick-input-message`));
 
+		const progressBar = new ProgressBar(container, this.styles.progressBar);
+		progressBar.getContainer().classList.add('quick-input-progress');
+
 		const list = this._register(new QuickInputList(container, this.idPrefix + 'list', this.options));
 		this._register(list.onChangedAllVisibleChecked(checked => {
 			checkAll.checked = checked;
@@ -1336,9 +1355,6 @@ export class QuickInputController extends Disposable {
 			}
 		}));
 
-		const progressBar = new ProgressBar(container, this.styles.progressBar);
-		progressBar.getContainer().classList.add('quick-input-progress');
-
 		const focusTracker = dom.trackFocus(container);
 		this._register(focusTracker);
 		this._register(dom.addDisposableListener(container, dom.EventType.FOCUS, e => {
@@ -1654,6 +1670,7 @@ export class QuickInputController extends Disposable {
 		ui.ignoreFocusOut = false;
 		this.setComboboxAccessibility(false);
 		ui.inputBox.ariaLabel = '';
+		ui.inputBox.toggles = undefined;
 
 		const backKeybindingLabel = this.options.backKeybindingLabel();
 		backButton.tooltip = backKeybindingLabel ? localize('quickInput.backWithKeybinding', "Back ({0})", backKeybindingLabel) : localize('quickInput.back', "Back");
@@ -1677,7 +1694,8 @@ export class QuickInputController extends Disposable {
 		ui.message.style.display = visibilities.message ? '' : 'none';
 		ui.progressBar.getContainer().style.display = visibilities.progressBar ? '' : 'none';
 		ui.list.display(!!visibilities.list);
-		ui.container.classList.toggle('show-checkboxes', visibilities.checkBox);
+		ui.container.classList.toggle('show-checkboxes', !!visibilities.checkBox);
+		ui.container.classList.toggle('hidden-input', !visibilities.inputBox && !visibilities.description);
 		this.updateLayout(); // TODO
 	}
 
@@ -1712,9 +1730,6 @@ export class QuickInputController extends Disposable {
 			this.getUI().inputBox.enabled = enabled;
 			this.getUI().ok.enabled = enabled;
 			this.getUI().list.enabled = enabled;
-			if (!enabled) {
-				this.getUI().container.focus();
-			}
 		}
 	}
 
@@ -1816,15 +1831,14 @@ export class QuickInputController extends Disposable {
 				quickInputTitleBackground,
 				quickInputBackground,
 				quickInputForeground,
-				contrastBorder,
+				widgetBorder,
 				widgetShadow,
 			} = this.styles.widget;
 			this.ui.titleBar.style.backgroundColor = quickInputTitleBackground ? quickInputTitleBackground.toString() : '';
 			this.ui.container.style.backgroundColor = quickInputBackground ? quickInputBackground.toString() : '';
 			this.ui.container.style.color = quickInputForeground ? quickInputForeground.toString() : '';
-			this.ui.container.style.border = contrastBorder ? `1px solid ${contrastBorder}` : '';
+			this.ui.container.style.border = widgetBorder ? `1px solid ${widgetBorder}` : '';
 			this.ui.container.style.boxShadow = widgetShadow ? `0 0 8px 2px ${widgetShadow}` : '';
-			this.ui.count.style(this.styles.countBadge);
 			this.ui.list.style(this.styles.list);
 
 			const content: string[] = [];
diff --git a/src/vs/base/parts/quickinput/browser/quickInputBox.ts b/src/vs/base/parts/quickinput/browser/quickInputBox.ts
index f73ff7d739aa93..d85d88f212c5c7 100644
--- a/src/vs/base/parts/quickinput/browser/quickInputBox.ts
+++ b/src/vs/base/parts/quickinput/browser/quickInputBox.ts
@@ -91,7 +91,15 @@ export class QuickInputBox extends Disposable {
 	}
 
 	set enabled(enabled: boolean) {
-		this.findInput.setEnabled(enabled);
+		// We can't disable the input box because it is still used for
+		// navigating the list. Instead, we disable the list and the OK
+		// so that nothing can be selected.
+		// TODO: should this be what we do for all find inputs? Or maybe some _other_ API
+		// on findInput to change it to readonly?
+		this.findInput.inputBox.inputElement.toggleAttribute('readonly', !enabled);
+		// TODO: styles of the quick pick need to be moved to the CSS instead of being in line
+		// so things like this can be done in CSS
+		// this.findInput.inputBox.inputElement.classList.toggle('disabled', !enabled);
 	}
 
 	set toggles(toggles: Toggle[] | undefined) {
diff --git a/src/vs/base/parts/quickinput/browser/quickInputList.ts b/src/vs/base/parts/quickinput/browser/quickInputList.ts
index 278586d6f7fa59..6c0354e95f080a 100644
--- a/src/vs/base/parts/quickinput/browser/quickInputList.ts
+++ b/src/vs/base/parts/quickinput/browser/quickInputList.ts
@@ -6,6 +6,7 @@
 import * as dom from 'vs/base/browser/dom';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
+import { AriaRole } from 'vs/base/browser/ui/aria/aria';
 import { IconLabel, IIconLabelValueOptions } from 'vs/base/browser/ui/iconLabel/iconLabel';
 import { KeybindingLabel } from 'vs/base/browser/ui/keybindingLabel/keybindingLabel';
 import { IListRenderer, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
@@ -502,7 +503,7 @@ export class QuickInputList {
 				separator = previous;
 			}
 
-			result.push(new ListElement({
+			const element = new ListElement({
 				hasCheckbox,
 				index,
 				item: item.type !== 'separator' ? item : undefined,
@@ -519,11 +520,14 @@ export class QuickInputList {
 				separator,
 				fireButtonTriggered,
 				fireSeparatorButtonTriggered
-			}));
+			});
+
+			this.elementDisposables.push(element);
+			this.elementDisposables.push(element.onChecked(() => this.fireCheckedEvents()));
+
+			result.push(element);
 			return result;
 		}, [] as ListElement[]);
-		this.elementDisposables.push(...this.elements);
-		this.elementDisposables.push(...this.elements.map(element => element.onChecked(() => this.fireCheckedEvents())));
 
 		this.elementsToIndexes = this.elements.reduce((map, element, index) => {
 			map.set(element.item ?? element.separator!, index);
@@ -794,7 +798,7 @@ export class QuickInputList {
 	}
 }
 
-export function matchesContiguousIconAware(query: string, target: IParsedLabelWithIcons): IMatch[] | null {
+function matchesContiguousIconAware(query: string, target: IParsedLabelWithIcons): IMatch[] | null {
 
 	const { text, iconOffsets } = target;
 
@@ -862,7 +866,7 @@ class QuickInputAccessibilityProvider implements IListAccessibilityProvider<List
 			: element.saneAriaLabel;
 	}
 
-	getWidgetRole() {
+	getWidgetRole(): AriaRole {
 		return 'listbox';
 	}
 
diff --git a/src/vs/base/parts/quickinput/test/browser/quickinput.test.ts b/src/vs/base/parts/quickinput/test/browser/quickinput.test.ts
index f5c04572ec8fcb..545eb42c2df4cd 100644
--- a/src/vs/base/parts/quickinput/test/browser/quickinput.test.ts
+++ b/src/vs/base/parts/quickinput/test/browser/quickinput.test.ts
@@ -12,6 +12,7 @@ import { unthemedToggleStyles } from 'vs/base/browser/ui/toggle/toggle';
 import { raceTimeout } from 'vs/base/common/async';
 import { QuickInputController } from 'vs/base/parts/quickinput/browser/quickInput';
 import { IQuickPick, IQuickPickItem } from 'vs/base/parts/quickinput/common/quickInput';
+import { unthemedCountStyles } from 'vs/base/browser/ui/countBadge/countBadge';
 
 // Sets up an `onShow` listener to allow us to wait until the quick pick is shown (useful when triggering an `accept()` right after launching a quick pick)
 // kick this off before you launch the picker and then await the promise returned after you launch the picker.
@@ -56,7 +57,7 @@ suite('QuickInput', () => { // https://github.com/microsoft/vscode/issues/147543
 			) => new List<T>(user, container, delegate, renderers, options),
 			styles: {
 				button: unthemedButtonStyles,
-				countBadge: {},
+				countBadge: unthemedCountStyles,
 				inputBox: unthemedInboxStyles,
 				toggle: unthemedToggleStyles,
 				keybindingLabel: {},
diff --git a/src/vs/base/parts/storage/common/storage.ts b/src/vs/base/parts/storage/common/storage.ts
index 8e42b693a93990..b0ce014a0938f2 100644
--- a/src/vs/base/parts/storage/common/storage.ts
+++ b/src/vs/base/parts/storage/common/storage.ts
@@ -14,7 +14,11 @@ export enum StorageHint {
 	// does not exist on disk yet. This allows
 	// the storage library to improve startup
 	// time by not checking the storage for data.
-	STORAGE_DOES_NOT_EXIST
+	STORAGE_DOES_NOT_EXIST,
+
+	// A hint to the storage that the storage
+	// is backed by an in-memory storage.
+	STORAGE_IN_MEMORY
 }
 
 export interface IStorageOptions {
@@ -339,6 +343,10 @@ export class Storage extends Disposable implements IStorage {
 		return new Promise(resolve => this.whenFlushedCallbacks.push(resolve));
 	}
 
+	isInMemory(): boolean {
+		return this.options.hint === StorageHint.STORAGE_IN_MEMORY;
+	}
+
 	override dispose(): void {
 		this.flushDelayer.dispose();
 
diff --git a/src/vs/base/test/browser/markdownRenderer.test.ts b/src/vs/base/test/browser/markdownRenderer.test.ts
index f30fc44b962015..0286cd039d64a9 100644
--- a/src/vs/base/test/browser/markdownRenderer.test.ts
+++ b/src/vs/base/test/browser/markdownRenderer.test.ts
@@ -161,7 +161,7 @@ suite('MarkdownRenderer', () => {
 			mds.appendMarkdown(`[$(zap)-link](#link)`);
 
 			const result: HTMLElement = renderMarkdown(mds).element;
-			assert.strictEqual(result.innerHTML, `<p><a data-href="#link" href="" title="#link"><span class="codicon codicon-zap"></span>-link</a></p>`);
+			assert.strictEqual(result.innerHTML, `<p><a data-href="#link" title="#link"><span class="codicon codicon-zap"></span>-link</a></p>`);
 		});
 
 		test('render icon in table', () => {
@@ -181,7 +181,7 @@ suite('MarkdownRenderer', () => {
 </thead>
 <tbody><tr>
 <td><span class="codicon codicon-zap"></span></td>
-<td><a data-href="#link" href="" title="#link"><span class="codicon codicon-zap"></span>-link</a></td>
+<td><a data-href="#link" title="#link"><span class="codicon codicon-zap"></span>-link</a></td>
 </tr>
 </tbody></table>
 `);
@@ -248,7 +248,7 @@ suite('MarkdownRenderer', () => {
 		});
 
 		const result: HTMLElement = renderMarkdown(md).element;
-		assert.strictEqual(result.innerHTML, `<p><a data-href="command:doFoo" href="" title="command:doFoo">command1</a> <a data-href="command:doFoo" href="">command2</a></p>`);
+		assert.strictEqual(result.innerHTML, `<p><a data-href="command:doFoo" title="command:doFoo">command1</a> <a data-href="command:doFoo">command2</a></p>`);
 	});
 
 	suite('PlaintextMarkdownRender', () => {
diff --git a/src/vs/base/test/browser/ui/grid/gridview.test.ts b/src/vs/base/test/browser/ui/grid/gridview.test.ts
index ab86c4900e2eec..fbe6fd47b58169 100644
--- a/src/vs/base/test/browser/ui/grid/gridview.test.ts
+++ b/src/vs/base/test/browser/ui/grid/gridview.test.ts
@@ -5,7 +5,7 @@
 
 import * as assert from 'assert';
 import { $ } from 'vs/base/browser/dom';
-import { GridView, IView, Sizing } from 'vs/base/browser/ui/grid/gridview';
+import { GridView, IView, Orientation, Sizing } from 'vs/base/browser/ui/grid/gridview';
 import { nodesToArrays, TestView } from './util';
 
 suite('Gridview', function () {
@@ -222,4 +222,22 @@ suite('Gridview', function () {
 		assert.deepStrictEqual(view2.size, [400, 300]);
 		assert.deepStrictEqual(view3.size, [400, 300]);
 	});
+
+	test('flipping orientation should preserve absolute offsets', function () {
+		const view1 = new TestView(50, Number.POSITIVE_INFINITY, 50, Number.POSITIVE_INFINITY);
+		gridview.addView(view1, 200, [0]);
+
+		const view2 = new TestView(50, Number.POSITIVE_INFINITY, 50, Number.POSITIVE_INFINITY);
+		gridview.addView(view2, 200, [1]);
+
+		gridview.layout(800, 600, 100, 200);
+
+		assert.deepStrictEqual([view1.top, view1.left], [100, 200]);
+		assert.deepStrictEqual([view2.top, view2.left], [100 + 300, 200]);
+
+		gridview.orientation = Orientation.HORIZONTAL;
+
+		assert.deepStrictEqual([view1.top, view1.left], [100, 200]);
+		assert.deepStrictEqual([view2.top, view2.left], [100, 200 + 400]);
+	});
 });
diff --git a/src/vs/base/test/browser/ui/grid/util.ts b/src/vs/base/test/browser/ui/grid/util.ts
index 3a47b51eedadeb..9ebe81b3c569fb 100644
--- a/src/vs/base/test/browser/ui/grid/util.ts
+++ b/src/vs/base/test/browser/ui/grid/util.ts
@@ -37,10 +37,16 @@ export class TestView implements IView {
 	private _height = 0;
 	get height(): number { return this._height; }
 
+	private _top = 0;
+	get top(): number { return this._top; }
+
+	private _left = 0;
+	get left(): number { return this._left; }
+
 	get size(): [number, number] { return [this.width, this.height]; }
 
-	private readonly _onDidLayout = new Emitter<{ width: number; height: number }>();
-	readonly onDidLayout: Event<{ width: number; height: number }> = this._onDidLayout.event;
+	private readonly _onDidLayout = new Emitter<{ width: number; height: number; top: number; left: number }>();
+	readonly onDidLayout: Event<{ width: number; height: number; top: number; left: number }> = this._onDidLayout.event;
 
 	private readonly _onDidFocus = new Emitter<void>();
 	readonly onDidFocus: Event<void> = this._onDidFocus.event;
@@ -55,10 +61,12 @@ export class TestView implements IView {
 		assert(_minimumHeight <= _maximumHeight, 'gridview view minimum height must be <= maximum height');
 	}
 
-	layout(width: number, height: number): void {
+	layout(width: number, height: number, top: number, left: number): void {
 		this._width = width;
 		this._height = height;
-		this._onDidLayout.fire({ width, height });
+		this._top = top;
+		this._left = left;
+		this._onDidLayout.fire({ width, height, top, left });
 	}
 
 	focus(): void {
diff --git a/src/vs/base/test/common/filters.test.ts b/src/vs/base/test/common/filters.test.ts
index 29754cc4eed204..c80a6f84132c58 100644
--- a/src/vs/base/test/common/filters.test.ts
+++ b/src/vs/base/test/common/filters.test.ts
@@ -562,6 +562,11 @@ suite('Filters', () => {
 		assertMatches('.', 'log', 'log', anyScore);
 	});
 
+	test('anyScore should not require a strong first match', function () {
+		assertMatches('bar', 'foobAr', 'foo^b^A^r', anyScore);
+		assertMatches('bar', 'foobar', 'foo^b^a^r', anyScore);
+	});
+
 	test('configurable full match boost', function () {
 		const prefix = 'create';
 		const a = 'createModelServices';
diff --git a/src/vs/base/test/common/labels.test.ts b/src/vs/base/test/common/labels.test.ts
index 82bb2d98a75baf..36eec1391d6e01 100644
--- a/src/vs/base/test/common/labels.test.ts
+++ b/src/vs/base/test/common/labels.test.ts
@@ -137,6 +137,10 @@ suite('Labels', () => {
 		assert.strictEqual(labels.template(t, { dirty: '', activeEditorShort: '', rootName: 'monaco', appName: 'Visual Studio Code', separator: { label: ' - ' } }), 'monaco - Visual Studio Code');
 		assert.strictEqual(labels.template(t, { dirty: '', activeEditorShort: 'somefile.txt', rootName: 'monaco', appName: 'Visual Studio Code', separator: { label: ' - ' } }), 'somefile.txt - monaco - Visual Studio Code');
 		assert.strictEqual(labels.template(t, { dirty: '* ', activeEditorShort: 'somefile.txt', rootName: 'monaco', appName: 'Visual Studio Code', separator: { label: ' - ' } }), '* somefile.txt - monaco - Visual Studio Code');
+
+		// real world example (other)
+		t = '${dirty}${activeEditorShort}${separator}${rootNameShort}${separator}${appName}';
+		assert.strictEqual(labels.template(t, { dirty: '', activeEditorShort: '', rootName: 'monaco (Workspace)', rootNameShort: 'monaco', appName: 'Visual Studio Code', separator: { label: ' - ' } }), 'monaco - Visual Studio Code');
 	});
 
 	test('mnemonicButtonLabel', () => {
diff --git a/src/vs/base/test/common/path.test.ts b/src/vs/base/test/common/path.test.ts
index a896579da958e5..4deaf085ffc937 100644
--- a/src/vs/base/test/common/path.test.ts
+++ b/src/vs/base/test/common/path.test.ts
@@ -360,7 +360,7 @@ suite('Paths (Node Implementation)', () => {
 		assert.strictEqual(path.extname('far.boo/boo'), '');
 	});
 
-	(isWeb && isWindows ? test.skip : test)('resolve', () => { // TODO@sbatten fails on windows & browser only
+	test('resolve', () => {
 		const failures = [] as string[];
 		const slashRE = /\//g;
 		const backslashRE = /\\/g;
@@ -372,7 +372,6 @@ suite('Paths (Node Implementation)', () => {
 			[['c:/ignore', 'd:\\a/b\\c/d', '\\e.exe'], 'd:\\e.exe'],
 			[['c:/ignore', 'c:/some/file'], 'c:\\some\\file'],
 			[['d:/ignore', 'd:some/dir//'], 'd:\\ignore\\some\\dir'],
-			[['.'], process.cwd()],
 			[['//server/share', '..', 'relative\\'], '\\\\server\\share\\relative'],
 			[['c:/', '//'], 'c:\\'],
 			[['c:/', '//dir'], 'c:\\dir'],
@@ -387,12 +386,16 @@ suite('Paths (Node Implementation)', () => {
 			// arguments                    result
 			[[['/var/lib', '../', 'file/'], '/var/file'],
 			[['/var/lib', '/../', 'file/'], '/file'],
-			[['a/b/c/', '../../..'], process.cwd()],
-			[['.'], process.cwd()],
 			[['/some/dir', '.', '/absolute/'], '/absolute'],
 			[['/foo/tmp.3/', '../tmp.3/cycles/root.js'], '/foo/tmp.3/cycles/root.js']
 			]
+			],
+			[(isWeb ? path.posix.resolve : path.resolve),
+			// arguments						result
+			[[['.'], process.cwd()],
+			[['a/b/c', '../../..'], process.cwd()]
 			]
+			],
 		];
 		resolveTests.forEach((test) => {
 			const resolve = test[0];
diff --git a/src/vs/base/test/common/uri.test.ts b/src/vs/base/test/common/uri.test.ts
index 3aedee9c4f1857..16a776ee646cd3 100644
--- a/src/vs/base/test/common/uri.test.ts
+++ b/src/vs/base/test/common/uri.test.ts
@@ -469,7 +469,7 @@ suite('URI', () => {
 		}), true);
 	});
 
-	test('Unable to open \'%A0.txt\': URI malformed #76506', function () {
+	test('Unable to open \'%A0.txt\': URI malformed #76506, part 2', function () {
 		assert.strictEqual(URI.parse('file://some/%.txt').toString(), 'file://some/%25.txt');
 		assert.strictEqual(URI.parse('file://some/%A0.txt').toString(), 'file://some/%25A0.txt');
 	});
@@ -595,4 +595,11 @@ suite('URI', () => {
 		//https://github.com/microsoft/vscode/issues/93831
 		assertJoined('file:///c:/foo/bar', './other/foo.img', 'file:///c:/foo/bar/other/foo.img', false);
 	});
+
+	test('vscode-uri: URI.toString() wrongly encode IPv6 literals #154048', function () {
+		assert.strictEqual(URI.parse('http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html').toString(), 'http://[fedc:ba98:7654:3210:fedc:ba98:7654:3210]:80/index.html');
+
+		assert.strictEqual(URI.parse('http://user@[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html').toString(), 'http://user@[fedc:ba98:7654:3210:fedc:ba98:7654:3210]:80/index.html');
+		assert.strictEqual(URI.parse('http://us[er@[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html').toString(), 'http://us%5Ber@[fedc:ba98:7654:3210:fedc:ba98:7654:3210]:80/index.html');
+	});
 });
diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index be68de2916f746..bf95d8ced696e0 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -20,7 +20,6 @@ import { IProcessEnvironment, isLinux, isLinuxSnap, isMacintosh, isWindows, OS }
 import { assertType } from 'vs/base/common/types';
 import { URI } from 'vs/base/common/uri';
 import { generateUuid } from 'vs/base/common/uuid';
-import { getMachineId } from 'vs/base/node/id';
 import { registerContextMenuListener } from 'vs/base/parts/contextmenu/electron-main/contextmenu';
 import { getDelayedChannel, ProxyChannel, StaticRouter } from 'vs/base/parts/ipc/common/ipc';
 import { Server as ElectronIPCServer } from 'vs/base/parts/ipc/electron-main/ipc.electron';
@@ -71,7 +70,7 @@ import { IStateMainService } from 'vs/platform/state/electron-main/state';
 import { StorageDatabaseChannel } from 'vs/platform/storage/electron-main/storageIpc';
 import { ApplicationStorageMainService, IApplicationStorageMainService, IStorageMainService, StorageMainService } from 'vs/platform/storage/electron-main/storageMainService';
 import { resolveCommonProperties } from 'vs/platform/telemetry/common/commonProperties';
-import { ITelemetryService, machineIdKey, TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
+import { ITelemetryService, TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
 import { TelemetryAppenderClient } from 'vs/platform/telemetry/common/telemetryIpc';
 import { ITelemetryServiceConfig, TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
 import { getPiiPathsFromEnvironment, getTelemetryLevel, isInternalTelemetry, NullTelemetryService, supportsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
@@ -106,9 +105,10 @@ import { IRequestService } from 'vs/platform/request/common/request';
 import { ExtensionsProfileScannerService, IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
 import { IExtensionsScannerService } from 'vs/platform/extensionManagement/common/extensionsScannerService';
 import { ExtensionsScannerService } from 'vs/platform/extensionManagement/node/extensionsScannerService';
-import { UserDataTransientProfilesHandler } from 'vs/platform/userDataProfile/electron-main/userDataTransientProfilesHandler';
+import { UserDataProfilesHandler } from 'vs/platform/userDataProfile/electron-main/userDataProfilesHandler';
 import { ProfileStorageChangesListenerChannel } from 'vs/platform/userDataProfile/electron-main/userDataProfileStorageIpc';
 import { Promises, RunOnceScheduler, runWhenIdle } from 'vs/base/common/async';
+import { resolveMachineId } from 'vs/platform/telemetry/electron-main/telemetryUtils';
 
 /**
  * The main VS Code application. There will only ever be one instance,
@@ -524,7 +524,7 @@ export class CodeApplication extends Disposable {
 
 		// Resolve unique machine ID
 		this.logService.trace('Resolving machine identifier...');
-		const machineId = await this.resolveMachineId();
+		const machineId = await resolveMachineId(this.stateMainService);
 		this.logService.trace(`Resolved machine identifier: ${machineId}`);
 
 		// Shared process
@@ -558,21 +558,7 @@ export class CodeApplication extends Disposable {
 		this._register(instantiationService.createInstance(ProxyAuthHandler));
 
 		// Transient profiles handler
-		this._register(instantiationService.createInstance(UserDataTransientProfilesHandler));
-	}
-
-	private async resolveMachineId(): Promise<string> {
-
-		// We cache the machineId for faster lookups on startup
-		// and resolve it only once initially if not cached or we need to replace the macOS iBridge device
-		let machineId = this.stateMainService.getItem<string>(machineIdKey);
-		if (!machineId || (isMacintosh && machineId === '6c9d2bc8f91b89624add29c0abeae7fb42bf539fa1cdb2e3e57cd668fa9bcead')) {
-			machineId = await getMachineId();
-
-			this.stateMainService.setItem(machineIdKey, machineId);
-		}
-
-		return machineId;
+		this._register(instantiationService.createInstance(UserDataProfilesHandler));
 	}
 
 	private setupSharedProcess(machineId: string): { sharedProcess: SharedProcess; sharedProcessReady: Promise<MessagePortClient>; sharedProcessClient: Promise<MessagePortClient> } {
@@ -1217,7 +1203,7 @@ export class CodeApplication extends Disposable {
 
 	private async resolveShellEnvironment(args: NativeParsedArgs, env: IProcessEnvironment, notifyOnError: boolean): Promise<typeof process.env> {
 		try {
-			return await getResolvedShellEnv(this.logService, args, env);
+			return await getResolvedShellEnv(this.configurationService, this.logService, args, env);
 		} catch (error) {
 			const errorMessage = toErrorMessage(error);
 			if (notifyOnError) {
diff --git a/src/vs/code/electron-sandbox/issue/issueReporterPage.ts b/src/vs/code/electron-sandbox/issue/issueReporterPage.ts
index 6467d66bd36661..f8988669091bbb 100644
--- a/src/vs/code/electron-sandbox/issue/issueReporterPage.ts
+++ b/src/vs/code/electron-sandbox/issue/issueReporterPage.ts
@@ -43,7 +43,7 @@ export default (): string => `
 			</select>
 			<div id="issue-source-empty-error" class="validation-error hidden" role="alert">${escape(localize('issueSourceEmptyValidation', "An issue source is required."))}</div>
 			<div id="problem-source-help-text" class="instructions hidden">${escape(localize('disableExtensionsLabelText', "Try to reproduce the problem after {0}. If the problem only reproduces when extensions are active, it is likely an issue with an extension."))
-		.replace('{0}', `<span tabIndex=0 role="button" id="disableExtensions" class="workbenchCommand">${escape(localize('disableExtensions', "disabling all extensions and reloading the window"))}</span>`)}
+		.replace('{0}', () => `<span tabIndex=0 role="button" id="disableExtensions" class="workbenchCommand">${escape(localize('disableExtensions', "disabling all extensions and reloading the window"))}</span>`)}
 			</div>
 
 			<div id="extension-selection">
@@ -52,7 +52,7 @@ export default (): string => `
 					<!-- To be dynamically filled -->
 				</select>
 				<div id="extension-selection-validation-error" class="validation-error hidden" role="alert">${escape(localize('extensionWithNonstandardBugsUrl', "The issue reporter is unable to create issues for this extension. Please visit {0} to report an issue."))
-		.replace('{0}', `<span tabIndex=0 role="button" id="extensionBugsLink" class="workbenchCommand"><!-- To be dynamically filled --></span>`)}</div>
+		.replace('{0}', () => `<span tabIndex=0 role="button" id="extensionBugsLink" class="workbenchCommand"><!-- To be dynamically filled --></span>`)}</div>
 				<div id="extension-selection-validation-error-no-url" class="validation-error hidden" role="alert">
 					${escape(localize('extensionWithNoBugsUrl', "The issue reporter is unable to create issues for this extension, as it does not specify a URL for reporting issues. Please check the marketplace page of this extension to see if other instructions are available."))}
 				</div>
diff --git a/src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts b/src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts
index f71559a35dd598..3931508c7a2be5 100644
--- a/src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts
+++ b/src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts
@@ -23,6 +23,8 @@ import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
 import { NativeHostService } from 'vs/platform/native/electron-sandbox/nativeHostService';
 import { getIconsStyleSheet } from 'vs/platform/theme/browser/iconsStyleSheet';
 import { applyZoom, zoomIn, zoomOut } from 'vs/platform/window/electron-sandbox/window';
+import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
+import { KeyCode } from 'vs/base/common/keyCodes';
 
 const DEBUG_FLAGS_PATTERN = /\s--(inspect|debug)(-brk|port)?=(\d+)?/;
 const DEBUG_PORT_PATTERN = /\s--(inspect|debug)-port=(\d+)/;
@@ -338,6 +340,13 @@ class ProcessExplorer {
 
 		this.tree.setInput({ processes: { processRoots } });
 		this.tree.layout(window.innerHeight, window.innerWidth);
+		this.tree.onKeyDown(e => {
+			const event = new StandardKeyboardEvent(e);
+			if (event.keyCode === KeyCode.KeyE && event.altKey) {
+				const selectionPids = this.getSelectedPids();
+				void Promise.all(selectionPids.map((pid) => this.nativeHostService.killProcess(pid, 'SIGTERM'))).then(() => this.tree?.refresh());
+			}
+		});
 		this.tree.onContextMenu(e => {
 			if (isProcessItem(e.element)) {
 				this.showContextMenu(e.element, true);
@@ -500,12 +509,7 @@ class ProcessExplorer {
 			label: localize('copy', "Copy"),
 			click: () => {
 				// Collect the selected pids
-				const selectionPids = this.tree?.getSelection()?.map(e => {
-					if (!e || !('pid' in e)) {
-						return undefined;
-					}
-					return e.pid;
-				}).filter(e => !!e) as number[];
+				const selectionPids = this.getSelectedPids();
 				// If the selection does not contain the right clicked item, copy the right clicked
 				// item only.
 				if (!selectionPids?.includes(pid)) {
@@ -561,6 +565,15 @@ class ProcessExplorer {
 			}
 		}, 200);
 	}
+
+	private getSelectedPids() {
+		return this.tree?.getSelection()?.map(e => {
+			if (!e || !('pid' in e)) {
+				return undefined;
+			}
+			return e.pid;
+		}).filter(e => !!e) as number[];
+	}
 }
 
 function createCodiconStyleSheet() {
diff --git a/src/vs/code/electron-sandbox/workbench/workbench.js b/src/vs/code/electron-sandbox/workbench/workbench.js
index 3d956e857ed362..580a6aeb3f40c7 100644
--- a/src/vs/code/electron-sandbox/workbench/workbench.js
+++ b/src/vs/code/electron-sandbox/workbench/workbench.js
@@ -156,6 +156,11 @@
 		document.head.appendChild(style);
 		style.textContent = `body { background-color: ${shellBackground}; color: ${shellForeground}; margin: 0; padding: 0; }`;
 
+		// set zoom level as soon as possible
+		if (typeof data?.zoomLevel === 'number' && typeof globalThis.vscode?.webFrame?.setZoomLevel === 'function') {
+			globalThis.vscode.webFrame.setZoomLevel(data.zoomLevel);
+		}
+
 		// restore parts if possible (we might not always store layout info)
 		if (data?.layoutInfo) {
 			const { layoutInfo, colorInfo } = data;
diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts
index bcefa8782e352d..b2ef0aa70fa04c 100644
--- a/src/vs/code/node/cli.ts
+++ b/src/vs/code/node/cli.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ChildProcess, spawn, SpawnOptions } from 'child_process';
+import { ChildProcess, ChildProcessWithoutNullStreams, spawn, SpawnOptions } from 'child_process';
 import { chmodSync, existsSync, readFileSync, statSync, truncateSync, unlinkSync } from 'fs';
 import { homedir, release, tmpdir } from 'os';
 import type { ProfilingSession, Target } from 'v8-inspect-profiler';
@@ -55,7 +55,7 @@ export async function main(argv: string[]): Promise<any> {
 			return;
 		}
 		return new Promise((resolve, reject) => {
-			let tunnelProcess;
+			let tunnelProcess: ChildProcessWithoutNullStreams;
 			if (process.env['VSCODE_DEV']) {
 				tunnelProcess = spawn('cargo', ['run', '--', 'tunnel', ...argv.slice(5)], { cwd: join(getAppRoot(), 'cli') });
 			} else {
@@ -67,12 +67,9 @@ export async function main(argv: string[]): Promise<any> {
 				const tunnelArgs = argv.slice(3);
 				tunnelProcess = spawn(tunnelCommand, ['tunnel', ...tunnelArgs]);
 			}
-			tunnelProcess.stdout.on('data', data => {
-				console.log(data.toString());
-			});
-			tunnelProcess.stderr.on('data', data => {
-				console.error(data.toString());
-			});
+
+			tunnelProcess.stdout.pipe(process.stdout);
+			tunnelProcess.stderr.pipe(process.stderr);
 			tunnelProcess.on('exit', resolve);
 			tunnelProcess.on('error', reject);
 		});
diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts
index 9acf6927dd1dc1..ca4a114c5ed1f0 100644
--- a/src/vs/code/node/cliProcessMain.ts
+++ b/src/vs/code/node/cliProcessMain.ts
@@ -51,7 +51,7 @@ import { RequestService } from 'vs/platform/request/node/requestService';
 import { IStateService } from 'vs/platform/state/node/state';
 import { StateService } from 'vs/platform/state/node/stateService';
 import { resolveCommonProperties } from 'vs/platform/telemetry/common/commonProperties';
-import { ITelemetryService, machineIdKey } from 'vs/platform/telemetry/common/telemetry';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { ITelemetryServiceConfig, TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
 import { supportsTelemetry, NullTelemetryService, getPiiPathsFromEnvironment, isInternalTelemetry, ITelemetryAppender } from 'vs/platform/telemetry/common/telemetryUtils';
 import { OneDataSystemAppender } from 'vs/platform/telemetry/node/1dsAppender';
@@ -60,6 +60,7 @@ import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity'
 import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
 import { IUserDataProfilesService, PROFILES_ENABLEMENT_CONFIG } from 'vs/platform/userDataProfile/common/userDataProfile';
 import { UserDataProfilesService } from 'vs/platform/userDataProfile/node/userDataProfile';
+import { resolveMachineId } from 'vs/platform/telemetry/node/telemetryUtils';
 
 class CliMain extends Disposable {
 
@@ -205,8 +206,7 @@ class CliMain extends Disposable {
 				commonProperties: (async () => {
 					let machineId: string | undefined = undefined;
 					try {
-						const storageContents = await Promises.readFile(environmentService.stateResource.fsPath);
-						machineId = JSON.parse(storageContents.toString())[machineIdKey];
+						machineId = await resolveMachineId(stateService);
 					} catch (error) {
 						if (error.code !== 'ENOENT') {
 							logService.error(error);
diff --git a/src/vs/editor/browser/config/migrateOptions.ts b/src/vs/editor/browser/config/migrateOptions.ts
index 84abd167ef6a38..362b68ce840f33 100644
--- a/src/vs/editor/browser/config/migrateOptions.ts
+++ b/src/vs/editor/browser/config/migrateOptions.ts
@@ -89,6 +89,8 @@ registerSimpleEditorSettingMigration('hover', [[true, { enabled: true }], [false
 registerSimpleEditorSettingMigration('parameterHints', [[true, { enabled: true }], [false, { enabled: false }]]);
 registerSimpleEditorSettingMigration('autoIndent', [[false, 'advanced'], [true, 'full']]);
 registerSimpleEditorSettingMigration('matchBrackets', [[true, 'always'], [false, 'never']]);
+registerSimpleEditorSettingMigration('renderFinalNewline', [[true, 'on'], [false, 'off']]);
+registerSimpleEditorSettingMigration('cursorSmoothCaretAnimation', [[true, 'on'], [false, 'off']]);
 
 registerEditorSettingMigration('autoClosingBrackets', (value, read, write) => {
 	if (value === false) {
diff --git a/src/vs/editor/browser/controller/mouseHandler.ts b/src/vs/editor/browser/controller/mouseHandler.ts
index 86704d8311c1df..5bfec5deba48c6 100644
--- a/src/vs/editor/browser/controller/mouseHandler.ts
+++ b/src/vs/editor/browser/controller/mouseHandler.ts
@@ -20,6 +20,7 @@ import * as viewEvents from 'vs/editor/common/viewEvents';
 import { ViewEventHandler } from 'vs/editor/common/viewEventHandler';
 import { EditorOption } from 'vs/editor/common/config/editorOptions';
 import { NavigationCommandRevealType } from 'vs/editor/browser/coreCommands';
+import { MouseWheelClassifier } from 'vs/base/browser/ui/scrollbar/scrollableElement';
 
 export interface IPointerHandlerHelper {
 	viewDomNode: HTMLElement;
@@ -127,6 +128,19 @@ export class MouseHandler extends ViewEventHandler {
 			this._mouseDownOperation.onPointerUp();
 		}));
 		this._register(mouseEvents.onMouseDown(this.viewHelper.viewDomNode, (e) => this._onMouseDown(e, capturePointerId)));
+		this._setupMouseWheelZoomListener();
+
+		this._context.addEventHandler(this);
+	}
+
+	private _setupMouseWheelZoomListener(): void {
+
+		const classifier = MouseWheelClassifier.INSTANCE;
+
+		let prevMouseWheelTime = 0;
+		let gestureStartZoomLevel = EditorZoom.getZoomLevel();
+		let gestureHasZoomModifiers = false;
+		let gestureAccumulatedDelta = 0;
 
 		const onMouseWheel = (browserEvent: IMouseWheelEvent) => {
 			this.viewController.emitMouseWheel(browserEvent);
@@ -134,25 +148,50 @@ export class MouseHandler extends ViewEventHandler {
 			if (!this._context.configuration.options.get(EditorOption.mouseWheelZoom)) {
 				return;
 			}
+
 			const e = new StandardWheelEvent(browserEvent);
-			const doMouseWheelZoom = (
+			classifier.acceptStandardWheelEvent(e);
+
+			if (classifier.isPhysicalMouseWheel()) {
+				if (hasMouseWheelZoomModifiers(browserEvent)) {
+					const zoomLevel: number = EditorZoom.getZoomLevel();
+					const delta = e.deltaY > 0 ? 1 : -1;
+					EditorZoom.setZoomLevel(zoomLevel + delta);
+					e.preventDefault();
+					e.stopPropagation();
+				}
+			} else {
+				// we consider mousewheel events that occur within 50ms of each other to be part of the same gesture
+				// we don't want to consider mouse wheel events where ctrl/cmd is pressed during the inertia phase
+				// we also want to accumulate deltaY values from the same gesture and use that to set the zoom level
+				if (Date.now() - prevMouseWheelTime > 50) {
+					// reset if more than 50ms have passed
+					gestureStartZoomLevel = EditorZoom.getZoomLevel();
+					gestureHasZoomModifiers = hasMouseWheelZoomModifiers(browserEvent);
+					gestureAccumulatedDelta = 0;
+				}
+
+				prevMouseWheelTime = Date.now();
+				gestureAccumulatedDelta += e.deltaY;
+
+				if (gestureHasZoomModifiers) {
+					EditorZoom.setZoomLevel(gestureStartZoomLevel + gestureAccumulatedDelta / 5);
+					e.preventDefault();
+					e.stopPropagation();
+				}
+			}
+		};
+		this._register(dom.addDisposableListener(this.viewHelper.viewDomNode, dom.EventType.MOUSE_WHEEL, onMouseWheel, { capture: true, passive: false }));
+
+		function hasMouseWheelZoomModifiers(browserEvent: IMouseWheelEvent): boolean {
+			return (
 				platform.isMacintosh
 					// on macOS we support cmd + two fingers scroll (`metaKey` set)
 					// and also the two fingers pinch gesture (`ctrKey` set)
 					? ((browserEvent.metaKey || browserEvent.ctrlKey) && !browserEvent.shiftKey && !browserEvent.altKey)
 					: (browserEvent.ctrlKey && !browserEvent.metaKey && !browserEvent.shiftKey && !browserEvent.altKey)
 			);
-			if (doMouseWheelZoom) {
-				const zoomLevel: number = EditorZoom.getZoomLevel();
-				const delta = e.deltaY > 0 ? 1 : -1;
-				EditorZoom.setZoomLevel(zoomLevel + delta);
-				e.preventDefault();
-				e.stopPropagation();
-			}
-		};
-		this._register(dom.addDisposableListener(this.viewHelper.viewDomNode, dom.EventType.MOUSE_WHEEL, onMouseWheel, { capture: true, passive: false }));
-
-		this._context.addEventHandler(this);
+		}
 	}
 
 	public override dispose(): void {
diff --git a/src/vs/editor/browser/controller/textAreaHandler.ts b/src/vs/editor/browser/controller/textAreaHandler.ts
index 36f75eca95bb85..a135a42e90fc53 100644
--- a/src/vs/editor/browser/controller/textAreaHandler.ts
+++ b/src/vs/editor/browser/controller/textAreaHandler.ts
@@ -34,7 +34,6 @@ import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from 'vs/base/browser/ui/mouseCursor
 import { TokenizationRegistry } from 'vs/editor/common/languages';
 import { ColorId, ITokenPresentation } from 'vs/editor/common/encodedTokenAttributes';
 import { Color } from 'vs/base/common/color';
-import { TimeoutTimer } from 'vs/base/common/async';
 import { IME } from 'vs/base/common/ime';
 
 export interface IVisibleRangeProvider {
@@ -114,7 +113,6 @@ export class TextAreaHandler extends ViewPart {
 
 	private _accessibilitySupport!: AccessibilitySupport;
 	private _accessibilityPageSize!: number;
-	private _accessibilityWriteTimer: TimeoutTimer;
 	private _textAreaWrapping!: boolean;
 	private _textAreaWidth!: number;
 	private _contentLeft: number;
@@ -154,7 +152,6 @@ export class TextAreaHandler extends ViewPart {
 		const layoutInfo = options.get(EditorOption.layoutInfo);
 
 		this._setAccessibilityOptions(options);
-		this._accessibilityWriteTimer = this._register(new TimeoutTimer());
 		this._contentLeft = layoutInfo.contentLeft;
 		this._contentWidth = layoutInfo.contentWidth;
 		this._contentHeight = layoutInfo.height;
@@ -610,11 +607,9 @@ export class TextAreaHandler extends ViewPart {
 	public override onCursorStateChanged(e: viewEvents.ViewCursorStateChangedEvent): boolean {
 		this._selections = e.selections.slice(0);
 		this._modelSelections = e.modelSelections.slice(0);
-		if (this._accessibilitySupport === AccessibilitySupport.Disabled) {
-			this._accessibilityWriteTimer.cancelAndSet(() => this._textAreaInput.writeScreenReaderContent('selection changed'), 0);
-		} else {
-			this._textAreaInput.writeScreenReaderContent('selection changed');
-		}
+		// We must update the <textarea> synchronously, otherwise long press IME on macos breaks.
+		// See https://github.com/microsoft/vscode/issues/165821
+		this._textAreaInput.writeScreenReaderContent('selection changed');
 		return true;
 	}
 	public override onDecorationsChanged(e: viewEvents.ViewDecorationsChangedEvent): boolean {
diff --git a/src/vs/editor/browser/controller/textAreaInput.ts b/src/vs/editor/browser/controller/textAreaInput.ts
index 0a45967147f29a..69c0dfd4ad763b 100644
--- a/src/vs/editor/browser/controller/textAreaInput.ts
+++ b/src/vs/editor/browser/controller/textAreaInput.ts
@@ -362,9 +362,15 @@ export class TextAreaInput extends Disposable {
 			const newState = TextAreaState.readFromTextArea(this._textArea, this._textAreaState);
 			const typeInput = TextAreaState.deduceInput(this._textAreaState, newState, /*couldBeEmojiInput*/this._OS === OperatingSystem.Macintosh);
 
-			if (typeInput.replacePrevCharCnt === 0 && typeInput.text.length === 1 && strings.isHighSurrogate(typeInput.text.charCodeAt(0))) {
-				// Ignore invalid input but keep it around for next time
-				return;
+			if (typeInput.replacePrevCharCnt === 0 && typeInput.text.length === 1) {
+				// one character was typed
+				if (
+					strings.isHighSurrogate(typeInput.text.charCodeAt(0))
+					|| typeInput.text.charCodeAt(0) === 0x7f /* Delete */
+				) {
+					// Ignore invalid input but keep it around for next time
+					return;
+				}
 			}
 
 			this._textAreaState = newState;
diff --git a/src/vs/editor/browser/coreCommands.ts b/src/vs/editor/browser/coreCommands.ts
index f2e3ee6f0eda13..7a3452d8461643 100644
--- a/src/vs/editor/browser/coreCommands.ts
+++ b/src/vs/editor/browser/coreCommands.ts
@@ -1369,7 +1369,8 @@ export namespace CoreNavigationCommands {
 
 			if (args.unit === EditorScroll_.Unit.Line) {
 				// scrolling by model lines
-				const visibleViewRange = viewModel.getCompletelyVisibleViewRange();
+				const futureViewport = viewModel.viewLayout.getFutureViewport();
+				const visibleViewRange = viewModel.getCompletelyVisibleViewRangeAtScrollTop(futureViewport.top);
 				const visibleModelRange = viewModel.coordinatesConverter.convertViewRangeToModelRange(visibleViewRange);
 
 				let desiredTopModelLineNumber: number;
diff --git a/src/vs/editor/browser/editorExtensions.ts b/src/vs/editor/browser/editorExtensions.ts
index 19bba6b8b47a43..8cc5c72d1669db 100644
--- a/src/vs/editor/browser/editorExtensions.ts
+++ b/src/vs/editor/browser/editorExtensions.ts
@@ -452,7 +452,7 @@ export abstract class EditorAction2 extends Action2 {
 		return editor.invokeWithinContext((editorAccessor) => {
 			const kbService = editorAccessor.get(IContextKeyService);
 			if (kbService.contextMatchesRules(withNullAsUndefined(this.desc.precondition))) {
-				return this.runEditorCommand(editorAccessor, editor!, args);
+				return this.runEditorCommand(editorAccessor, editor!, ...args);
 			}
 		});
 	}
@@ -515,7 +515,7 @@ export function registerInstantiatedEditorAction(editorAction: EditorAction): vo
 	EditorContributionRegistry.INSTANCE.registerEditorAction(editorAction);
 }
 
-export function registerEditorContribution<Services extends BrandedService[]>(id: string, ctor: { new(editor: ICodeEditor, ...services: Services): IEditorContribution }, instantiation = EditorContributionInstantiation.Eager): void {
+export function registerEditorContribution<Services extends BrandedService[]>(id: string, ctor: { new(editor: ICodeEditor, ...services: Services): IEditorContribution }, instantiation: EditorContributionInstantiation): void {
 	EditorContributionRegistry.INSTANCE.registerEditorContribution(id, ctor, instantiation);
 }
 
@@ -567,7 +567,7 @@ class EditorContributionRegistry {
 		this.editorCommands = Object.create(null);
 	}
 
-	public registerEditorContribution<Services extends BrandedService[]>(id: string, ctor: { new(editor: ICodeEditor, ...services: Services): IEditorContribution }, instantiation = EditorContributionInstantiation.Eager): void {
+	public registerEditorContribution<Services extends BrandedService[]>(id: string, ctor: { new(editor: ICodeEditor, ...services: Services): IEditorContribution }, instantiation: EditorContributionInstantiation): void {
 		this.editorContributions.push({ id, ctor: ctor as IEditorContributionCtor, instantiation });
 	}
 
diff --git a/src/vs/editor/browser/view.ts b/src/vs/editor/browser/view.ts
index 85b95fbfe12190..f912513d25f97b 100644
--- a/src/vs/editor/browser/view.ts
+++ b/src/vs/editor/browser/view.ts
@@ -50,6 +50,8 @@ import { EditorOption } from 'vs/editor/common/config/editorOptions';
 import { PointerHandlerLastRenderData } from 'vs/editor/browser/controller/mouseTarget';
 import { BlockDecorations } from 'vs/editor/browser/viewParts/blockDecorations/blockDecorations';
 import { inputLatency } from 'vs/base/browser/performance';
+import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
+import { WhitespaceOverlay } from 'vs/editor/browser/viewParts/whitespace/whitespace';
 
 
 export interface IContentWidgetData {
@@ -153,6 +155,7 @@ export class View extends ViewEventHandler {
 		contentViewOverlays.addDynamicOverlay(new SelectionsOverlay(this._context));
 		contentViewOverlays.addDynamicOverlay(new IndentGuidesOverlay(this._context));
 		contentViewOverlays.addDynamicOverlay(new DecorationsOverlay(this._context));
+		contentViewOverlays.addDynamicOverlay(new WhitespaceOverlay(this._context));
 
 		const marginViewOverlays = new MarginViewOverlays(this._context);
 		this._viewParts.push(marginViewOverlays);
@@ -426,6 +429,10 @@ export class View extends ViewEventHandler {
 		this._scrollbar.delegateVerticalScrollbarPointerDown(browserEvent);
 	}
 
+	public delegateScrollFromMouseWheelEvent(browserEvent: IMouseWheelEvent) {
+		this._scrollbar.delegateScrollFromMouseWheelEvent(browserEvent);
+	}
+
 	public restoreState(scrollPosition: { scrollLeft: number; scrollTop: number }): void {
 		this._context.viewModel.viewLayout.setScrollPosition({
 			scrollTop: scrollPosition.scrollTop,
diff --git a/src/vs/editor/browser/view/viewOverlays.ts b/src/vs/editor/browser/view/viewOverlays.ts
index 9c6ebb2bacdd8e..83a3cc05d6f988 100644
--- a/src/vs/editor/browser/view/viewOverlays.ts
+++ b/src/vs/editor/browser/view/viewOverlays.ts
@@ -29,6 +29,10 @@ export class ViewOverlays extends ViewPart implements IVisibleLinesHost<ViewOver
 		this._visibleLines = new VisibleLinesCollection<ViewOverlayLine>(this);
 		this.domNode = this._visibleLines.domNode;
 
+		const options = this._context.configuration.options;
+		const fontInfo = options.get(EditorOption.fontInfo);
+		applyFontInfo(this.domNode, fontInfo);
+
 		this._dynamicOverlays = [];
 		this._isFocused = false;
 
@@ -86,6 +90,11 @@ export class ViewOverlays extends ViewPart implements IVisibleLinesHost<ViewOver
 			const line = this._visibleLines.getVisibleLine(lineNumber);
 			line.onConfigurationChanged(e);
 		}
+
+		const options = this._context.configuration.options;
+		const fontInfo = options.get(EditorOption.fontInfo);
+		applyFontInfo(this.domNode, fontInfo);
+
 		return true;
 	}
 	public override onFlushed(e: viewEvents.ViewFlushedEvent): boolean {
diff --git a/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts b/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts
index cf5347e25cecdb..b494ba60cc284f 100644
--- a/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts
+++ b/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts
@@ -63,19 +63,19 @@ export class ViewContentWidgets extends ViewPart {
 		return true;
 	}
 	public override onLineMappingChanged(e: viewEvents.ViewLineMappingChangedEvent): boolean {
-		const keys = Object.keys(this._widgets);
-		for (const widgetId of keys) {
-			this._widgets[widgetId].onLineMappingChanged(e);
-		}
+		this._updateAnchorsViewPositions();
 		return true;
 	}
 	public override onLinesChanged(e: viewEvents.ViewLinesChangedEvent): boolean {
+		this._updateAnchorsViewPositions();
 		return true;
 	}
 	public override onLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
+		this._updateAnchorsViewPositions();
 		return true;
 	}
 	public override onLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
+		this._updateAnchorsViewPositions();
 		return true;
 	}
 	public override onScrollChanged(e: viewEvents.ViewScrollChangedEvent): boolean {
@@ -87,6 +87,13 @@ export class ViewContentWidgets extends ViewPart {
 
 	// ---- end view event handlers
 
+	private _updateAnchorsViewPositions(): void {
+		const keys = Object.keys(this._widgets);
+		for (const widgetId of keys) {
+			this._widgets[widgetId].updateAnchorViewPosition();
+		}
+	}
+
 	public addWidget(_widget: IContentWidget): void {
 		const myWidget = new Widget(this._context, this._viewDomNode, _widget);
 		this._widgets[myWidget.id] = myWidget;
@@ -235,7 +242,7 @@ class Widget {
 		}
 	}
 
-	public onLineMappingChanged(e: viewEvents.ViewLineMappingChangedEvent): void {
+	public updateAnchorViewPosition(): void {
 		this._setPosition(this._affinity, this._primaryAnchor.modelPosition, this._secondaryAnchor.modelPosition);
 	}
 
@@ -311,9 +318,13 @@ class Widget {
 	}
 
 	private _layoutHorizontalSegmentInPage(windowSize: dom.Dimension, domNodePosition: dom.IDomNodePagePosition, left: number, width: number): [number, number] {
+		// Leave some clearance to the left/right
+		const LEFT_PADDING = 15;
+		const RIGHT_PADDING = 15;
+
 		// Initially, the limits are defined as the dom node limits
-		const MIN_LIMIT = Math.max(0, domNodePosition.left - width);
-		const MAX_LIMIT = Math.min(domNodePosition.left + domNodePosition.width + width, windowSize.width);
+		const MIN_LIMIT = Math.max(LEFT_PADDING, domNodePosition.left - width);
+		const MAX_LIMIT = Math.min(domNodePosition.left + domNodePosition.width + width, windowSize.width - RIGHT_PADDING);
 
 		let absoluteLeft = domNodePosition.left + left - window.scrollX;
 
diff --git a/src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.ts b/src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.ts
index 597eaec3166fea..6bd21420b1dd2e 100644
--- a/src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.ts
+++ b/src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.ts
@@ -14,6 +14,8 @@ import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
 import * as viewEvents from 'vs/editor/common/viewEvents';
 import { getThemeTypeSelector } from 'vs/platform/theme/common/themeService';
 import { EditorOption } from 'vs/editor/common/config/editorOptions';
+import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
+
 export class EditorScrollbar extends ViewPart {
 
 	private readonly scrollbar: SmoothScrollableElement;
@@ -129,6 +131,10 @@ export class EditorScrollbar extends ViewPart {
 		this.scrollbar.delegateVerticalScrollbarPointerDown(browserEvent);
 	}
 
+	public delegateScrollFromMouseWheelEvent(browserEvent: IMouseWheelEvent) {
+		this.scrollbar.delegateScrollFromMouseWheelEvent(browserEvent);
+	}
+
 	// --- begin event handlers
 
 	public override onConfigurationChanged(e: viewEvents.ViewConfigurationChangedEvent): boolean {
diff --git a/src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts b/src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts
index 6a4ffe06954488..cf248c8c471eb7 100644
--- a/src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts
+++ b/src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts
@@ -120,7 +120,7 @@ export class IndentGuidesOverlay extends DynamicViewOverlay {
 
 		const indents = this.getGuidesByLine(
 			visibleStartLineNumber,
-			visibleEndLineNumber,
+			Math.min(visibleEndLineNumber + 1, this._context.viewModel.getLineCount()),
 			activeCursorPosition
 		);
 
diff --git a/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts b/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts
index 6b0f1277a2e7c0..92537ee51db946 100644
--- a/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts
+++ b/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts
@@ -11,6 +11,8 @@ import { Position } from 'vs/editor/common/core/position';
 import { RenderingContext } from 'vs/editor/browser/view/renderingContext';
 import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
 import * as viewEvents from 'vs/editor/common/viewEvents';
+import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
+import { editorDimmedLineNumber, editorLineNumbers } from 'vs/editor/common/core/editorColorRegistry';
 
 export class LineNumbersOverlay extends DynamicViewOverlay {
 
@@ -21,7 +23,7 @@ export class LineNumbersOverlay extends DynamicViewOverlay {
 	private _lineHeight!: number;
 	private _renderLineNumbers!: RenderLineNumbersType;
 	private _renderCustomLineNumbers!: ((lineNumber: number) => string) | null;
-	private _renderFinalNewline!: boolean;
+	private _renderFinalNewline!: 'off' | 'on' | 'dimmed';
 	private _lineNumbersLeft!: number;
 	private _lineNumbersWidth!: number;
 	private _lastCursorModelPosition: Position;
@@ -140,40 +142,38 @@ export class LineNumbersOverlay extends DynamicViewOverlay {
 		const lineHeightClassName = (platform.isLinux ? (this._lineHeight % 2 === 0 ? ' lh-even' : ' lh-odd') : '');
 		const visibleStartLineNumber = ctx.visibleRange.startLineNumber;
 		const visibleEndLineNumber = ctx.visibleRange.endLineNumber;
-		const common = '<div class="' + LineNumbersOverlay.CLASS_NAME + lineHeightClassName + '" style="left:' + this._lineNumbersLeft + 'px;width:' + this._lineNumbersWidth + 'px;">';
 
 		const lineCount = this._context.viewModel.getLineCount();
 		const output: string[] = [];
 		for (let lineNumber = visibleStartLineNumber; lineNumber <= visibleEndLineNumber; lineNumber++) {
 			const lineIndex = lineNumber - visibleStartLineNumber;
 
-			if (!this._renderFinalNewline) {
-				if (lineNumber === lineCount && this._context.viewModel.getLineLength(lineNumber) === 0) {
-					// Do not render last (empty) line
-					output[lineIndex] = '';
-					continue;
-				}
+			const renderLineNumber = this._getLineRenderLineNumber(lineNumber);
+
+			if (!renderLineNumber) {
+				output[lineIndex] = '';
+				continue;
 			}
 
-			const renderLineNumber = this._getLineRenderLineNumber(lineNumber);
+			let extraClassName = '';
 
-			if (renderLineNumber) {
-				if (lineNumber === this._activeLineNumber) {
-					output[lineIndex] = (
-						'<div class="active-line-number ' + LineNumbersOverlay.CLASS_NAME + lineHeightClassName + '" style="left:' + this._lineNumbersLeft + 'px;width:' + this._lineNumbersWidth + 'px;">'
-						+ renderLineNumber
-						+ '</div>'
-					);
-				} else {
-					output[lineIndex] = (
-						common
-						+ renderLineNumber
-						+ '</div>'
-					);
+			if (lineNumber === lineCount && this._context.viewModel.getLineLength(lineNumber) === 0) {
+				// this is the last line
+				if (this._renderFinalNewline === 'off') {
+					output[lineIndex] = '';
+					continue;
 				}
-			} else {
-				output[lineIndex] = '';
+				if (this._renderFinalNewline === 'dimmed') {
+					extraClassName = ' dimmed-line-number';
+				}
+			}
+			if (lineNumber === this._activeLineNumber) {
+				extraClassName = ' active-line-number';
 			}
+
+			output[lineIndex] = (
+				`<div class="${LineNumbersOverlay.CLASS_NAME}${lineHeightClassName}${extraClassName}" style="left:${this._lineNumbersLeft}px;width:${this._lineNumbersWidth}px;">${renderLineNumber}</div>`
+			);
 		}
 
 		this._renderResult = output;
@@ -190,3 +190,13 @@ export class LineNumbersOverlay extends DynamicViewOverlay {
 		return this._renderResult[lineIndex];
 	}
 }
+
+registerThemingParticipant((theme, collector) => {
+	const editorLineNumbersColor = theme.getColor(editorLineNumbers);
+	const editorDimmedLineNumberColor = theme.getColor(editorDimmedLineNumber);
+	if (editorDimmedLineNumberColor) {
+		collector.addRule(`.monaco-editor .line-numbers.dimmed-line-number { color: ${editorDimmedLineNumberColor}; }`);
+	} else if (editorLineNumbersColor) {
+		collector.addRule(`.monaco-editor .line-numbers.dimmed-line-number { color: ${editorLineNumbersColor.transparent(0.4)}; }`);
+	}
+});
diff --git a/src/vs/editor/browser/viewParts/lines/viewLine.ts b/src/vs/editor/browser/viewParts/lines/viewLine.ts
index 376260200e5ed6..44347cfdacbb98 100644
--- a/src/vs/editor/browser/viewParts/lines/viewLine.ts
+++ b/src/vs/editor/browser/viewParts/lines/viewLine.ts
@@ -103,7 +103,13 @@ export class ViewLineOptions {
 		this.themeType = themeType;
 		const options = config.options;
 		const fontInfo = options.get(EditorOption.fontInfo);
-		this.renderWhitespace = options.get(EditorOption.renderWhitespace);
+		const experimentalWhitespaceRendering = options.get(EditorOption.experimentalWhitespaceRendering);
+		if (experimentalWhitespaceRendering === 'off') {
+			this.renderWhitespace = options.get(EditorOption.renderWhitespace);
+		} else {
+			// whitespace is rendered in a different layer
+			this.renderWhitespace = 'none';
+		}
 		this.renderControlCharacters = options.get(EditorOption.renderControlCharacters);
 		this.spaceWidth = fontInfo.spaceWidth;
 		this.middotWidth = fontInfo.middotWidth;
@@ -213,9 +219,10 @@ export class ViewLine implements IVisibleLine {
 				const endColumn = (selection.endLineNumber === lineNumber ? selection.endColumn : lineData.maxColumn);
 
 				if (startColumn < endColumn) {
-					if (isHighContrast(options.themeType) || this._options.renderWhitespace !== 'selection') {
+					if (isHighContrast(options.themeType)) {
 						actualInlineDecorations.push(new LineDecoration(startColumn, endColumn, 'inline-selected-text', InlineDecorationType.Regular));
-					} else {
+					}
+					if (this._options.renderWhitespace === 'selection') {
 						if (!selectionsOnLine) {
 							selectionsOnLine = [];
 						}
@@ -267,21 +274,11 @@ export class ViewLine implements IVisibleLine {
 
 		let renderedViewLine: IRenderedViewLine | null = null;
 		if (monospaceAssumptionsAreValid && canUseFastRenderedViewLine && lineData.isBasicASCII && options.useMonospaceOptimizations && output.containsForeignElements === ForeignElementType.None) {
-			if (lineData.content.length < 300 && renderLineInput.lineTokens.getCount() < 100) {
-				// Browser rounding errors have been observed in Chrome and IE, so using the fast
-				// view line only for short lines. Please test before removing the length check...
-				// ---
-				// Another rounding error has been observed on Linux in VSCode, where <span> width
-				// rounding errors add up to an observable large number...
-				// ---
-				// Also see another example of rounding errors on Windows in
-				// https://github.com/microsoft/vscode/issues/33178
-				renderedViewLine = new FastRenderedViewLine(
-					this._renderedViewLine ? this._renderedViewLine.domNode : null,
-					renderLineInput,
-					output.characterMapping
-				);
-			}
+			renderedViewLine = new FastRenderedViewLine(
+				this._renderedViewLine ? this._renderedViewLine.domNode : null,
+				renderLineInput,
+				output.characterMapping
+			);
 		}
 
 		if (!renderedViewLine) {
@@ -393,6 +390,17 @@ interface IRenderedViewLine {
 	getColumnOfNodeOffset(lineNumber: number, spanNode: HTMLElement, offset: number): number;
 }
 
+const enum Constants {
+	/**
+	 * It seems that rounding errors occur with long lines, so the purely multiplication based
+	 * method is only viable for short lines. For longer lines, we look up the real position of
+	 * every 300th character and use multiplication based on that.
+	 *
+	 * See https://github.com/microsoft/vscode/issues/33178
+	 */
+	MaxMonospaceDistance = 300
+}
+
 /**
  * A rendered line which is guaranteed to contain only regular ASCII and is rendered with a monospace font.
  */
@@ -403,33 +411,53 @@ class FastRenderedViewLine implements IRenderedViewLine {
 
 	private readonly _characterMapping: CharacterMapping;
 	private readonly _charWidth: number;
+	private readonly _keyColumnPixelOffsetCache: Float32Array | null;
+	private _cachedWidth: number = -1;
 
 	constructor(domNode: FastDomNode<HTMLElement> | null, renderLineInput: RenderLineInput, characterMapping: CharacterMapping) {
 		this.domNode = domNode;
 		this.input = renderLineInput;
+		const keyColumnCount = Math.floor(renderLineInput.lineContent.length / Constants.MaxMonospaceDistance);
+		if (keyColumnCount > 0) {
+			this._keyColumnPixelOffsetCache = new Float32Array(keyColumnCount);
+			for (let i = 0; i < keyColumnCount; i++) {
+				this._keyColumnPixelOffsetCache[i] = -1;
+			}
+		} else {
+			this._keyColumnPixelOffsetCache = null;
+		}
 
 		this._characterMapping = characterMapping;
 		this._charWidth = renderLineInput.spaceWidth;
 	}
 
 	public getWidth(): number {
-		return Math.round(this._getCharPosition(this._characterMapping.length));
+		if (!this.domNode || this.input.lineContent.length < Constants.MaxMonospaceDistance) {
+			const horizontalOffset = this._characterMapping.getHorizontalOffset(this._characterMapping.length);
+			return Math.round(this._charWidth * horizontalOffset);
+		}
+		if (this._cachedWidth === -1) {
+			this._cachedWidth = this._getReadingTarget(this.domNode).offsetWidth;
+		}
+		return this._cachedWidth;
 	}
 
 	public getWidthIsFast(): boolean {
-		return true;
+		return (this.input.lineContent.length < Constants.MaxMonospaceDistance);
 	}
 
 	public monospaceAssumptionsAreValid(): boolean {
 		if (!this.domNode) {
 			return monospaceAssumptionsAreValid;
 		}
-		const expectedWidth = this.getWidth();
-		const actualWidth = (<HTMLSpanElement>this.domNode.domNode.firstChild).offsetWidth;
-		if (Math.abs(expectedWidth - actualWidth) >= 2) {
-			// more than 2px off
-			console.warn(`monospace assumptions have been violated, therefore disabling monospace optimizations!`);
-			monospaceAssumptionsAreValid = false;
+		if (this.input.lineContent.length < Constants.MaxMonospaceDistance) {
+			const expectedWidth = this.getWidth();
+			const actualWidth = (<HTMLSpanElement>this.domNode.domNode.firstChild).offsetWidth;
+			if (Math.abs(expectedWidth - actualWidth) >= 2) {
+				// more than 2px off
+				console.warn(`monospace assumptions have been violated, therefore disabling monospace optimizations!`);
+				monospaceAssumptionsAreValid = false;
+			}
 		}
 		return monospaceAssumptionsAreValid;
 	}
@@ -439,14 +467,53 @@ class FastRenderedViewLine implements IRenderedViewLine {
 	}
 
 	public getVisibleRangesForRange(lineNumber: number, startColumn: number, endColumn: number, context: DomReadingContext): FloatHorizontalRange[] | null {
-		const startPosition = this._getCharPosition(startColumn);
-		const endPosition = this._getCharPosition(endColumn);
+		const startPosition = this._getColumnPixelOffset(lineNumber, startColumn, context);
+		const endPosition = this._getColumnPixelOffset(lineNumber, endColumn, context);
 		return [new FloatHorizontalRange(startPosition, endPosition - startPosition)];
 	}
 
-	private _getCharPosition(column: number): number {
+	private _getColumnPixelOffset(lineNumber: number, column: number, context: DomReadingContext): number {
+		if (column <= Constants.MaxMonospaceDistance) {
+			const horizontalOffset = this._characterMapping.getHorizontalOffset(column);
+			return this._charWidth * horizontalOffset;
+		}
+
+		const keyColumnOrdinal = Math.floor((column - 1) / Constants.MaxMonospaceDistance) - 1;
+		const keyColumn = (keyColumnOrdinal + 1) * Constants.MaxMonospaceDistance + 1;
+		let keyColumnPixelOffset = -1;
+		if (this._keyColumnPixelOffsetCache) {
+			keyColumnPixelOffset = this._keyColumnPixelOffsetCache[keyColumnOrdinal];
+			if (keyColumnPixelOffset === -1) {
+				keyColumnPixelOffset = this._actualReadPixelOffset(lineNumber, keyColumn, context);
+				this._keyColumnPixelOffsetCache[keyColumnOrdinal] = keyColumnPixelOffset;
+			}
+		}
+
+		if (keyColumnPixelOffset === -1) {
+			// Could not read actual key column pixel offset
+			const horizontalOffset = this._characterMapping.getHorizontalOffset(column);
+			return this._charWidth * horizontalOffset;
+		}
+
+		const keyColumnHorizontalOffset = this._characterMapping.getHorizontalOffset(keyColumn);
 		const horizontalOffset = this._characterMapping.getHorizontalOffset(column);
-		return this._charWidth * horizontalOffset;
+		return keyColumnPixelOffset + this._charWidth * (horizontalOffset - keyColumnHorizontalOffset);
+	}
+
+	private _getReadingTarget(myDomNode: FastDomNode<HTMLElement>): HTMLElement {
+		return <HTMLSpanElement>myDomNode.domNode.firstChild;
+	}
+
+	private _actualReadPixelOffset(lineNumber: number, column: number, context: DomReadingContext): number {
+		if (!this.domNode) {
+			return -1;
+		}
+		const domPosition = this._characterMapping.getDomPosition(column);
+		const r = RangeUtil.readHorizontalRanges(this._getReadingTarget(this.domNode), domPosition.partIndex, domPosition.charIndex, domPosition.partIndex, domPosition.charIndex, context.clientRectDeltaLeft, context.clientRectScale, context.endNode);
+		if (!r || r.length === 0) {
+			return -1;
+		}
+		return r[0].left;
 	}
 
 	public getColumnOfNodeOffset(lineNumber: number, spanNode: HTMLElement, offset: number): number {
diff --git a/src/vs/editor/browser/viewParts/minimap/minimap.ts b/src/vs/editor/browser/viewParts/minimap/minimap.ts
index 19d9a42d8b68e3..ae38342aad6746 100644
--- a/src/vs/editor/browser/viewParts/minimap/minimap.ts
+++ b/src/vs/editor/browser/viewParts/minimap/minimap.ts
@@ -46,23 +46,16 @@ const GUTTER_DECORATION_WIDTH = 2;
 class MinimapOptions {
 
 	public readonly renderMinimap: RenderMinimap;
-
 	public readonly size: 'proportional' | 'fill' | 'fit';
-
 	public readonly minimapHeightIsEditorHeight: boolean;
-
 	public readonly scrollBeyondLastLine: boolean;
-
+	public readonly paddingTop: number;
+	public readonly paddingBottom: number;
 	public readonly showSlider: 'always' | 'mouseover';
-
 	public readonly autohide: boolean;
-
 	public readonly pixelRatio: number;
-
 	public readonly typicalHalfwidthCharacterWidth: number;
-
 	public readonly lineHeight: number;
-
 	/**
 	 * container dom node left position (in CSS px)
 	 */
@@ -75,7 +68,6 @@ class MinimapOptions {
 	 * container dom node height (in CSS px)
 	 */
 	public readonly minimapHeight: number;
-
 	/**
 	 * canvas backing store width (in device px)
 	 */
@@ -84,7 +76,6 @@ class MinimapOptions {
 	 * canvas backing store height (in device px)
 	 */
 	public readonly canvasInnerHeight: number;
-
 	/**
 	 * canvas width (in CSS px)
 	 */
@@ -120,6 +111,8 @@ class MinimapOptions {
 		this.size = minimapOpts.size;
 		this.minimapHeightIsEditorHeight = minimapLayout.minimapHeightIsEditorHeight;
 		this.scrollBeyondLastLine = options.get(EditorOption.scrollBeyondLastLine);
+		this.paddingTop = options.get(EditorOption.padding).top;
+		this.paddingBottom = options.get(EditorOption.padding).bottom;
 		this.showSlider = minimapOpts.showSlider;
 		this.autohide = minimapOpts.autohide;
 		this.pixelRatio = pixelRatio;
@@ -167,6 +160,8 @@ class MinimapOptions {
 			&& this.size === other.size
 			&& this.minimapHeightIsEditorHeight === other.minimapHeightIsEditorHeight
 			&& this.scrollBeyondLastLine === other.scrollBeyondLastLine
+			&& this.paddingTop === other.paddingTop
+			&& this.paddingBottom === other.paddingBottom
 			&& this.showSlider === other.showSlider
 			&& this.autohide === other.autohide
 			&& this.pixelRatio === other.pixelRatio
@@ -193,56 +188,38 @@ class MinimapOptions {
 
 class MinimapLayout {
 
-	/**
-	 * The given editor scrollTop (input).
-	 */
-	public readonly scrollTop: number;
-
-	/**
-	* The given editor scrollHeight (input).
-	*/
-	public readonly scrollHeight: number;
-
-	public readonly sliderNeeded: boolean;
-	private readonly _computedSliderRatio: number;
-
-	/**
-	 * slider dom node top (in CSS px)
-	 */
-	public readonly sliderTop: number;
-	/**
-	 * slider dom node height (in CSS px)
-	 */
-	public readonly sliderHeight: number;
-
-	/**
-	 * minimap render start line number.
-	 */
-	public readonly startLineNumber: number;
-	/**
-	 * minimap render end line number.
-	 */
-	public readonly endLineNumber: number;
-
 	constructor(
-		scrollTop: number,
-		scrollHeight: number,
-		sliderNeeded: boolean,
-		computedSliderRatio: number,
-		sliderTop: number,
-		sliderHeight: number,
-		startLineNumber: number,
-		endLineNumber: number
-	) {
-		this.scrollTop = scrollTop;
-		this.scrollHeight = scrollHeight;
-		this.sliderNeeded = sliderNeeded;
-		this._computedSliderRatio = computedSliderRatio;
-		this.sliderTop = sliderTop;
-		this.sliderHeight = sliderHeight;
-		this.startLineNumber = startLineNumber;
-		this.endLineNumber = endLineNumber;
-	}
+		/**
+		 * The given editor scrollTop (input).
+		 */
+		public readonly scrollTop: number,
+		/**
+		 * The given editor scrollHeight (input).
+		 */
+		public readonly scrollHeight: number,
+		public readonly sliderNeeded: boolean,
+		private readonly _computedSliderRatio: number,
+		/**
+		 * slider dom node top (in CSS px)
+		 */
+		public readonly sliderTop: number,
+		/**
+		 * slider dom node height (in CSS px)
+		 */
+		public readonly sliderHeight: number,
+		/**
+		 * empty lines to reserve at the top of the minimap.
+		 */
+		public readonly topPaddingLineCount: number,
+		/**
+		 * minimap render start line number.
+		 */
+		public readonly startLineNumber: number,
+		/**
+		 * minimap render end line number.
+		 */
+		public readonly endLineNumber: number
+	) { }
 
 	/**
 	 * Compute a desired `scrollPosition` such that the slider moves by `delta`.
@@ -255,6 +232,26 @@ class MinimapLayout {
 		return Math.round((pageY - this.sliderHeight / 2) / this._computedSliderRatio);
 	}
 
+	/**
+	 * Intersect a line range with `this.startLineNumber` and `this.endLineNumber`.
+	 */
+	public intersectWithViewport(range: Range): [number, number] | null {
+		const startLineNumber = Math.max(this.startLineNumber, range.startLineNumber);
+		const endLineNumber = Math.min(this.endLineNumber, range.endLineNumber);
+		if (startLineNumber > endLineNumber) {
+			// entirely outside minimap's viewport
+			return null;
+		}
+		return [startLineNumber, endLineNumber];
+	}
+
+	/**
+	 * Get the inner minimap y coordinate for a line number.
+	 */
+	public getYForLineNumber(lineNumber: number, minimapLineHeight: number): number {
+		return + (lineNumber - this.startLineNumber + this.topPaddingLineCount) * minimapLineHeight;
+	}
+
 	public static create(
 		options: MinimapOptions,
 		viewportStartLineNumber: number,
@@ -274,10 +271,14 @@ class MinimapLayout {
 		const lineHeight = options.lineHeight;
 
 		if (options.minimapHeightIsEditorHeight) {
-			const logicalScrollHeight = (
+			let logicalScrollHeight = (
 				realLineCount * options.lineHeight
-				+ (options.scrollBeyondLastLine ? viewportHeight - options.lineHeight : 0)
+				+ options.paddingTop
+				+ options.paddingBottom
 			);
+			if (options.scrollBeyondLastLine) {
+				logicalScrollHeight += Math.max(0, viewportHeight - options.lineHeight - options.paddingBottom);
+			}
 			const sliderHeight = Math.max(1, Math.floor(viewportHeight * viewportHeight / logicalScrollHeight));
 			const maxMinimapSliderTop = Math.max(0, options.minimapHeight - sliderHeight);
 			// The slider can move from 0 to `maxMinimapSliderTop`
@@ -286,7 +287,8 @@ class MinimapLayout {
 			const sliderTop = (scrollTop * computedSliderRatio);
 			const sliderNeeded = (maxMinimapSliderTop > 0);
 			const maxLinesFitting = Math.floor(options.canvasInnerHeight / options.minimapLineHeight);
-			return new MinimapLayout(scrollTop, scrollHeight, sliderNeeded, computedSliderRatio, sliderTop, sliderHeight, 1, Math.min(lineCount, maxLinesFitting));
+			const topPaddingLineCount = Math.floor(options.paddingTop / options.lineHeight);
+			return new MinimapLayout(scrollTop, scrollHeight, sliderNeeded, computedSliderRatio, sliderTop, sliderHeight, topPaddingLineCount, 1, Math.min(lineCount, maxLinesFitting));
 		}
 
 		// The visible line count in a viewport can change due to a number of reasons:
@@ -311,13 +313,21 @@ class MinimapLayout {
 			sliderHeight = Math.floor(expectedViewportLineCount * minimapLineHeight / pixelRatio);
 		}
 
-		let maxMinimapSliderTop: number;
+		const extraLinesAtTheTop = Math.floor(options.paddingTop / lineHeight);
+		let extraLinesAtTheBottom = Math.floor(options.paddingBottom / lineHeight);
 		if (options.scrollBeyondLastLine) {
+			const expectedViewportLineCount = viewportHeight / lineHeight;
+			extraLinesAtTheBottom = Math.max(extraLinesAtTheBottom, expectedViewportLineCount - 1);
+		}
+
+		let maxMinimapSliderTop: number;
+		if (extraLinesAtTheBottom > 0) {
+			const expectedViewportLineCount = viewportHeight / lineHeight;
 			// The minimap slider, when dragged all the way down, will contain the last line at its top
-			maxMinimapSliderTop = (lineCount - 1) * minimapLineHeight / pixelRatio;
+			maxMinimapSliderTop = (extraLinesAtTheTop + lineCount + extraLinesAtTheBottom - expectedViewportLineCount - 1) * minimapLineHeight / pixelRatio;
 		} else {
 			// The minimap slider, when dragged all the way down, will contain the last line at its bottom
-			maxMinimapSliderTop = Math.max(0, lineCount * minimapLineHeight / pixelRatio - sliderHeight);
+			maxMinimapSliderTop = Math.max(0, (extraLinesAtTheTop + lineCount) * minimapLineHeight / pixelRatio - sliderHeight);
 		}
 		maxMinimapSliderTop = Math.min(options.minimapHeight - sliderHeight, maxMinimapSliderTop);
 
@@ -326,19 +336,27 @@ class MinimapLayout {
 		const computedSliderRatio = (maxMinimapSliderTop) / (scrollHeight - viewportHeight);
 		const sliderTop = (scrollTop * computedSliderRatio);
 
-		let extraLinesAtTheBottom = 0;
-		if (options.scrollBeyondLastLine) {
-			const expectedViewportLineCount = viewportHeight / lineHeight;
-			extraLinesAtTheBottom = expectedViewportLineCount - 1;
-		}
-		if (minimapLinesFitting >= lineCount + extraLinesAtTheBottom) {
+		if (minimapLinesFitting >= extraLinesAtTheTop + lineCount + extraLinesAtTheBottom) {
 			// All lines fit in the minimap
-			const startLineNumber = 1;
-			const endLineNumber = lineCount;
 			const sliderNeeded = (maxMinimapSliderTop > 0);
-			return new MinimapLayout(scrollTop, scrollHeight, sliderNeeded, computedSliderRatio, sliderTop, sliderHeight, startLineNumber, endLineNumber);
+			return new MinimapLayout(scrollTop, scrollHeight, sliderNeeded, computedSliderRatio, sliderTop, sliderHeight, extraLinesAtTheTop, 1, lineCount);
 		} else {
-			let startLineNumber = Math.max(1, Math.floor(viewportStartLineNumber - sliderTop * pixelRatio / minimapLineHeight));
+			let consideringStartLineNumber: number;
+			if (viewportStartLineNumber > 1) {
+				consideringStartLineNumber = viewportStartLineNumber + extraLinesAtTheTop;
+			} else {
+				consideringStartLineNumber = Math.max(1, scrollTop / lineHeight);
+			}
+
+			let topPaddingLineCount: number;
+			let startLineNumber = Math.max(1, Math.floor(consideringStartLineNumber - sliderTop * pixelRatio / minimapLineHeight));
+			if (startLineNumber < extraLinesAtTheTop) {
+				topPaddingLineCount = extraLinesAtTheTop - startLineNumber + 1;
+				startLineNumber = 1;
+			} else {
+				topPaddingLineCount = 0;
+				startLineNumber = Math.max(1, startLineNumber - extraLinesAtTheTop);
+			}
 
 			// Avoid flickering caused by a partial viewport start line
 			// by being consistent w.r.t. the previous layout decision
@@ -346,18 +364,26 @@ class MinimapLayout {
 				if (previousLayout.scrollTop > scrollTop) {
 					// Scrolling up => never increase `startLineNumber`
 					startLineNumber = Math.min(startLineNumber, previousLayout.startLineNumber);
+					topPaddingLineCount = Math.max(topPaddingLineCount, previousLayout.topPaddingLineCount);
 				}
 				if (previousLayout.scrollTop < scrollTop) {
 					// Scrolling down => never decrease `startLineNumber`
 					startLineNumber = Math.max(startLineNumber, previousLayout.startLineNumber);
+					topPaddingLineCount = Math.min(topPaddingLineCount, previousLayout.topPaddingLineCount);
 				}
 			}
 
-			const endLineNumber = Math.min(lineCount, startLineNumber + minimapLinesFitting - 1);
+			const endLineNumber = Math.min(lineCount, startLineNumber - topPaddingLineCount + minimapLinesFitting - 1);
 			const partialLine = (scrollTop - viewportStartLineNumberVerticalOffset) / lineHeight;
-			const sliderTopAligned = (viewportStartLineNumber - startLineNumber + partialLine) * minimapLineHeight / pixelRatio;
 
-			return new MinimapLayout(scrollTop, scrollHeight, true, computedSliderRatio, sliderTopAligned, sliderHeight, startLineNumber, endLineNumber);
+			let sliderTopAligned: number;
+			if (scrollTop > options.paddingTop) {
+				sliderTopAligned = (viewportStartLineNumber - startLineNumber + topPaddingLineCount + partialLine) * minimapLineHeight / pixelRatio;
+			} else {
+				sliderTopAligned = (scrollTop / options.paddingTop) * (topPaddingLineCount + partialLine) * minimapLineHeight / pixelRatio;
+			}
+
+			return new MinimapLayout(scrollTop, scrollHeight, true, computedSliderRatio, sliderTopAligned, sliderHeight, topPaddingLineCount, startLineNumber, endLineNumber);
 		}
 	}
 }
@@ -569,15 +595,14 @@ class MinimapSamplingState {
 
 		// ratio is intentionally not part of the layout to avoid the layout changing all the time
 		// so we need to recompute it again...
-		const pixelRatio = options.pixelRatio;
-		const lineHeight = options.lineHeight;
-		const scrollBeyondLastLine = options.scrollBeyondLastLine;
 		const { minimapLineCount } = EditorLayoutInfoComputer.computeContainedMinimapLineCount({
 			viewLineCount: viewLineCount,
-			scrollBeyondLastLine: scrollBeyondLastLine,
+			scrollBeyondLastLine: options.scrollBeyondLastLine,
+			paddingTop: options.paddingTop,
+			paddingBottom: options.paddingBottom,
 			height: options.editorHeight,
-			lineHeight: lineHeight,
-			pixelRatio: pixelRatio
+			lineHeight: options.lineHeight,
+			pixelRatio: options.pixelRatio
 		});
 		const ratio = viewLineCount / minimapLineCount;
 		const halfRatio = ratio / 2;
@@ -1161,7 +1186,7 @@ class InnerMinimap extends Disposable {
 			const internalOffsetY = (this._model.options.canvasInnerHeight / this._model.options.canvasOuterHeight) * e.offsetY;
 			const lineIndex = Math.floor(internalOffsetY / minimapLineHeight);
 
-			let lineNumber = lineIndex + this._lastRenderData.renderedLayout.startLineNumber;
+			let lineNumber = lineIndex + this._lastRenderData.renderedLayout.startLineNumber - this._lastRenderData.renderedLayout.topPaddingLineCount;
 			lineNumber = Math.min(lineNumber, this._model.getLineCount());
 
 			this._model.revealLineNumber(lineNumber);
@@ -1213,7 +1238,12 @@ class InnerMinimap extends Disposable {
 		this._slider.toggleClassName('active', true);
 
 		const handlePointerMove = (posy: number, posx: number) => {
-			const pointerOrthogonalDelta = Math.abs(posx - initialPosX);
+			const minimapPosition = dom.getDomNodePagePosition(this._domNode.domNode);
+			const pointerOrthogonalDelta = Math.min(
+				Math.abs(posx - initialPosX),
+				Math.abs(posx - minimapPosition.left),
+				Math.abs(posx - minimapPosition.left - minimapPosition.width)
+			);
 
 			if (platform.isWindows && pointerOrthogonalDelta > POINTER_DRAG_RESET_DISTANCE) {
 				// The pointer has wondered away from the scrollbar => reset dragging
@@ -1420,8 +1450,8 @@ class InnerMinimap extends Disposable {
 			decorations.sort((a, b) => (a.options.zIndex || 0) - (b.options.zIndex || 0));
 
 			const { canvasInnerWidth, canvasInnerHeight } = this._model.options;
-			const lineHeight = this._model.options.minimapLineHeight;
-			const characterWidth = this._model.options.minimapCharWidth;
+			const minimapLineHeight = this._model.options.minimapLineHeight;
+			const minimapCharWidth = this._model.options.minimapCharWidth;
 			const tabSize = this._model.getOptions().tabSize;
 			const canvasContext = this._decorationsCanvas.domNode.getContext('2d')!;
 
@@ -1433,12 +1463,12 @@ class InnerMinimap extends Disposable {
 			// is given to the selection.
 
 			const highlightedLines = new ContiguousLineMap<boolean>(layout.startLineNumber, layout.endLineNumber, false);
-			this._renderSelectionLineHighlights(canvasContext, selections, highlightedLines, layout, lineHeight);
-			this._renderDecorationsLineHighlights(canvasContext, decorations, highlightedLines, layout, lineHeight);
+			this._renderSelectionLineHighlights(canvasContext, selections, highlightedLines, layout, minimapLineHeight);
+			this._renderDecorationsLineHighlights(canvasContext, decorations, highlightedLines, layout, minimapLineHeight);
 
 			const lineOffsetMap = new ContiguousLineMap<number[] | null>(layout.startLineNumber, layout.endLineNumber, null);
-			this._renderSelectionsHighlights(canvasContext, selections, lineOffsetMap, layout, lineHeight, tabSize, characterWidth, canvasInnerWidth);
-			this._renderDecorationsHighlights(canvasContext, decorations, lineOffsetMap, layout, lineHeight, tabSize, characterWidth, canvasInnerWidth);
+			this._renderSelectionsHighlights(canvasContext, selections, lineOffsetMap, layout, minimapLineHeight, tabSize, minimapCharWidth, canvasInnerWidth);
+			this._renderDecorationsHighlights(canvasContext, decorations, lineOffsetMap, layout, minimapLineHeight, tabSize, minimapCharWidth, canvasInnerWidth);
 		}
 	}
 
@@ -1447,7 +1477,7 @@ class InnerMinimap extends Disposable {
 		selections: Selection[],
 		highlightedLines: ContiguousLineMap<boolean>,
 		layout: MinimapLayout,
-		lineHeight: number
+		minimapLineHeight: number
 	): void {
 		if (!this._selectionColor || this._selectionColor.isTransparent()) {
 			return;
@@ -1459,19 +1489,19 @@ class InnerMinimap extends Disposable {
 		let y2 = 0;
 
 		for (const selection of selections) {
-			const startLineNumber = Math.max(layout.startLineNumber, selection.startLineNumber);
-			const endLineNumber = Math.min(layout.endLineNumber, selection.endLineNumber);
-			if (startLineNumber > endLineNumber) {
+			const intersection = layout.intersectWithViewport(selection);
+			if (!intersection) {
 				// entirely outside minimap's viewport
 				continue;
 			}
+			const [startLineNumber, endLineNumber] = intersection;
 
 			for (let line = startLineNumber; line <= endLineNumber; line++) {
 				highlightedLines.set(line, true);
 			}
 
-			const yy1 = (startLineNumber - layout.startLineNumber) * lineHeight;
-			const yy2 = (endLineNumber - layout.startLineNumber) * lineHeight + lineHeight;
+			const yy1 = layout.getYForLineNumber(startLineNumber, minimapLineHeight);
+			const yy2 = layout.getYForLineNumber(endLineNumber, minimapLineHeight);
 
 			if (y2 >= yy1) {
 				// merge into previous
@@ -1497,7 +1527,7 @@ class InnerMinimap extends Disposable {
 		decorations: ViewModelDecoration[],
 		highlightedLines: ContiguousLineMap<boolean>,
 		layout: MinimapLayout,
-		lineHeight: number
+		minimapLineHeight: number
 	): void {
 
 		const highlightColors = new Map<string, string>();
@@ -1511,12 +1541,12 @@ class InnerMinimap extends Disposable {
 				continue;
 			}
 
-			const startLineNumber = Math.max(layout.startLineNumber, decoration.range.startLineNumber);
-			const endLineNumber = Math.min(layout.endLineNumber, decoration.range.endLineNumber);
-			if (startLineNumber > endLineNumber) {
+			const intersection = layout.intersectWithViewport(decoration.range);
+			if (!intersection) {
 				// entirely outside minimap's viewport
 				continue;
 			}
+			const [startLineNumber, endLineNumber] = intersection;
 
 			const decorationColor = minimapOptions.getColor(this._theme.value);
 			if (!decorationColor || decorationColor.isTransparent()) {
@@ -1535,8 +1565,8 @@ class InnerMinimap extends Disposable {
 					continue;
 				}
 				highlightedLines.set(line, true);
-				const y = (startLineNumber - layout.startLineNumber) * lineHeight;
-				canvasContext.fillRect(MINIMAP_GUTTER_WIDTH, y, canvasContext.canvas.width, lineHeight);
+				const y = layout.getYForLineNumber(startLineNumber, minimapLineHeight);
+				canvasContext.fillRect(MINIMAP_GUTTER_WIDTH, y, canvasContext.canvas.width, minimapLineHeight);
 			}
 		}
 	}
@@ -1555,12 +1585,12 @@ class InnerMinimap extends Disposable {
 			return;
 		}
 		for (const selection of selections) {
-			const startLineNumber = Math.max(layout.startLineNumber, selection.startLineNumber);
-			const endLineNumber = Math.min(layout.endLineNumber, selection.endLineNumber);
-			if (startLineNumber > endLineNumber) {
+			const intersection = layout.intersectWithViewport(selection);
+			if (!intersection) {
 				// entirely outside minimap's viewport
 				continue;
 			}
+			const [startLineNumber, endLineNumber] = intersection;
 
 			for (let line = startLineNumber; line <= endLineNumber; line++) {
 				this.renderDecorationOnLine(canvasContext, lineOffsetMap, selection, this._selectionColor, layout, line, lineHeight, lineHeight, tabSize, characterWidth, canvasInnerWidth);
@@ -1573,7 +1603,7 @@ class InnerMinimap extends Disposable {
 		decorations: ViewModelDecoration[],
 		lineOffsetMap: ContiguousLineMap<number[] | null>,
 		layout: MinimapLayout,
-		lineHeight: number,
+		minimapLineHeight: number,
 		tabSize: number,
 		characterWidth: number,
 		canvasInnerWidth: number
@@ -1586,12 +1616,12 @@ class InnerMinimap extends Disposable {
 				continue;
 			}
 
-			const startLineNumber = Math.max(layout.startLineNumber, decoration.range.startLineNumber);
-			const endLineNumber = Math.min(layout.endLineNumber, decoration.range.endLineNumber);
-			if (startLineNumber > endLineNumber) {
+			const intersection = layout.intersectWithViewport(decoration.range);
+			if (!intersection) {
 				// entirely outside minimap's viewport
 				continue;
 			}
+			const [startLineNumber, endLineNumber] = intersection;
 
 			const decorationColor = minimapOptions.getColor(this._theme.value);
 			if (!decorationColor || decorationColor.isTransparent()) {
@@ -1602,13 +1632,13 @@ class InnerMinimap extends Disposable {
 				switch (minimapOptions.position) {
 
 					case MinimapPosition.Inline:
-						this.renderDecorationOnLine(canvasContext, lineOffsetMap, decoration.range, decorationColor, layout, line, lineHeight, lineHeight, tabSize, characterWidth, canvasInnerWidth);
+						this.renderDecorationOnLine(canvasContext, lineOffsetMap, decoration.range, decorationColor, layout, line, minimapLineHeight, minimapLineHeight, tabSize, characterWidth, canvasInnerWidth);
 						continue;
 
 					case MinimapPosition.Gutter: {
-						const y = (line - layout.startLineNumber) * lineHeight;
+						const y = layout.getYForLineNumber(line, minimapLineHeight);
 						const x = 2;
-						this.renderDecoration(canvasContext, decorationColor, x, y, GUTTER_DECORATION_WIDTH, lineHeight);
+						this.renderDecoration(canvasContext, decorationColor, x, y, GUTTER_DECORATION_WIDTH, minimapLineHeight);
 						continue;
 					}
 				}
@@ -1624,12 +1654,12 @@ class InnerMinimap extends Disposable {
 		layout: MinimapLayout,
 		lineNumber: number,
 		height: number,
-		lineHeight: number,
+		minimapLineHeight: number,
 		tabSize: number,
 		charWidth: number,
 		canvasInnerWidth: number
 	): void {
-		const y = (lineNumber - layout.startLineNumber) * lineHeight;
+		const y = layout.getYForLineNumber(lineNumber, minimapLineHeight);
 
 		// Skip rendering the line if it's vertically outside our viewport
 		if (y + height < 0 || y > this._model.options.canvasInnerHeight) {
@@ -1728,6 +1758,7 @@ class InnerMinimap extends Disposable {
 		// Render untouched lines by using last rendered data.
 		const [_dirtyY1, _dirtyY2, needed] = InnerMinimap._renderUntouchedLines(
 			imageData,
+			layout.topPaddingLineCount,
 			startLineNumber,
 			endLineNumber,
 			minimapLineHeight,
@@ -1759,7 +1790,7 @@ class InnerMinimap extends Disposable {
 			Math.round((background.b - defaultBackground.b) * backgroundA + defaultBackground.b),
 			255
 		);
-		let dy = 0;
+		let dy = layout.topPaddingLineCount * minimapLineHeight;
 		const renderedLines: MinimapLine[] = [];
 		for (let lineIndex = 0, lineCount = endLineNumber - startLineNumber + 1; lineIndex < lineCount; lineIndex++) {
 			if (needed[lineIndex]) {
@@ -1803,6 +1834,7 @@ class InnerMinimap extends Disposable {
 
 	private static _renderUntouchedLines(
 		target: ImageData,
+		topPaddingLineCount: number,
 		startLineNumber: number,
 		endLineNumber: number,
 		minimapLineHeight: number,
@@ -1834,7 +1866,7 @@ class InnerMinimap extends Disposable {
 		let copyDestStart = -1;
 		let copyDestEnd = -1;
 
-		let dest_dy = 0;
+		let dest_dy = topPaddingLineCount * minimapLineHeight;
 		for (let lineNumber = startLineNumber; lineNumber <= endLineNumber; lineNumber++) {
 			const lineIndex = lineNumber - startLineNumber;
 			const lastLineIndex = lineNumber - lastStartLineNumber;
diff --git a/src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts b/src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts
index 258ee6780c766a..34c5bd76451066 100644
--- a/src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts
+++ b/src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts
@@ -113,7 +113,12 @@ export class ViewCursor {
 		return true;
 	}
 
-	public onCursorPositionChanged(position: Position): boolean {
+	public onCursorPositionChanged(position: Position, pauseAnimation: boolean): boolean {
+		if (pauseAnimation) {
+			this._domNode.domNode.style.transitionProperty = 'none';
+		} else {
+			this._domNode.domNode.style.transitionProperty = '';
+		}
 		this._position = position;
 		return true;
 	}
@@ -131,6 +136,7 @@ export class ViewCursor {
 
 	private _prepareRender(ctx: RenderingContext): ViewCursorRenderData | null {
 		let textContent = '';
+		let textContentClassName = '';
 		const [position, nextGrapheme] = this._getGraphemeAwarePosition();
 
 		if (this._cursorStyle === TextEditorCursorStyle.Line || this._cursorStyle === TextEditorCursorStyle.LineThin) {
@@ -145,6 +151,7 @@ export class ViewCursor {
 				width = dom.computeScreenAwareSize(this._lineCursorWidth > 0 ? this._lineCursorWidth : 2);
 				if (width > 2) {
 					textContent = nextGrapheme;
+					textContentClassName = this._getTokenClassName(position);
 				}
 			} else {
 				width = dom.computeScreenAwareSize(1);
@@ -159,7 +166,7 @@ export class ViewCursor {
 			}
 
 			const top = ctx.getVerticalOffsetForLineNumber(position.lineNumber) - ctx.bigNumbersDelta;
-			return new ViewCursorRenderData(top, left, paddingLeft, width, this._lineHeight, textContent, '');
+			return new ViewCursorRenderData(top, left, paddingLeft, width, this._lineHeight, textContent, textContentClassName);
 		}
 
 		const visibleRangeForCharacter = ctx.linesVisibleRangesForRange(new Range(position.lineNumber, position.column, position.lineNumber, position.column + nextGrapheme.length), false);
@@ -183,12 +190,9 @@ export class ViewCursor {
 					: range.width)
 		);
 
-		let textContentClassName = '';
 		if (this._cursorStyle === TextEditorCursorStyle.Block) {
-			const lineData = this._context.viewModel.getViewLineData(position.lineNumber);
 			textContent = nextGrapheme;
-			const tokenIndex = lineData.tokens.findTokenIndexAtOffset(position.column - 1);
-			textContentClassName = lineData.tokens.getClassName(tokenIndex);
+			textContentClassName = this._getTokenClassName(position);
 		}
 
 		let top = ctx.getVerticalOffsetForLineNumber(position.lineNumber) - ctx.bigNumbersDelta;
@@ -203,6 +207,12 @@ export class ViewCursor {
 		return new ViewCursorRenderData(top, range.left, 0, width, height, textContent, textContentClassName);
 	}
 
+	private _getTokenClassName(position: Position): string {
+		const lineData = this._context.viewModel.getViewLineData(position.lineNumber);
+		const tokenIndex = lineData.tokens.findTokenIndexAtOffset(position.column - 1);
+		return lineData.tokens.getClassName(tokenIndex);
+	}
+
 	public prepareRender(ctx: RenderingContext): void {
 		this._renderData = this._prepareRender(ctx);
 	}
diff --git a/src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts b/src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts
index 54dcde454179a7..3f2b4139479a6c 100644
--- a/src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts
+++ b/src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts
@@ -16,6 +16,7 @@ import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
 import * as viewEvents from 'vs/editor/common/viewEvents';
 import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { isHighContrast } from 'vs/platform/theme/common/theme';
+import { CursorChangeReason } from 'vs/editor/common/cursorEvents';
 
 export class ViewCursors extends ViewPart {
 
@@ -24,7 +25,7 @@ export class ViewCursors extends ViewPart {
 	private _readOnly: boolean;
 	private _cursorBlinking: TextEditorCursorBlinkingStyle;
 	private _cursorStyle: TextEditorCursorStyle;
-	private _cursorSmoothCaretAnimation: boolean;
+	private _cursorSmoothCaretAnimation: 'off' | 'explicit' | 'on';
 	private _selectionIsEmpty: boolean;
 	private _isComposingInput: boolean;
 
@@ -113,8 +114,12 @@ export class ViewCursors extends ViewPart {
 		}
 		return true;
 	}
-	private _onCursorPositionChanged(position: Position, secondaryPositions: Position[]): void {
-		this._primaryCursor.onCursorPositionChanged(position);
+	private _onCursorPositionChanged(position: Position, secondaryPositions: Position[], reason: CursorChangeReason): void {
+		const pauseAnimation = (
+			this._secondaryCursors.length !== secondaryPositions.length
+			|| (this._cursorSmoothCaretAnimation === 'explicit' && reason !== CursorChangeReason.Explicit)
+		);
+		this._primaryCursor.onCursorPositionChanged(position, pauseAnimation);
 		this._updateBlinking();
 
 		if (this._secondaryCursors.length < secondaryPositions.length) {
@@ -135,7 +140,7 @@ export class ViewCursors extends ViewPart {
 		}
 
 		for (let i = 0; i < secondaryPositions.length; i++) {
-			this._secondaryCursors[i].onCursorPositionChanged(secondaryPositions[i]);
+			this._secondaryCursors[i].onCursorPositionChanged(secondaryPositions[i], pauseAnimation);
 		}
 
 	}
@@ -144,7 +149,7 @@ export class ViewCursors extends ViewPart {
 		for (let i = 0, len = e.selections.length; i < len; i++) {
 			positions[i] = e.selections[i].getPosition();
 		}
-		this._onCursorPositionChanged(positions[0], positions.slice(1));
+		this._onCursorPositionChanged(positions[0], positions.slice(1), e.reason);
 
 		const selectionIsEmpty = e.selections[0].isEmpty();
 		if (this._selectionIsEmpty !== selectionIsEmpty) {
@@ -313,7 +318,7 @@ export class ViewCursors extends ViewPart {
 		} else {
 			result += ' cursor-solid';
 		}
-		if (this._cursorSmoothCaretAnimation) {
+		if (this._cursorSmoothCaretAnimation === 'on' || this._cursorSmoothCaretAnimation === 'explicit') {
 			result += ' cursor-smooth-caret-animation';
 		}
 		return result;
diff --git a/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.css b/src/vs/editor/browser/viewParts/whitespace/whitespace.css
similarity index 52%
rename from src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.css
rename to src/vs/editor/browser/viewParts/whitespace/whitespace.css
index 7e975d35439a14..64a28e334ab181 100644
--- a/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.css
+++ b/src/vs/editor/browser/viewParts/whitespace/whitespace.css
@@ -3,12 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-.monaco-editor .focused .selectionHighlight {
-	background-color: var(--vscode-editor-selectionHighlightBackground);
-}
-.monaco-editor .wordHighlight {
-	background-color: var(--vscode-editor-wordHighlightBackground);
-}
-.monaco-editor .wordHighlightStrong {
-	background-color: var(--vscode-editor-wordHighlightStrongBackground);
+.monaco-editor .mwh {
+	position: absolute;
+	color: var(--vscode-editorWhitespace-foreground) !important;
 }
diff --git a/src/vs/editor/browser/viewParts/whitespace/whitespace.ts b/src/vs/editor/browser/viewParts/whitespace/whitespace.ts
new file mode 100644
index 00000000000000..489293a01b80b7
--- /dev/null
+++ b/src/vs/editor/browser/viewParts/whitespace/whitespace.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 'vs/css!./whitespace';
+import { DynamicViewOverlay } from 'vs/editor/browser/view/dynamicViewOverlay';
+import { Selection } from 'vs/editor/common/core/selection';
+import { RenderingContext } from 'vs/editor/browser/view/renderingContext';
+import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
+import * as viewEvents from 'vs/editor/common/viewEvents';
+import { ViewLineData } from 'vs/editor/common/viewModel';
+import { EditorOption } from 'vs/editor/common/config/editorOptions';
+import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguration';
+import * as strings from 'vs/base/common/strings';
+import { CharCode } from 'vs/base/common/charCode';
+import { LineRange } from 'vs/editor/common/viewLayout/viewLineRenderer';
+import { Position } from 'vs/editor/common/core/position';
+import { editorWhitespaces } from 'vs/editor/common/core/editorColorRegistry';
+
+export class WhitespaceOverlay extends DynamicViewOverlay {
+
+	private readonly _context: ViewContext;
+	private _options: WhitespaceOptions;
+	private _selection: Selection[];
+	private _renderResult: string[] | null;
+
+	constructor(context: ViewContext) {
+		super();
+		this._context = context;
+		this._options = new WhitespaceOptions(this._context.configuration);
+		this._selection = [];
+		this._renderResult = null;
+		this._context.addEventHandler(this);
+	}
+
+	public override dispose(): void {
+		this._context.removeEventHandler(this);
+		this._renderResult = null;
+		super.dispose();
+	}
+
+	// --- begin event handlers
+
+	public override onConfigurationChanged(e: viewEvents.ViewConfigurationChangedEvent): boolean {
+		const newOptions = new WhitespaceOptions(this._context.configuration);
+		if (this._options.equals(newOptions)) {
+			return e.hasChanged(EditorOption.layoutInfo);
+		}
+		this._options = newOptions;
+		return true;
+	}
+	public override onCursorStateChanged(e: viewEvents.ViewCursorStateChangedEvent): boolean {
+		this._selection = e.selections;
+		if (this._options.renderWhitespace === 'selection') {
+			return true;
+		}
+		return false;
+	}
+	public override onDecorationsChanged(e: viewEvents.ViewDecorationsChangedEvent): boolean {
+		return true;
+	}
+	public override onFlushed(e: viewEvents.ViewFlushedEvent): boolean {
+		return true;
+	}
+	public override onLinesChanged(e: viewEvents.ViewLinesChangedEvent): boolean {
+		return true;
+	}
+	public override onLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
+		return true;
+	}
+	public override onLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
+		return true;
+	}
+	public override onScrollChanged(e: viewEvents.ViewScrollChangedEvent): boolean {
+		return e.scrollTopChanged;
+	}
+	public override onZonesChanged(e: viewEvents.ViewZonesChangedEvent): boolean {
+		return true;
+	}
+	// --- end event handlers
+
+	public prepareRender(ctx: RenderingContext): void {
+		if (this._options.renderWhitespace === 'none') {
+			this._renderResult = null;
+			return;
+		}
+
+		const startLineNumber = ctx.visibleRange.startLineNumber;
+		const endLineNumber = ctx.visibleRange.endLineNumber;
+		const lineCount = endLineNumber - startLineNumber + 1;
+		const needed = new Array<boolean>(lineCount);
+		for (let i = 0; i < lineCount; i++) {
+			needed[i] = true;
+		}
+		const viewportData = this._context.viewModel.getMinimapLinesRenderingData(ctx.viewportData.startLineNumber, ctx.viewportData.endLineNumber, needed);
+
+		this._renderResult = [];
+		for (let lineNumber = ctx.viewportData.startLineNumber; lineNumber <= ctx.viewportData.endLineNumber; lineNumber++) {
+			const lineIndex = lineNumber - ctx.viewportData.startLineNumber;
+			const lineData = viewportData.data[lineIndex]!;
+
+			let selectionsOnLine: LineRange[] | null = null;
+			if (this._options.renderWhitespace === 'selection') {
+				const selections = this._selection;
+				for (const selection of selections) {
+
+					if (selection.endLineNumber < lineNumber || selection.startLineNumber > lineNumber) {
+						// Selection does not intersect line
+						continue;
+					}
+
+					const startColumn = (selection.startLineNumber === lineNumber ? selection.startColumn : lineData.minColumn);
+					const endColumn = (selection.endLineNumber === lineNumber ? selection.endColumn : lineData.maxColumn);
+
+					if (startColumn < endColumn) {
+						if (!selectionsOnLine) {
+							selectionsOnLine = [];
+						}
+						selectionsOnLine.push(new LineRange(startColumn - 1, endColumn - 1));
+					}
+				}
+			}
+
+			this._renderResult[lineIndex] = this._applyRenderWhitespace(ctx, lineNumber, selectionsOnLine, lineData);
+		}
+	}
+
+	private _applyRenderWhitespace(ctx: RenderingContext, lineNumber: number, selections: LineRange[] | null, lineData: ViewLineData): string {
+		if (this._options.renderWhitespace === 'selection' && !selections) {
+			return '';
+		}
+		if (this._options.renderWhitespace === 'trailing' && lineData.continuesWithWrappedLine) {
+			return '';
+		}
+		const color = this._context.theme.getColor(editorWhitespaces);
+		const USE_SVG = this._options.renderWithSVG;
+
+		const lineContent = lineData.content;
+		const len = (this._options.stopRenderingLineAfter === -1 ? lineContent.length : Math.min(this._options.stopRenderingLineAfter, lineContent.length));
+		const continuesWithWrappedLine = lineData.continuesWithWrappedLine;
+		const fauxIndentLength = lineData.minColumn - 1;
+		const onlyBoundary = (this._options.renderWhitespace === 'boundary');
+		const onlyTrailing = (this._options.renderWhitespace === 'trailing');
+		const lineHeight = this._options.lineHeight;
+		const middotWidth = this._options.middotWidth;
+		const wsmiddotWidth = this._options.wsmiddotWidth;
+		const spaceWidth = this._options.spaceWidth;
+		const wsmiddotDiff = Math.abs(wsmiddotWidth - spaceWidth);
+		const middotDiff = Math.abs(middotWidth - spaceWidth);
+
+		// U+2E31 - WORD SEPARATOR MIDDLE DOT
+		// U+00B7 - MIDDLE DOT
+		const renderSpaceCharCode = (wsmiddotDiff < middotDiff ? 0x2E31 : 0xB7);
+
+		const canUseHalfwidthRightwardsArrow = this._options.canUseHalfwidthRightwardsArrow;
+
+		let result: string = '';
+
+		let lineIsEmptyOrWhitespace = false;
+		let firstNonWhitespaceIndex = strings.firstNonWhitespaceIndex(lineContent);
+		let lastNonWhitespaceIndex: number;
+		if (firstNonWhitespaceIndex === -1) {
+			lineIsEmptyOrWhitespace = true;
+			firstNonWhitespaceIndex = len;
+			lastNonWhitespaceIndex = len;
+		} else {
+			lastNonWhitespaceIndex = strings.lastNonWhitespaceIndex(lineContent);
+		}
+
+		let currentSelectionIndex = 0;
+		let currentSelection = selections && selections[currentSelectionIndex];
+		let maxLeft = 0;
+
+		for (let charIndex = fauxIndentLength; charIndex < len; charIndex++) {
+			const chCode = lineContent.charCodeAt(charIndex);
+
+			if (currentSelection && charIndex >= currentSelection.endOffset) {
+				currentSelectionIndex++;
+				currentSelection = selections && selections[currentSelectionIndex];
+			}
+
+			if (chCode !== CharCode.Tab && chCode !== CharCode.Space) {
+				continue;
+			}
+
+			if (onlyTrailing && !lineIsEmptyOrWhitespace && charIndex <= lastNonWhitespaceIndex) {
+				// If rendering only trailing whitespace, check that the charIndex points to trailing whitespace.
+				continue;
+			}
+
+			if (onlyBoundary && charIndex >= firstNonWhitespaceIndex && charIndex <= lastNonWhitespaceIndex && chCode === CharCode.Space) {
+				// rendering only boundary whitespace
+				const prevChCode = (charIndex - 1 >= 0 ? lineContent.charCodeAt(charIndex - 1) : CharCode.Null);
+				const nextChCode = (charIndex + 1 < len ? lineContent.charCodeAt(charIndex + 1) : CharCode.Null);
+				if (prevChCode !== CharCode.Space && nextChCode !== CharCode.Space) {
+					continue;
+				}
+			}
+
+			if (onlyBoundary && continuesWithWrappedLine && charIndex === len - 1) {
+				const prevCharCode = (charIndex - 1 >= 0 ? lineContent.charCodeAt(charIndex - 1) : CharCode.Null);
+				const isSingleTrailingSpace = (chCode === CharCode.Space && (prevCharCode !== CharCode.Space && prevCharCode !== CharCode.Tab));
+				if (isSingleTrailingSpace) {
+					continue;
+				}
+			}
+
+			if (selections && (!currentSelection || currentSelection.startOffset > charIndex || currentSelection.endOffset <= charIndex)) {
+				// If rendering whitespace on selection, check that the charIndex falls within a selection
+				continue;
+			}
+
+			const visibleRange = ctx.visibleRangeForPosition(new Position(lineNumber, charIndex + 1));
+			if (!visibleRange) {
+				continue;
+			}
+
+			if (USE_SVG) {
+				maxLeft = Math.max(maxLeft, visibleRange.left);
+				if (chCode === CharCode.Tab) {
+					result += this._renderArrow(lineHeight, spaceWidth, visibleRange.left);
+				} else {
+					result += `<circle cx="${(visibleRange.left + spaceWidth / 2).toFixed(2)}" cy="${(lineHeight / 2).toFixed(2)}" r="${(spaceWidth / 7).toFixed(2)}" />`;
+				}
+			} else {
+				if (chCode === CharCode.Tab) {
+					result += `<div class="mwh" style="left:${visibleRange.left}px;height:${lineHeight}px;">${canUseHalfwidthRightwardsArrow ? String.fromCharCode(0xFFEB) : String.fromCharCode(0x2192)}</div>`;
+				} else {
+					result += `<div class="mwh" style="left:${visibleRange.left}px;height:${lineHeight}px;">${String.fromCharCode(renderSpaceCharCode)}</div>`;
+				}
+			}
+		}
+
+		if (USE_SVG) {
+			maxLeft = Math.round(maxLeft + spaceWidth);
+			return (
+				`<svg style="position:absolute;width:${maxLeft}px;height:${lineHeight}px" viewBox="0 0 ${maxLeft} ${lineHeight}" xmlns="http://www.w3.org/2000/svg" fill="${color}">`
+				+ result
+				+ `</svg>`
+			);
+		}
+
+		return result;
+	}
+
+	private _renderArrow(lineHeight: number, spaceWidth: number, left: number): string {
+		const strokeWidth = spaceWidth / 7;
+		const width = spaceWidth;
+		const dy = lineHeight / 2;
+		const dx = left;
+
+		const p1 = { x: 0, y: strokeWidth / 2 };
+		const p2 = { x: 100 / 125 * width, y: p1.y };
+		const p3 = { x: p2.x - 0.2 * p2.x, y: p2.y + 0.2 * p2.x };
+		const p4 = { x: p3.x + 0.1 * p2.x, y: p3.y + 0.1 * p2.x };
+		const p5 = { x: p4.x + 0.35 * p2.x, y: p4.y - 0.35 * p2.x };
+		const p6 = { x: p5.x, y: -p5.y };
+		const p7 = { x: p4.x, y: -p4.y };
+		const p8 = { x: p3.x, y: -p3.y };
+		const p9 = { x: p2.x, y: -p2.y };
+		const p10 = { x: p1.x, y: -p1.y };
+
+		const p = [p1, p2, p3, p4, p5, p6, p7, p8, p9, p10];
+		const parts = p.map((p) => `${(dx + p.x).toFixed(2)} ${(dy + p.y).toFixed(2)}`).join(' L ');
+		return `<path d="M ${parts}" />`;
+	}
+
+	public render(startLineNumber: number, lineNumber: number): string {
+		if (!this._renderResult) {
+			return '';
+		}
+		const lineIndex = lineNumber - startLineNumber;
+		if (lineIndex < 0 || lineIndex >= this._renderResult.length) {
+			return '';
+		}
+		return this._renderResult[lineIndex];
+	}
+}
+
+class WhitespaceOptions {
+
+	public readonly renderWhitespace: 'none' | 'boundary' | 'selection' | 'trailing' | 'all';
+	public readonly renderWithSVG: boolean;
+	public readonly spaceWidth: number;
+	public readonly middotWidth: number;
+	public readonly wsmiddotWidth: number;
+	public readonly canUseHalfwidthRightwardsArrow: boolean;
+	public readonly lineHeight: number;
+	public readonly stopRenderingLineAfter: number;
+
+	constructor(config: IEditorConfiguration) {
+		const options = config.options;
+		const fontInfo = options.get(EditorOption.fontInfo);
+		const experimentalWhitespaceRendering = options.get(EditorOption.experimentalWhitespaceRendering);
+		if (experimentalWhitespaceRendering === 'off') {
+			// whitespace is rendered in the view line
+			this.renderWhitespace = 'none';
+			this.renderWithSVG = false;
+		} else if (experimentalWhitespaceRendering === 'svg') {
+			this.renderWhitespace = options.get(EditorOption.renderWhitespace);
+			this.renderWithSVG = true;
+		} else {
+			this.renderWhitespace = options.get(EditorOption.renderWhitespace);
+			this.renderWithSVG = false;
+		}
+		this.spaceWidth = fontInfo.spaceWidth;
+		this.middotWidth = fontInfo.middotWidth;
+		this.wsmiddotWidth = fontInfo.wsmiddotWidth;
+		this.canUseHalfwidthRightwardsArrow = fontInfo.canUseHalfwidthRightwardsArrow;
+		this.lineHeight = options.get(EditorOption.lineHeight);
+		this.stopRenderingLineAfter = options.get(EditorOption.stopRenderingLineAfter);
+	}
+
+	public equals(other: WhitespaceOptions): boolean {
+		return (
+			this.renderWhitespace === other.renderWhitespace
+			&& this.renderWithSVG === other.renderWithSVG
+			&& this.spaceWidth === other.spaceWidth
+			&& this.middotWidth === other.middotWidth
+			&& this.wsmiddotWidth === other.wsmiddotWidth
+			&& this.canUseHalfwidthRightwardsArrow === other.canUseHalfwidthRightwardsArrow
+			&& this.lineHeight === other.lineHeight
+			&& this.stopRenderingLineAfter === other.stopRenderingLineAfter
+		);
+	}
+}
diff --git a/src/vs/editor/browser/widget/codeEditorWidget.ts b/src/vs/editor/browser/widget/codeEditorWidget.ts
index 610d2b0547c7aa..f4bc9a7a30dfd6 100644
--- a/src/vs/editor/browser/widget/codeEditorWidget.ts
+++ b/src/vs/editor/browser/widget/codeEditorWidget.ts
@@ -1394,6 +1394,13 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 		this._modelData.view.delegateVerticalScrollbarPointerDown(browserEvent);
 	}
 
+	public delegateScrollFromMouseWheelEvent(browserEvent: IMouseWheelEvent) {
+		if (!this._modelData || !this._modelData.hasRealView) {
+			return;
+		}
+		this._modelData.view.delegateScrollFromMouseWheelEvent(browserEvent);
+	}
+
 	public layout(dimension?: IDimension): void {
 		this._configuration.observeContainer(dimension);
 		this.render();
@@ -1618,7 +1625,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 					if (e.reachedMaxCursorCount) {
 
 						const multiCursorLimit = this.getOption(EditorOption.multiCursorLimit);
-						const message = nls.localize('cursors.maximum', "The number of cursors has been limited to {0}. Consider using [find and replace](https://code.visualstudio.com/docs/editor/codebasics#_find-and-replace) for larger changes.", multiCursorLimit);
+						const message = nls.localize('cursors.maximum', "The number of cursors has been limited to {0}. Consider using [find and replace](https://code.visualstudio.com/docs/editor/codebasics#_find-and-replace) for larger changes or increase the editor multi cursor limit setting.", multiCursorLimit);
 						this._notificationService.prompt(Severity.Warning, message, [
 							{
 								label: 'Find and Replace',
@@ -1627,7 +1634,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 								}
 							},
 							{
-								label: nls.localize('goToSetting', 'Open Settings'),
+								label: nls.localize('goToSetting', 'Increase Multi Cursor Limit'),
 								run: () => {
 									this._commandService.executeCommand('workbench.action.openSettings2', {
 										query: 'editor.multiCursorLimit'
diff --git a/src/vs/editor/browser/widget/diffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditorWidget.ts
index 0f4a52681a0765..dde0947c63c9da 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget.ts
@@ -5,6 +5,7 @@
 
 import * as dom from 'vs/base/browser/dom';
 import { createFastDomNode, FastDomNode } from 'vs/base/browser/fastDomNode';
+import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
 import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from 'vs/base/browser/ui/mouseCursor/mouseCursor';
 import { ISashEvent, IVerticalSashLayoutProvider, Orientation, Sash, SashState } from 'vs/base/browser/ui/sash/sash';
 import * as assert from 'vs/base/common/assert';
@@ -53,9 +54,8 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IEditorProgressService, IProgressRunner } from 'vs/platform/progress/common/progress';
-import { defaultInsertColor, defaultRemoveColor, diffDiagonalFill, diffInserted, diffInsertedOutline, diffOverviewRulerInserted, diffOverviewRulerRemoved, diffRemoved, diffRemovedOutline } from 'vs/platform/theme/common/colorRegistry';
+import { defaultInsertColor, defaultRemoveColor, diffDiagonalFill, diffInserted, diffOverviewRulerInserted, diffOverviewRulerRemoved, diffRemoved } from 'vs/platform/theme/common/colorRegistry';
 import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { isHighContrast } from 'vs/platform/theme/common/theme';
 import { getThemeTypeSelector, IColorTheme, IThemeService, registerThemingParticipant, ThemeIcon } from 'vs/platform/theme/common/themeService';
 
 export interface IDiffCodeEditorWidgetOptions {
@@ -309,6 +309,9 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 		this._register(dom.addStandardDisposableListener(this._overviewDomElement, dom.EventType.POINTER_DOWN, (e) => {
 			this._modifiedEditor.delegateVerticalScrollbarPointerDown(e);
 		}));
+		this._register(dom.addDisposableListener(this._overviewDomElement, dom.EventType.MOUSE_WHEEL, (e: IMouseWheelEvent) => {
+			this._modifiedEditor.delegateScrollFromMouseWheelEvent(e);
+		}, { passive: false }));
 		if (this._options.renderOverviewRuler) {
 			this._containerDomElement.appendChild(this._overviewDomElement);
 		}
@@ -2754,16 +2757,6 @@ function changedDiffEditorOptions(a: ValidDiffEditorBaseOptions, b: ValidDiffEdi
 }
 
 registerThemingParticipant((theme, collector) => {
-	const addedOutline = theme.getColor(diffInsertedOutline);
-	if (addedOutline) {
-		collector.addRule(`.monaco-editor .line-insert, .monaco-editor .char-insert { border: 1px ${isHighContrast(theme.type) ? 'dashed' : 'solid'} ${addedOutline}; }`);
-	}
-
-	const removedOutline = theme.getColor(diffRemovedOutline);
-	if (removedOutline) {
-		collector.addRule(`.monaco-editor .line-delete, .monaco-editor .char-delete { border: 1px ${isHighContrast(theme.type) ? 'dashed' : 'solid'} ${removedOutline}; }`);
-	}
-
 	const diffDiagonalFillColor = theme.getColor(diffDiagonalFill);
 	collector.addRule(`
 	.monaco-editor .diagonal-fill {
diff --git a/src/vs/editor/browser/widget/diffNavigator.ts b/src/vs/editor/browser/widget/diffNavigator.ts
index 6c4cd6f02e2d2e..fe0aeb2b1f56f3 100644
--- a/src/vs/editor/browser/widget/diffNavigator.ts
+++ b/src/vs/editor/browser/widget/diffNavigator.ts
@@ -23,12 +23,14 @@ export interface Options {
 	followsCaret?: boolean;
 	ignoreCharChanges?: boolean;
 	alwaysRevealFirst?: boolean;
+	findResultLoop?: boolean;
 }
 
 const defaultOptions: Options = {
 	followsCaret: true,
 	ignoreCharChanges: true,
-	alwaysRevealFirst: true
+	alwaysRevealFirst: true,
+	findResultLoop: true
 };
 
 export interface IDiffNavigator {
@@ -216,13 +218,31 @@ export class DiffNavigator extends Disposable implements IDiffNavigator {
 	}
 
 	next(scrollType: ScrollType = ScrollType.Smooth): void {
+		if (!this.canNavigateNext()) {
+			return;
+		}
 		this._move(true, scrollType);
 	}
 
 	previous(scrollType: ScrollType = ScrollType.Smooth): void {
+		if (!this.canNavigatePrevious()) {
+			return;
+		}
 		this._move(false, scrollType);
 	}
 
+	canNavigateNext(): boolean {
+		return this.canNavigateLoop() || this.nextIdx < this.ranges.length - 1;
+	}
+
+	canNavigatePrevious(): boolean {
+		return this.canNavigateLoop() || this.nextIdx !== 0;
+	}
+
+	canNavigateLoop(): boolean {
+		return Boolean(this._options.findResultLoop);
+	}
+
 	override dispose(): void {
 		super.dispose();
 		this.ranges = [];
diff --git a/src/vs/editor/browser/widget/media/diffEditor.css b/src/vs/editor/browser/widget/media/diffEditor.css
index ab719a0d531045..66fa2b5ab83a1f 100644
--- a/src/vs/editor/browser/widget/media/diffEditor.css
+++ b/src/vs/editor/browser/widget/media/diffEditor.css
@@ -84,6 +84,26 @@
 	background-color: var(--vscode-diffEditor-insertedLineBackground, --vscode-diffEditor-insertedTextBackground);
 }
 
+.monaco-editor .line-insert,
+.monaco-editor .char-insert {
+	box-sizing: border-box;
+	border: 1px solid var(--vscode-diffEditor-insertedTextBorder);
+}
+.monaco-editor.hc-black .line-insert, .monaco-editor.hc-light .line-insert,
+.monaco-editor.hc-black .char-insert, .monaco-editor.hc-light .char-insert {
+	border-style: dashed;
+}
+
+.monaco-editor .line-delete,
+.monaco-editor .char-delete {
+	box-sizing: border-box;
+	border: 1px solid var(--vscode-diffEditor-removedTextBorder);
+}
+.monaco-editor.hc-black .line-delete, .monaco-editor.hc-light .line-delete,
+.monaco-editor.hc-black .char-delete, .monaco-editor.hc-light .char-delete {
+	border-style: dashed;
+}
+
 .monaco-editor .inline-added-margin-view-zone,
 .monaco-editor .gutter-insert, .monaco-diff-editor .gutter-insert {
 	background-color: var(--vscode-diffEditorGutter-insertedLineBackground, --vscode-diffEditor-insertedLineBackground, --vscode-diffEditor-insertedTextBackground);
diff --git a/src/vs/editor/browser/widget/media/editor.css b/src/vs/editor/browser/widget/media/editor.css
index 0e6fd264116fd5..1d60940158ad4e 100644
--- a/src/vs/editor/browser/widget/media/editor.css
+++ b/src/vs/editor/browser/widget/media/editor.css
@@ -29,9 +29,19 @@
 }
 .monaco-editor .rangeHighlight {
 	background-color: var(--vscode-editor-rangeHighlightBackground);
+	box-sizing: border-box;
+	border: 1px solid var(--vscode-editor-rangeHighlightBorder);
+}
+.monaco-editor.hc-black .rangeHighlight, .monaco-editor.hc-light .rangeHighlight {
+	border-style: dotted;
 }
 .monaco-editor .symbolHighlight {
 	background-color: var(--vscode-editor-symbolHighlightBackground);
+	box-sizing: border-box;
+	border: 1px solid var(--vscode-editor-symbolHighlightBorder);
+}
+.monaco-editor.hc-black .symbolHighlight, .monaco-editor.hc-light .symbolHighlight {
+	border-style: dotted;
 }
 
 /* -------------------- Misc -------------------- */
diff --git a/src/vs/editor/common/config/editorConfigurationSchema.ts b/src/vs/editor/common/config/editorConfigurationSchema.ts
index b6f8d6ad7fac00..965205f5c5c9f1 100644
--- a/src/vs/editor/common/config/editorConfigurationSchema.ts
+++ b/src/vs/editor/common/config/editorConfigurationSchema.ts
@@ -38,7 +38,7 @@ const editorConfiguration: IConfigurationNode = {
 				}
 			],
 			default: 'tabSize',
-			markdownDescription: nls.localize('indentSize', "The number of spaces used for indentation or 'tabSize' to use the value from `#editor.tabSize#`. This setting is overridden based on the file contents when `#editor.detectIndentation#` is on.")
+			markdownDescription: nls.localize('indentSize', "The number of spaces used for indentation or `\"tabSize\"` to use the value from `#editor.tabSize#`. This setting is overridden based on the file contents when `#editor.detectIndentation#` is on.")
 		},
 		'editor.insertSpaces': {
 			type: 'boolean',
@@ -88,7 +88,7 @@ const editorConfiguration: IConfigurationNode = {
 		'editor.stablePeek': {
 			type: 'boolean',
 			default: false,
-			markdownDescription: nls.localize('stablePeek', "Keep peek editors open even when double clicking their content or when hitting `Escape`.")
+			markdownDescription: nls.localize('stablePeek', "Keep peek editors open even when double-clicking their content or when hitting `Escape`.")
 		},
 		'editor.maxTokenizationLineLength': {
 			type: 'integer',
diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index 2cc00e7d02e4de..8e6c0c2e35163d 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -97,9 +97,9 @@ export interface IEditorOptions {
 	cursorSurroundingLinesStyle?: 'default' | 'all';
 	/**
 	 * Render last line number when the file ends with a newline.
-	 * Defaults to true.
+	 * Defaults to 'on' for Windows and macOS and 'dimmed' for Linux.
 	*/
-	renderFinalNewline?: boolean;
+	renderFinalNewline?: 'on' | 'off' | 'dimmed';
 	/**
 	 * Remove unusual line terminators like LINE SEPARATOR (LS), PARAGRAPH SEPARATOR (PS).
 	 * Defaults to 'prompt'.
@@ -214,9 +214,9 @@ export interface IEditorOptions {
 	mouseStyle?: 'text' | 'default' | 'copy';
 	/**
 	 * Enable smooth caret animation.
-	 * Defaults to false.
+	 * Defaults to 'off'.
 	 */
-	cursorSmoothCaretAnimation?: boolean;
+	cursorSmoothCaretAnimation?: 'off' | 'explicit' | 'on';
 	/**
 	 * Control the cursor style, either 'block' or 'line'.
 	 * Defaults to 'line'.
@@ -341,6 +341,10 @@ export interface IEditorOptions {
 	 * Enable inline color decorators and color picker rendering.
 	 */
 	colorDecorators?: boolean;
+	/**
+	 * Controls the max number of color decorators that can be rendered in an editor at once.
+	 */
+	colorDecoratorsLimit?: number;
 	/**
 	 * Control the behaviour of comments in the editor.
 	 */
@@ -593,6 +597,11 @@ export interface IEditorOptions {
 	 * Defaults to 'always'.
 	 */
 	matchBrackets?: 'never' | 'near' | 'always';
+	/**
+	 * Enable experimental whitespace rendering.
+	 * Defaults to 'svg'.
+	 */
+	experimentalWhitespaceRendering?: 'svg' | 'font' | 'off';
 	/**
 	 * Enable rendering of whitespace.
 	 * Defaults to 'selection'.
@@ -620,7 +629,7 @@ export interface IEditorOptions {
 	/**
 	 * The font family
 	 */
-	fontFamily?: string | string[];
+	fontFamily?: string;
 	/**
 	 * The font weight
 	 */
@@ -1193,13 +1202,13 @@ class EditorAccessibilitySupport extends BaseEditorOption<EditorOption.accessibi
 				type: 'string',
 				enum: ['auto', 'on', 'off'],
 				enumDescriptions: [
-					nls.localize('accessibilitySupport.auto', "The editor will use platform APIs to detect when a Screen Reader is attached."),
-					nls.localize('accessibilitySupport.on', "The editor will be permanently optimized for usage with a Screen Reader. Word wrapping will be disabled."),
-					nls.localize('accessibilitySupport.off', "The editor will never be optimized for usage with a Screen Reader."),
+					nls.localize('accessibilitySupport.auto', "Use platform APIs to detect when a Screen Reader is attached"),
+					nls.localize('accessibilitySupport.on', "Optimize for usage with a Screen Reader"),
+					nls.localize('accessibilitySupport.off', "Assume a screen reader is not attached"),
 				],
 				default: 'auto',
 				tags: ['accessibility'],
-				description: nls.localize('accessibilitySupport', "Controls whether the editor should run in a mode where it is optimized for screen readers.")
+				description: nls.localize('accessibilitySupport', "Controls if the UI should run in a mode where it is optimized for screen readers.")
 			}
 		);
 	}
@@ -1470,7 +1479,7 @@ export interface IEditorFindOptions {
 	 */
 	globalFindClipboard?: boolean;
 	/**
-	 * Controls whether the search automatically restarts from the beginning (or the end) when no further matches can be found
+	 * Controls whether the search result and diff result automatically restarts from the beginning (or the end) when no further matches can be found
 	 */
 	loop?: boolean;
 }
@@ -1616,44 +1625,6 @@ export class EditorFontLigatures extends BaseEditorOption<EditorOption.fontLigat
 
 //#endregion
 
-//#region fontFamily
-/**
- * @internal
- */
-export class EditorFontFamily extends BaseEditorOption<EditorOption.fontFamily, string | string[], string> {
-	constructor() {
-		super(
-			EditorOption.fontFamily, 'fontFamily', EDITOR_FONT_DEFAULTS.fontFamily,
-			{
-				anyOf: [
-					{
-						type: 'string',
-					},
-					{
-						type: 'array',
-						items: {
-							type: 'string',
-						},
-					}
-				],
-				description: nls.localize('fontFamily', "Controls the font family."),
-				default: EDITOR_FONT_DEFAULTS.fontFamily
-			}
-		);
-	}
-	public validate(input: any): string {
-		if (typeof input === 'string') {
-			return input;
-		}
-		if (Array.isArray(input) && input.length > 0) {
-			return input.map((f: string) => { return JSON.stringify(f); }).join(',');
-		}
-		return this.defaultValue;
-	}
-}
-
-//#endregion
-
 //#region fontVariations
 
 /**
@@ -2208,6 +2179,8 @@ export interface IMinimapLayoutInput {
 	readonly typicalHalfwidthCharacterWidth: number;
 	readonly pixelRatio: number;
 	readonly scrollBeyondLastLine: boolean;
+	readonly paddingTop: number;
+	readonly paddingBottom: number;
 	readonly minimap: Readonly<Required<IEditorMinimapOptions>>;
 	readonly verticalScrollbarWidth: number;
 	readonly viewLineCount: number;
@@ -2242,15 +2215,21 @@ export class EditorLayoutInfoComputer extends ComputedEditorOption<EditorOption.
 	public static computeContainedMinimapLineCount(input: {
 		viewLineCount: number;
 		scrollBeyondLastLine: boolean;
+		paddingTop: number;
+		paddingBottom: number;
 		height: number;
 		lineHeight: number;
 		pixelRatio: number;
-	}): { typicalViewportLineCount: number; extraLinesBeyondLastLine: number; desiredRatio: number; minimapLineCount: number } {
+	}): { typicalViewportLineCount: number; extraLinesBeforeFirstLine: number; extraLinesBeyondLastLine: number; desiredRatio: number; minimapLineCount: number } {
 		const typicalViewportLineCount = input.height / input.lineHeight;
-		const extraLinesBeyondLastLine = input.scrollBeyondLastLine ? (typicalViewportLineCount - 1) : 0;
-		const desiredRatio = (input.viewLineCount + extraLinesBeyondLastLine) / (input.pixelRatio * input.height);
+		const extraLinesBeforeFirstLine = Math.floor(input.paddingTop / input.lineHeight);
+		let extraLinesBeyondLastLine = Math.floor(input.paddingBottom / input.lineHeight);
+		if (input.scrollBeyondLastLine) {
+			extraLinesBeyondLastLine = Math.max(extraLinesBeyondLastLine, typicalViewportLineCount - 1);
+		}
+		const desiredRatio = (extraLinesBeforeFirstLine + input.viewLineCount + extraLinesBeyondLastLine) / (input.pixelRatio * input.height);
 		const minimapLineCount = Math.floor(input.viewLineCount / desiredRatio);
-		return { typicalViewportLineCount, extraLinesBeyondLastLine, desiredRatio, minimapLineCount };
+		return { typicalViewportLineCount, extraLinesBeforeFirstLine, extraLinesBeyondLastLine, desiredRatio, minimapLineCount };
 	}
 
 	private static _computeMinimapLayout(input: IMinimapLayoutInput, memory: ComputeOptionsMemory): EditorMinimapLayoutInfo {
@@ -2284,6 +2263,8 @@ export class EditorLayoutInfoComputer extends ComputedEditorOption<EditorOption.
 			&& input.typicalHalfwidthCharacterWidth === stableMinimapLayoutInput.typicalHalfwidthCharacterWidth
 			&& input.pixelRatio === stableMinimapLayoutInput.pixelRatio
 			&& input.scrollBeyondLastLine === stableMinimapLayoutInput.scrollBeyondLastLine
+			&& input.paddingTop === stableMinimapLayoutInput.paddingTop
+			&& input.paddingBottom === stableMinimapLayoutInput.paddingBottom
 			&& input.minimap.enabled === stableMinimapLayoutInput.minimap.enabled
 			&& input.minimap.side === stableMinimapLayoutInput.minimap.side
 			&& input.minimap.size === stableMinimapLayoutInput.minimap.size
@@ -2320,9 +2301,11 @@ export class EditorLayoutInfoComputer extends ComputedEditorOption<EditorOption.
 		let minimapWidthMultiplier: number = 1;
 
 		if (minimapSize === 'fill' || minimapSize === 'fit') {
-			const { typicalViewportLineCount, extraLinesBeyondLastLine, desiredRatio, minimapLineCount } = EditorLayoutInfoComputer.computeContainedMinimapLineCount({
+			const { typicalViewportLineCount, extraLinesBeforeFirstLine, extraLinesBeyondLastLine, desiredRatio, minimapLineCount } = EditorLayoutInfoComputer.computeContainedMinimapLineCount({
 				viewLineCount: viewLineCount,
 				scrollBeyondLastLine: scrollBeyondLastLine,
+				paddingTop: input.paddingTop,
+				paddingBottom: input.paddingBottom,
 				height: outerHeight,
 				lineHeight: lineHeight,
 				pixelRatio: pixelRatio
@@ -2342,7 +2325,7 @@ export class EditorLayoutInfoComputer extends ComputedEditorOption<EditorOption.
 				let maxMinimapScale = minimapScale + 1;
 
 				if (minimapSize === 'fit') {
-					const effectiveMinimapHeight = Math.ceil((viewLineCount + extraLinesBeyondLastLine) * minimapLineHeight);
+					const effectiveMinimapHeight = Math.ceil((extraLinesBeforeFirstLine + viewLineCount + extraLinesBeyondLastLine) * minimapLineHeight);
 					if (isViewportWrapping && couldUseMemory && remainingWidth <= memory.stableFitRemainingWidth) {
 						// There is a loop when using `fit` and viewport wrapping:
 						// - view line count impacts minimap layout
@@ -2373,7 +2356,7 @@ export class EditorLayoutInfoComputer extends ComputedEditorOption<EditorOption.
 						minimapWidthMultiplier = Math.min(2, minimapScale / configuredMinimapScale);
 					}
 					minimapCharWidth = minimapScale / pixelRatio / minimapWidthMultiplier;
-					minimapCanvasInnerHeight = Math.ceil((Math.max(typicalViewportLineCount, viewLineCount + extraLinesBeyondLastLine)) * minimapLineHeight);
+					minimapCanvasInnerHeight = Math.ceil((Math.max(typicalViewportLineCount, extraLinesBeforeFirstLine + viewLineCount + extraLinesBeyondLastLine)) * minimapLineHeight);
 					if (isViewportWrapping) {
 						// remember for next time
 						memory.stableMinimapLayoutInput = input;
@@ -2446,6 +2429,7 @@ export class EditorLayoutInfoComputer extends ComputedEditorOption<EditorOption.
 		const showLineNumbers = (options.get(EditorOption.lineNumbers).renderType !== RenderLineNumbersType.Off);
 		const lineNumbersMinChars = options.get(EditorOption.lineNumbersMinChars);
 		const scrollBeyondLastLine = options.get(EditorOption.scrollBeyondLastLine);
+		const padding = options.get(EditorOption.padding);
 		const minimap = options.get(EditorOption.minimap);
 
 		const scrollbar = options.get(EditorOption.scrollbar);
@@ -2501,6 +2485,8 @@ export class EditorLayoutInfoComputer extends ComputedEditorOption<EditorOption.
 			typicalHalfwidthCharacterWidth: typicalHalfwidthCharacterWidth,
 			pixelRatio: pixelRatio,
 			scrollBeyondLastLine: scrollBeyondLastLine,
+			paddingTop: padding.top,
+			paddingBottom: padding.bottom,
 			minimap: minimap,
 			verticalScrollbarWidth: verticalScrollbarWidth,
 			viewLineCount: viewLineCount,
@@ -4277,6 +4263,11 @@ class EditorSuggest extends BaseEditorOption<EditorOption.suggest, ISuggestOptio
 					default: defaults.shareSuggestSelections,
 					markdownDescription: nls.localize('suggest.shareSuggestSelections', "Controls whether remembered suggestion selections are shared between multiple workspaces and windows (needs `#editor.suggestSelection#`).")
 				},
+				'editor.suggest.selectQuickSuggestions': {
+					type: 'boolean',
+					default: defaults.selectQuickSuggestions,
+					markdownDescription: nls.localize('suggest.selectQuickSuggestions', "Controls whether the suggest widget becomes active when triggered via quick suggest or trigger characters.")
+				},
 				'editor.suggest.snippetsPreventQuickSuggestions': {
 					type: 'boolean',
 					default: defaults.snippetsPreventQuickSuggestions,
@@ -4765,6 +4756,7 @@ export const enum EditorOption {
 	codeLensFontFamily,
 	codeLensFontSize,
 	colorDecorators,
+	colorDecoratorsLimit,
 	columnSelection,
 	comments,
 	contextmenu,
@@ -4781,6 +4773,7 @@ export const enum EditorOption {
 	dragAndDrop,
 	dropIntoEditor,
 	emptySelectionClipboard,
+	experimentalWhitespaceRendering,
 	extraEditorClassName,
 	fastScrollSensitivity,
 	find,
@@ -5027,6 +5020,12 @@ export const EditorOptions = {
 		EditorOption.colorDecorators, 'colorDecorators', true,
 		{ description: nls.localize('colorDecorators', "Controls whether the editor should render the inline color decorators and color picker.") }
 	)),
+	colorDecoratorsLimit: register(new EditorIntOption(
+		EditorOption.colorDecoratorsLimit, 'colorDecoratorsLimit', 500, 1, 1000000,
+		{
+			markdownDescription: nls.localize('colorDecoratorsLimit', "Controls the max number of color decorators that can be rendered in an editor at once.")
+		}
+	)),
 	columnSelection: register(new EditorBooleanOption(
 		EditorOption.columnSelection, 'columnSelection', false,
 		{ description: nls.localize('columnSelection', "Enable that the selection with the mouse and keys is doing column selection.") }
@@ -5046,9 +5045,18 @@ export const EditorOptions = {
 		_cursorBlinkingStyleFromString,
 		{ description: nls.localize('cursorBlinking', "Control the cursor animation style.") }
 	)),
-	cursorSmoothCaretAnimation: register(new EditorBooleanOption(
-		EditorOption.cursorSmoothCaretAnimation, 'cursorSmoothCaretAnimation', false,
-		{ description: nls.localize('cursorSmoothCaretAnimation', "Controls whether the smooth caret animation should be enabled.") }
+	cursorSmoothCaretAnimation: register(new EditorStringEnumOption(
+		EditorOption.cursorSmoothCaretAnimation, 'cursorSmoothCaretAnimation',
+		'off' as 'off' | 'explicit' | 'on',
+		['off', 'explicit', 'on'] as const,
+		{
+			enumDescriptions: [
+				nls.localize('cursorSmoothCaretAnimation.off', "Smooth caret animation is disabled."),
+				nls.localize('cursorSmoothCaretAnimation.explicit', "Smooth caret animation is enabled only when the user moves the cursor with an explicit gesture."),
+				nls.localize('cursorSmoothCaretAnimation.on', "Smooth caret animation is always enabled.")
+			],
+			description: nls.localize('cursorSmoothCaretAnimation', "Controls whether the smooth caret animation should be enabled.")
+		}
 	)),
 	cursorStyle: register(new EditorEnumOption(
 		EditorOption.cursorStyle, 'cursorStyle',
@@ -5060,7 +5068,7 @@ export const EditorOptions = {
 	cursorSurroundingLines: register(new EditorIntOption(
 		EditorOption.cursorSurroundingLines, 'cursorSurroundingLines',
 		0, 0, Constants.MAX_SAFE_SMALL_INTEGER,
-		{ description: nls.localize('cursorSurroundingLines', "Controls the minimal number of visible leading and trailing lines surrounding the cursor. Known as 'scrollOff' or 'scrollOffset' in some other editors.") }
+		{ description: nls.localize('cursorSurroundingLines', "Controls the minimal number of visible leading lines (minimum 0) and trailing lines (minimum 1) surrounding the cursor. Known as 'scrollOff' or 'scrollOffset' in some other editors.") }
 	)),
 	cursorSurroundingLinesStyle: register(new EditorStringEnumOption(
 		EditorOption.cursorSurroundingLinesStyle, 'cursorSurroundingLinesStyle',
@@ -5095,6 +5103,19 @@ export const EditorOptions = {
 	emptySelectionClipboard: register(new EditorEmptySelectionClipboard()),
 	dropIntoEditor: register(new EditorDropIntoEditor()),
 	stickyScroll: register(new EditorStickyScroll()),
+	experimentalWhitespaceRendering: register(new EditorStringEnumOption(
+		EditorOption.experimentalWhitespaceRendering, 'experimentalWhitespaceRendering',
+		'svg' as 'svg' | 'font' | 'off',
+		['svg', 'font', 'off'] as const,
+		{
+			enumDescriptions: [
+				nls.localize('experimentalWhitespaceRendering.svg', "Use a new rendering method with svgs."),
+				nls.localize('experimentalWhitespaceRendering.font', "Use a new rendering method with font characters."),
+				nls.localize('experimentalWhitespaceRendering.off', "Use the stable rendering method."),
+			],
+			description: nls.localize('experimentalWhitespaceRendering', "Controls whether whitespace is rendered with a new, experimental method.")
+		}
+	)),
 	extraEditorClassName: register(new EditorStringOption(
 		EditorOption.extraEditorClassName, 'extraEditorClassName', '',
 	)),
@@ -5140,7 +5161,10 @@ export const EditorOptions = {
 		EditorOption.unfoldOnClickAfterEndOfLine, 'unfoldOnClickAfterEndOfLine', false,
 		{ description: nls.localize('unfoldOnClickAfterEndOfLine', "Controls whether clicking on the empty content after a folded line will unfold the line.") }
 	)),
-	fontFamily: register(new EditorFontFamily()),
+	fontFamily: register(new EditorStringOption(
+		EditorOption.fontFamily, 'fontFamily', EDITOR_FONT_DEFAULTS.fontFamily,
+		{ description: nls.localize('fontFamily', "Controls the font family.") }
+	)),
 	fontInfo: register(new EditorFontInfo()),
 	fontLigatures2: register(new EditorFontLigatures()),
 	fontSize: register(new EditorFontSize()),
@@ -5297,8 +5321,10 @@ export const EditorOptions = {
 		EditorOption.renderControlCharacters, 'renderControlCharacters', true,
 		{ description: nls.localize('renderControlCharacters', "Controls whether the editor should render control characters."), restricted: true }
 	)),
-	renderFinalNewline: register(new EditorBooleanOption(
-		EditorOption.renderFinalNewline, 'renderFinalNewline', true,
+	renderFinalNewline: register(new EditorStringEnumOption(
+		EditorOption.renderFinalNewline, 'renderFinalNewline',
+		(platform.isLinux ? 'dimmed' : 'on') as 'off' | 'on' | 'dimmed',
+		['off', 'on', 'dimmed'] as const,
 		{ description: nls.localize('renderFinalNewline', "Render last line number when the file ends with a newline.") }
 	)),
 	renderLineHighlight: register(new EditorStringEnumOption(
diff --git a/src/vs/editor/common/config/fontInfo.ts b/src/vs/editor/common/config/fontInfo.ts
index f763342b3df5a3..5dafe560d04530 100644
--- a/src/vs/editor/common/config/fontInfo.ts
+++ b/src/vs/editor/common/config/fontInfo.ts
@@ -45,7 +45,7 @@ export class BareFontInfo {
 	/**
 	 * @internal
 	 */
-	public static createFromRawSettings(opts: { fontFamily?: string | string[]; fontWeight?: string; fontSize?: number; fontLigatures?: boolean | string; fontVariations?: boolean | string; lineHeight?: number; letterSpacing?: number }, pixelRatio: number, ignoreEditorZoom: boolean = false): BareFontInfo {
+	public static createFromRawSettings(opts: { fontFamily?: string; fontWeight?: string; fontSize?: number; fontLigatures?: boolean | string; fontVariations?: boolean | string; lineHeight?: number; letterSpacing?: number }, pixelRatio: number, ignoreEditorZoom: boolean = false): BareFontInfo {
 		const fontFamily = EditorOptions.fontFamily.validate(opts.fontFamily);
 		const fontWeight = EditorOptions.fontWeight.validate(opts.fontWeight);
 		const fontSize = EditorOptions.fontSize.validate(opts.fontSize);
diff --git a/src/vs/editor/common/core/editorColorRegistry.ts b/src/vs/editor/common/core/editorColorRegistry.ts
index e4bde9f1ac4d20..30e2cdd1dd49e2 100644
--- a/src/vs/editor/common/core/editorColorRegistry.ts
+++ b/src/vs/editor/common/core/editorColorRegistry.ts
@@ -7,7 +7,6 @@ import * as nls from 'vs/nls';
 import { Color, RGBA } from 'vs/base/common/color';
 import { activeContrastBorder, editorBackground, registerColor, editorWarningForeground, editorInfoForeground, editorWarningBorder, editorInfoBorder, contrastBorder, editorFindMatchHighlight } from 'vs/platform/theme/common/colorRegistry';
 import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { isHighContrast } from 'vs/platform/theme/common/theme';
 
 /**
  * Definition of the editor colors
@@ -28,6 +27,7 @@ export const editorLineNumbers = registerColor('editorLineNumber.foreground', {
 
 const deprecatedEditorActiveLineNumber = registerColor('editorActiveLineNumber.foreground', { dark: '#c6c6c6', light: '#0B216F', hcDark: activeContrastBorder, hcLight: activeContrastBorder }, nls.localize('editorActiveLineNumber', 'Color of editor active line number'), false, nls.localize('deprecatedEditorActiveLineNumber', 'Id is deprecated. Use \'editorLineNumber.activeForeground\' instead.'));
 export const editorActiveLineNumber = registerColor('editorLineNumber.activeForeground', { dark: deprecatedEditorActiveLineNumber, light: deprecatedEditorActiveLineNumber, hcDark: deprecatedEditorActiveLineNumber, hcLight: deprecatedEditorActiveLineNumber }, nls.localize('editorActiveLineNumber', 'Color of editor active line number'));
+export const editorDimmedLineNumber = registerColor('editorLineNumber.dimmedForeground', { dark: null, light: null, hcDark: null, hcLight: null }, nls.localize('editorDimmedLineNumber', 'Color of the final editor line when editor.renderFinalNewline is set to dimmed.'));
 
 export const editorRuler = registerColor('editorRuler.foreground', { dark: '#5A5A5A', light: Color.lightgrey, hcDark: Color.white, hcLight: '#292929' }, nls.localize('editorRuler', 'Color of the editor rulers.'));
 
@@ -77,8 +77,8 @@ export const editorBracketPairGuideActiveBackground4 = registerColor('editorBrac
 export const editorBracketPairGuideActiveBackground5 = registerColor('editorBracketPairGuide.activeBackground5', { dark: '#00000000', light: '#00000000', hcDark: '#00000000', hcLight: '#00000000' }, nls.localize('editorBracketPairGuide.activeBackground5', 'Background color of active bracket pair guides (5). Requires enabling bracket pair guides.'));
 export const editorBracketPairGuideActiveBackground6 = registerColor('editorBracketPairGuide.activeBackground6', { dark: '#00000000', light: '#00000000', hcDark: '#00000000', hcLight: '#00000000' }, nls.localize('editorBracketPairGuide.activeBackground6', 'Background color of active bracket pair guides (6). Requires enabling bracket pair guides.'));
 
-export const editorUnicodeHighlightBorder = registerColor('editorUnicodeHighlight.border', { dark: '#BD9B03', light: '#CEA33D', hcDark: '#ff0000', hcLight: '' }, nls.localize('editorUnicodeHighlight.border', 'Border color used to highlight unicode characters.'));
-export const editorUnicodeHighlightBackground = registerColor('editorUnicodeHighlight.background', { dark: '#bd9b0326', light: '#cea33d14', hcDark: '#00000000', hcLight: '' }, nls.localize('editorUnicodeHighlight.background', 'Background color used to highlight unicode characters.'));
+export const editorUnicodeHighlightBorder = registerColor('editorUnicodeHighlight.border', { dark: '#BD9B03', light: '#CEA33D', hcDark: '#ff0000', hcLight: '#CEA33D' }, nls.localize('editorUnicodeHighlight.border', 'Border color used to highlight unicode characters.'));
+export const editorUnicodeHighlightBackground = registerColor('editorUnicodeHighlight.background', { dark: '#bd9b0326', light: '#cea33d14', hcDark: '#00000000', hcLight: '#cea33d14' }, nls.localize('editorUnicodeHighlight.background', 'Background color used to highlight unicode characters.'));
 
 
 // contains all color rules that used to defined in editor/browser/widget/editor.css
@@ -89,14 +89,4 @@ registerThemingParticipant((theme, collector) => {
 	if (imeBackground) {
 		collector.addRule(`.monaco-editor .inputarea.ime-input { background-color: ${imeBackground}; }`);
 	}
-
-	const rangeHighlightBorder = theme.getColor(editorRangeHighlightBorder);
-	if (rangeHighlightBorder) {
-		collector.addRule(`.monaco-editor .rangeHighlight { border: 1px ${isHighContrast(theme.type) ? 'dotted' : 'solid'} ${rangeHighlightBorder}; }`);
-	}
-
-	const symbolHighlightBorder = theme.getColor(editorSymbolHighlightBorder);
-	if (symbolHighlightBorder) {
-		collector.addRule(`.monaco-editor .symbolHighlight { border: 1px ${isHighContrast(theme.type) ? 'dotted' : 'solid'} ${symbolHighlightBorder}; }`);
-	}
 });
diff --git a/src/vs/editor/common/core/range.ts b/src/vs/editor/common/core/range.ts
index bd6d1791926b71..72396396d1bd53 100644
--- a/src/vs/editor/common/core/range.ts
+++ b/src/vs/editor/common/core/range.ts
@@ -259,14 +259,14 @@ export class Range {
 	/**
 	 * Test if this range equals other.
 	 */
-	public equalsRange(other: IRange | null): boolean {
+	public equalsRange(other: IRange | null | undefined): boolean {
 		return Range.equalsRange(this, other);
 	}
 
 	/**
 	 * Test if range `a` equals `b`.
 	 */
-	public static equalsRange(a: IRange | null, b: IRange | null): boolean {
+	public static equalsRange(a: IRange | null | undefined, b: IRange | null | undefined): boolean {
 		if (!a && !b) {
 			return true;
 		}
@@ -337,17 +337,31 @@ export class Range {
 	}
 
 	/**
-	 * Moves the range by the given amount of lines.
+	 * Create a new empty range using this range's start position.
 	 */
-	public delta(lineCount: number): Range {
-		return new Range(this.startLineNumber + lineCount, this.startColumn, this.endLineNumber + lineCount, this.endColumn);
+	public static collapseToStart(range: IRange): Range {
+		return new Range(range.startLineNumber, range.startColumn, range.startLineNumber, range.startColumn);
 	}
 
 	/**
-	 * Create a new empty range using this range's start position.
+	 * Create a new empty range using this range's end position.
 	 */
-	public static collapseToStart(range: IRange): Range {
-		return new Range(range.startLineNumber, range.startColumn, range.startLineNumber, range.startColumn);
+	public collapseToEnd(): Range {
+		return Range.collapseToEnd(this);
+	}
+
+	/**
+	 * Create a new empty range using this range's end position.
+	 */
+	public static collapseToEnd(range: IRange): Range {
+		return new Range(range.endLineNumber, range.endColumn, range.endLineNumber, range.endColumn);
+	}
+
+	/**
+	 * Moves the range by the given amount of lines.
+	 */
+	public delta(lineCount: number): Range {
+		return new Range(this.startLineNumber + lineCount, this.startColumn, this.endLineNumber + lineCount, this.endColumn);
 	}
 
 	// ---
diff --git a/src/vs/editor/common/cursor/cursor.ts b/src/vs/editor/common/cursor/cursor.ts
index 198208bc594db5..a5be0b58c33112 100644
--- a/src/vs/editor/common/cursor/cursor.ts
+++ b/src/vs/editor/common/cursor/cursor.ts
@@ -402,7 +402,7 @@ export class CursorsController extends Disposable {
 		const viewSelections = this._cursors.getViewSelections();
 
 		// Let the view get the event first.
-		eventsCollector.emitViewEvent(new ViewCursorStateChangedEvent(viewSelections, selections));
+		eventsCollector.emitViewEvent(new ViewCursorStateChangedEvent(viewSelections, selections, reason));
 
 		// Only after the view has been notified, let the rest of the world know...
 		if (!oldState
diff --git a/src/vs/editor/common/cursor/cursorColumnSelection.ts b/src/vs/editor/common/cursor/cursorColumnSelection.ts
index 65602ceb1fec49..e87cf910950995 100644
--- a/src/vs/editor/common/cursor/cursorColumnSelection.ts
+++ b/src/vs/editor/common/cursor/cursorColumnSelection.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CursorConfiguration, ICursorSimpleModel, SingleCursorState, IColumnSelectData } from 'vs/editor/common/cursorCommon';
+import { CursorConfiguration, ICursorSimpleModel, SingleCursorState, IColumnSelectData, SelectionStartKind } from 'vs/editor/common/cursorCommon';
 import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 
@@ -48,7 +48,7 @@ export class ColumnSelection {
 			}
 
 			result.push(new SingleCursorState(
-				new Range(lineNumber, startColumn, lineNumber, startColumn), 0,
+				new Range(lineNumber, startColumn, lineNumber, startColumn), SelectionStartKind.Simple, 0,
 				new Position(lineNumber, endColumn), 0
 			));
 		}
@@ -60,7 +60,7 @@ export class ColumnSelection {
 				const maxColumn = model.getLineMaxColumn(lineNumber);
 
 				result.push(new SingleCursorState(
-					new Range(lineNumber, maxColumn, lineNumber, maxColumn), 0,
+					new Range(lineNumber, maxColumn, lineNumber, maxColumn), SelectionStartKind.Simple, 0,
 					new Position(lineNumber, maxColumn), 0
 				));
 			}
diff --git a/src/vs/editor/common/cursor/cursorMoveCommands.ts b/src/vs/editor/common/cursor/cursorMoveCommands.ts
index 4c51a670f85708..6bc30328cb7da2 100644
--- a/src/vs/editor/common/cursor/cursorMoveCommands.ts
+++ b/src/vs/editor/common/cursor/cursorMoveCommands.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as types from 'vs/base/common/types';
-import { CursorState, ICursorSimpleModel, PartialCursorState, SingleCursorState } from 'vs/editor/common/cursorCommon';
+import { CursorState, ICursorSimpleModel, PartialCursorState, SelectionStartKind, SingleCursorState } from 'vs/editor/common/cursorCommon';
 import { MoveOperations } from 'vs/editor/common/cursor/cursorMoveOperations';
 import { WordOperations } from 'vs/editor/common/cursor/cursorWordOperations';
 import { IPosition, Position } from 'vs/editor/common/core/position';
@@ -138,7 +138,7 @@ export class CursorMoveCommands {
 			}
 
 			result[i] = CursorState.fromModelState(new SingleCursorState(
-				new Range(startLineNumber, 1, startLineNumber, 1), 0,
+				new Range(startLineNumber, 1, startLineNumber, 1), SelectionStartKind.Simple, 0,
 				new Position(endLineNumber, endColumn), 0
 			));
 		}
@@ -168,7 +168,7 @@ export class CursorMoveCommands {
 		const maxColumn = viewModel.model.getLineMaxColumn(lineCount);
 
 		return CursorState.fromModelState(new SingleCursorState(
-			new Range(1, 1, 1, 1), 0,
+			new Range(1, 1, 1, 1), SelectionStartKind.Simple, 0,
 			new Position(lineCount, maxColumn), 0
 		));
 	}
@@ -181,7 +181,7 @@ export class CursorMoveCommands {
 				: viewModel.coordinatesConverter.convertModelPositionToViewPosition(position)
 		);
 
-		if (!inSelectionMode || !cursor.modelState.hasSelection()) {
+		if (!inSelectionMode) {
 			// Entering line selection for the first time
 			const lineCount = viewModel.model.getLineCount();
 
@@ -193,7 +193,7 @@ export class CursorMoveCommands {
 			}
 
 			return CursorState.fromModelState(new SingleCursorState(
-				new Range(position.lineNumber, 1, selectToLineNumber, selectToColumn), 0,
+				new Range(position.lineNumber, 1, selectToLineNumber, selectToColumn), SelectionStartKind.Line, 0,
 				new Position(selectToLineNumber, selectToColumn), 0
 			));
 		}
@@ -204,7 +204,7 @@ export class CursorMoveCommands {
 		if (position.lineNumber < enteringLineNumber) {
 
 			return CursorState.fromViewState(cursor.viewState.move(
-				cursor.modelState.hasSelection(), viewPosition.lineNumber, 1, 0
+				true, viewPosition.lineNumber, 1, 0
 			));
 
 		} else if (position.lineNumber > enteringLineNumber) {
@@ -219,14 +219,14 @@ export class CursorMoveCommands {
 			}
 
 			return CursorState.fromViewState(cursor.viewState.move(
-				cursor.modelState.hasSelection(), selectToViewLineNumber, selectToViewColumn, 0
+				true, selectToViewLineNumber, selectToViewColumn, 0
 			));
 
 		} else {
 
 			const endPositionOfSelectionStart = cursor.modelState.selectionStart.getEndPosition();
 			return CursorState.fromModelState(cursor.modelState.move(
-				cursor.modelState.hasSelection(), endPositionOfSelectionStart.lineNumber, endPositionOfSelectionStart.column, 0
+				true, endPositionOfSelectionStart.lineNumber, endPositionOfSelectionStart.column, 0
 			));
 
 		}
@@ -246,12 +246,20 @@ export class CursorMoveCommands {
 		const column = cursor.viewState.position.column;
 
 		return CursorState.fromViewState(new SingleCursorState(
-			new Range(lineNumber, column, lineNumber, column), 0,
+			new Range(lineNumber, column, lineNumber, column), SelectionStartKind.Simple, 0,
 			new Position(lineNumber, column), 0
 		));
 	}
 
 	public static moveTo(viewModel: IViewModel, cursor: CursorState, inSelectionMode: boolean, _position: IPosition, _viewPosition: IPosition | undefined): PartialCursorState {
+		if (inSelectionMode) {
+			if (cursor.modelState.selectionStartKind === SelectionStartKind.Word) {
+				return this.word(viewModel, cursor, inSelectionMode, _position);
+			}
+			if (cursor.modelState.selectionStartKind === SelectionStartKind.Line) {
+				return this.line(viewModel, cursor, inSelectionMode, _position, _viewPosition);
+			}
+		}
 		const position = viewModel.model.validatePosition(_position);
 		const viewPosition = (
 			_viewPosition
diff --git a/src/vs/editor/common/cursor/cursorMoveOperations.ts b/src/vs/editor/common/cursor/cursorMoveOperations.ts
index 5d089066f6da2f..a57cc00fad5816 100644
--- a/src/vs/editor/common/cursor/cursorMoveOperations.ts
+++ b/src/vs/editor/common/cursor/cursorMoveOperations.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CursorConfiguration, ICursorSimpleModel, SingleCursorState } from 'vs/editor/common/cursorCommon';
+import { CursorConfiguration, ICursorSimpleModel, SelectionStartKind, SingleCursorState } from 'vs/editor/common/cursorCommon';
 import { CursorColumns } from 'vs/editor/common/core/cursorColumns';
 import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
@@ -226,6 +226,7 @@ export class MoveOperations {
 
 		return new SingleCursorState(
 			new Range(selectionStart.lineNumber, selectionStart.column, selectionStart.lineNumber, selectionStart.column),
+			SelectionStartKind.Simple,
 			selectionStart.leftoverVisibleColumns,
 			new Position(position.lineNumber, position.column),
 			position.leftoverVisibleColumns
@@ -263,6 +264,7 @@ export class MoveOperations {
 
 		return new SingleCursorState(
 			new Range(selectionStart.lineNumber, selectionStart.column, selectionStart.lineNumber, selectionStart.column),
+			SelectionStartKind.Simple,
 			selectionStart.leftoverVisibleColumns,
 			new Position(position.lineNumber, position.column),
 			position.leftoverVisibleColumns
diff --git a/src/vs/editor/common/cursor/cursorWordOperations.ts b/src/vs/editor/common/cursor/cursorWordOperations.ts
index 6754680fb57775..8a3f98d37c2372 100644
--- a/src/vs/editor/common/cursor/cursorWordOperations.ts
+++ b/src/vs/editor/common/cursor/cursorWordOperations.ts
@@ -6,7 +6,7 @@
 import { CharCode } from 'vs/base/common/charCode';
 import * as strings from 'vs/base/common/strings';
 import { EditorAutoClosingEditStrategy, EditorAutoClosingStrategy } from 'vs/editor/common/config/editorOptions';
-import { CursorConfiguration, ICursorSimpleModel, SingleCursorState } from 'vs/editor/common/cursorCommon';
+import { CursorConfiguration, ICursorSimpleModel, SelectionStartKind, SingleCursorState } from 'vs/editor/common/cursorCommon';
 import { DeleteOperations } from 'vs/editor/common/cursor/cursorDeleteOperations';
 import { WordCharacterClass, WordCharacterClassifier, getMapForWordSeparators } from 'vs/editor/common/core/wordCharacterClassifier';
 import { Position } from 'vs/editor/common/core/position';
@@ -734,7 +734,7 @@ export class WordOperations {
 			}
 
 			return new SingleCursorState(
-				new Range(position.lineNumber, startColumn, position.lineNumber, endColumn), 0,
+				new Range(position.lineNumber, startColumn, position.lineNumber, endColumn), SelectionStartKind.Word, 0,
 				new Position(position.lineNumber, endColumn), 0
 			);
 		}
diff --git a/src/vs/editor/common/cursor/oneCursor.ts b/src/vs/editor/common/cursor/oneCursor.ts
index 25b0fcaa30b64f..a0dc0eafc43adf 100644
--- a/src/vs/editor/common/cursor/oneCursor.ts
+++ b/src/vs/editor/common/cursor/oneCursor.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CursorState, ICursorSimpleModel, SingleCursorState } from 'vs/editor/common/cursorCommon';
+import { CursorState, ICursorSimpleModel, SelectionStartKind, SingleCursorState } from 'vs/editor/common/cursorCommon';
 import { CursorContext } from 'vs/editor/common/cursor/cursorContext';
 import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
@@ -27,8 +27,8 @@ export class Cursor {
 
 		this._setState(
 			context,
-			new SingleCursorState(new Range(1, 1, 1, 1), 0, new Position(1, 1), 0),
-			new SingleCursorState(new Range(1, 1, 1, 1), 0, new Position(1, 1), 0)
+			new SingleCursorState(new Range(1, 1, 1, 1), SelectionStartKind.Simple, 0, new Position(1, 1), 0),
+			new SingleCursorState(new Range(1, 1, 1, 1), SelectionStartKind.Simple, 0, new Position(1, 1), 0)
 		);
 	}
 
@@ -64,6 +64,12 @@ export class Cursor {
 
 	public readSelectionFromMarkers(context: CursorContext): Selection {
 		const range = context.model._getTrackedRange(this._selTrackedRange!)!;
+
+		if (this.modelState.selection.isEmpty() && !range.isEmpty()) {
+			// Avoid selecting text when recovering from markers
+			return Selection.fromRange(range.collapseToEnd(), this.modelState.selection.getDirection());
+		}
+
 		return Selection.fromRange(range, this.modelState.selection.getDirection());
 	}
 
@@ -98,6 +104,7 @@ export class Cursor {
 
 		return new SingleCursorState(
 			Range.fromPositions(validSStartPosition, validSEndPosition),
+			viewState.selectionStartKind,
 			viewState.selectionStartLeftoverVisibleColumns + sStartPosition.column - validSStartPosition.column,
 			validPosition,
 			viewState.leftoverVisibleColumns + position.column - validPosition.column,
@@ -122,7 +129,7 @@ export class Cursor {
 				context.coordinatesConverter.convertViewPositionToModelPosition(viewState.position)
 			);
 
-			modelState = new SingleCursorState(selectionStart, viewState.selectionStartLeftoverVisibleColumns, position, viewState.leftoverVisibleColumns);
+			modelState = new SingleCursorState(selectionStart, viewState.selectionStartKind, viewState.selectionStartLeftoverVisibleColumns, position, viewState.leftoverVisibleColumns);
 		} else {
 			// Validate new model state
 			const selectionStart = context.model.validateRange(modelState.selectionStart);
@@ -133,7 +140,7 @@ export class Cursor {
 			);
 			const leftoverVisibleColumns = modelState.position.equals(position) ? modelState.leftoverVisibleColumns : 0;
 
-			modelState = new SingleCursorState(selectionStart, selectionStartLeftoverVisibleColumns, position, leftoverVisibleColumns);
+			modelState = new SingleCursorState(selectionStart, modelState.selectionStartKind, selectionStartLeftoverVisibleColumns, position, leftoverVisibleColumns);
 		}
 
 		if (!viewState) {
@@ -142,12 +149,12 @@ export class Cursor {
 			const viewSelectionStart2 = context.coordinatesConverter.convertModelPositionToViewPosition(new Position(modelState.selectionStart.endLineNumber, modelState.selectionStart.endColumn));
 			const viewSelectionStart = new Range(viewSelectionStart1.lineNumber, viewSelectionStart1.column, viewSelectionStart2.lineNumber, viewSelectionStart2.column);
 			const viewPosition = context.coordinatesConverter.convertModelPositionToViewPosition(modelState.position);
-			viewState = new SingleCursorState(viewSelectionStart, modelState.selectionStartLeftoverVisibleColumns, viewPosition, modelState.leftoverVisibleColumns);
+			viewState = new SingleCursorState(viewSelectionStart, modelState.selectionStartKind, modelState.selectionStartLeftoverVisibleColumns, viewPosition, modelState.leftoverVisibleColumns);
 		} else {
 			// Validate new view state
 			const viewSelectionStart = context.coordinatesConverter.validateViewRange(viewState.selectionStart, modelState.selectionStart);
 			const viewPosition = context.coordinatesConverter.validateViewPosition(viewState.position, modelState.position);
-			viewState = new SingleCursorState(viewSelectionStart, modelState.selectionStartLeftoverVisibleColumns, viewPosition, modelState.leftoverVisibleColumns);
+			viewState = new SingleCursorState(viewSelectionStart, modelState.selectionStartKind, modelState.selectionStartLeftoverVisibleColumns, viewPosition, modelState.leftoverVisibleColumns);
 		}
 
 		this.modelState = modelState;
diff --git a/src/vs/editor/common/cursorCommon.ts b/src/vs/editor/common/cursorCommon.ts
index 73f6bd1f1f54fc..9507d83056bfbf 100644
--- a/src/vs/editor/common/cursorCommon.ts
+++ b/src/vs/editor/common/cursorCommon.ts
@@ -135,8 +135,8 @@ export class CursorConfiguration {
 		this._electricChars = null;
 
 		this.shouldAutoCloseBefore = {
-			quote: this._getShouldAutoClose(languageId, this.autoClosingQuotes),
-			bracket: this._getShouldAutoClose(languageId, this.autoClosingBrackets)
+			quote: this._getShouldAutoClose(languageId, this.autoClosingQuotes, true),
+			bracket: this._getShouldAutoClose(languageId, this.autoClosingBrackets, false)
 		};
 
 		this.autoClosingPairs = this.languageConfigurationService.getLanguageConfiguration(languageId).getAutoClosingPairs();
@@ -178,12 +178,12 @@ export class CursorConfiguration {
 		return normalizeIndentation(str, this.indentSize, this.insertSpaces);
 	}
 
-	private _getShouldAutoClose(languageId: string, autoCloseConfig: EditorAutoClosingStrategy): (ch: string) => boolean {
+	private _getShouldAutoClose(languageId: string, autoCloseConfig: EditorAutoClosingStrategy, forQuotes: boolean): (ch: string) => boolean {
 		switch (autoCloseConfig) {
 			case 'beforeWhitespace':
 				return autoCloseBeforeWhitespace;
 			case 'languageDefined':
-				return this._getLanguageDefinedShouldAutoClose(languageId);
+				return this._getLanguageDefinedShouldAutoClose(languageId, forQuotes);
 			case 'always':
 				return autoCloseAlways;
 			case 'never':
@@ -191,8 +191,8 @@ export class CursorConfiguration {
 		}
 	}
 
-	private _getLanguageDefinedShouldAutoClose(languageId: string): (ch: string) => boolean {
-		const autoCloseBeforeSet = this.languageConfigurationService.getLanguageConfiguration(languageId).getAutoCloseBeforeSet();
+	private _getLanguageDefinedShouldAutoClose(languageId: string, forQuotes: boolean): (ch: string) => boolean {
+		const autoCloseBeforeSet = this.languageConfigurationService.getLanguageConfiguration(languageId).getAutoCloseBeforeSet(forQuotes);
 		return c => autoCloseBeforeSet.indexOf(c) !== -1;
 	}
 
@@ -261,7 +261,7 @@ export class CursorState {
 		const selection = Selection.liftSelection(modelSelection);
 		const modelState = new SingleCursorState(
 			Range.fromPositions(selection.getSelectionStart()),
-			0,
+			SelectionStartKind.Simple, 0,
 			selection.getPosition(), 0
 		);
 		return CursorState.fromModelState(modelState);
@@ -308,29 +308,27 @@ export class PartialViewCursorState {
 	}
 }
 
+export const enum SelectionStartKind {
+	Simple,
+	Word,
+	Line
+}
+
 /**
  * Represents the cursor state on either the model or on the view model.
  */
 export class SingleCursorState {
 	_singleCursorStateBrand: void = undefined;
 
-	// --- selection can start as a range (think double click and drag)
-	public readonly selectionStart: Range;
-	public readonly selectionStartLeftoverVisibleColumns: number;
-	public readonly position: Position;
-	public readonly leftoverVisibleColumns: number;
 	public readonly selection: Selection;
 
 	constructor(
-		selectionStart: Range,
-		selectionStartLeftoverVisibleColumns: number,
-		position: Position,
-		leftoverVisibleColumns: number,
+		public readonly selectionStart: Range,
+		public readonly selectionStartKind: SelectionStartKind,
+		public readonly selectionStartLeftoverVisibleColumns: number,
+		public readonly position: Position,
+		public readonly leftoverVisibleColumns: number,
 	) {
-		this.selectionStart = selectionStart;
-		this.selectionStartLeftoverVisibleColumns = selectionStartLeftoverVisibleColumns;
-		this.position = position;
-		this.leftoverVisibleColumns = leftoverVisibleColumns;
 		this.selection = SingleCursorState._computeSelection(this.selectionStart, this.position);
 	}
 
@@ -338,6 +336,7 @@ export class SingleCursorState {
 		return (
 			this.selectionStartLeftoverVisibleColumns === other.selectionStartLeftoverVisibleColumns
 			&& this.leftoverVisibleColumns === other.leftoverVisibleColumns
+			&& this.selectionStartKind === other.selectionStartKind
 			&& this.position.equals(other.position)
 			&& this.selectionStart.equalsRange(other.selectionStart)
 		);
@@ -352,6 +351,7 @@ export class SingleCursorState {
 			// move just position
 			return new SingleCursorState(
 				this.selectionStart,
+				this.selectionStartKind,
 				this.selectionStartLeftoverVisibleColumns,
 				new Position(lineNumber, column),
 				leftoverVisibleColumns
@@ -360,6 +360,7 @@ export class SingleCursorState {
 			// move everything
 			return new SingleCursorState(
 				new Range(lineNumber, column, lineNumber, column),
+				SelectionStartKind.Simple,
 				leftoverVisibleColumns,
 				new Position(lineNumber, column),
 				leftoverVisibleColumns
diff --git a/src/vs/editor/common/diff/algorithms/diffAlgorithm.ts b/src/vs/editor/common/diff/algorithms/diffAlgorithm.ts
index 0222a85c4b5c05..1ac613d3109f62 100644
--- a/src/vs/editor/common/diff/algorithms/diffAlgorithm.ts
+++ b/src/vs/editor/common/diff/algorithms/diffAlgorithm.ts
@@ -46,6 +46,10 @@ export class OffsetRange {
 	public toString() {
 		return `[${this.start}, ${this.endExclusive})`;
 	}
+
+	public join(other: OffsetRange): OffsetRange {
+		return new OffsetRange(Math.min(this.start, other.start), Math.max(this.endExclusive, other.endExclusive));
+	}
 }
 
 export interface ISequence {
diff --git a/src/vs/editor/common/diff/algorithms/dynamicProgrammingDiffing.ts b/src/vs/editor/common/diff/algorithms/dynamicProgrammingDiffing.ts
index c1df66a4974f78..ef264e21b2e897 100644
--- a/src/vs/editor/common/diff/algorithms/dynamicProgrammingDiffing.ts
+++ b/src/vs/editor/common/diff/algorithms/dynamicProgrammingDiffing.ts
@@ -34,7 +34,7 @@ export class DynamicProgrammingDiffing implements IDiffAlgorithm {
 					}
 					if (s1 > 0 && s2 > 0 && directions.get(s1 - 1, s2 - 1) === 3) {
 						// Prefer consecutive diagonals
-						extendedSeqScore += 0.1;
+						extendedSeqScore += lengths.get(s1 - 1, s2 - 1);
 					}
 					extendedSeqScore += (equalityScore ? equalityScore(s1, s2) : 1);
 				} else {
diff --git a/src/vs/editor/common/diff/algorithms/joinSequenceDiffs.ts b/src/vs/editor/common/diff/algorithms/joinSequenceDiffs.ts
index 2c8ad0bdaa289c..88a0a86741fdaf 100644
--- a/src/vs/editor/common/diff/algorithms/joinSequenceDiffs.ts
+++ b/src/vs/editor/common/diff/algorithms/joinSequenceDiffs.ts
@@ -12,6 +12,25 @@ export function optimizeSequenceDiffs(sequence1: ISequence, sequence2: ISequence
 	return result;
 }
 
+export function smoothenSequenceDiffs(sequence1: ISequence, sequence2: ISequence, sequenceDiffs: SequenceDiff[]): SequenceDiff[] {
+	const result: SequenceDiff[] = [];
+	for (const s of sequenceDiffs) {
+		const last = result[result.length - 1];
+		if (!last) {
+			result.push(s);
+			continue;
+		}
+
+		if (s.seq1Range.start - last.seq1Range.endExclusive <= 2 || s.seq2Range.start - last.seq2Range.endExclusive <= 2) {
+			result[result.length - 1] = new SequenceDiff(last.seq1Range.join(s.seq1Range), last.seq2Range.join(s.seq2Range));
+		} else {
+			result.push(s);
+		}
+	}
+
+	return result;
+}
+
 /**
  * This function fixes issues like this:
  * ```
diff --git a/src/vs/editor/common/diff/smartLinesDiffComputer.ts b/src/vs/editor/common/diff/smartLinesDiffComputer.ts
index e511d507cf7f23..9c514f6a2d68d5 100644
--- a/src/vs/editor/common/diff/smartLinesDiffComputer.ts
+++ b/src/vs/editor/common/diff/smartLinesDiffComputer.ts
@@ -628,6 +628,16 @@ export class DiffComputer {
 			return false;
 		}
 
+		if (prevChange.originalEndLineNumber === originalLineNumber && prevChange.modifiedEndLineNumber === modifiedLineNumber) {
+			if (this.shouldComputeCharChanges && prevChange.charChanges) {
+				prevChange.charChanges.push(new CharChange(
+					originalLineNumber, originalStartColumn, originalLineNumber, originalEndColumn,
+					modifiedLineNumber, modifiedStartColumn, modifiedLineNumber, modifiedEndColumn
+				));
+			}
+			return true;
+		}
+
 		if (prevChange.originalEndLineNumber + 1 === originalLineNumber && prevChange.modifiedEndLineNumber + 1 === modifiedLineNumber) {
 			prevChange.originalEndLineNumber = originalLineNumber;
 			prevChange.modifiedEndLineNumber = modifiedLineNumber;
diff --git a/src/vs/editor/common/diff/standardLinesDiffComputer.ts b/src/vs/editor/common/diff/standardLinesDiffComputer.ts
index a737747ae0c28b..de2899020222eb 100644
--- a/src/vs/editor/common/diff/standardLinesDiffComputer.ts
+++ b/src/vs/editor/common/diff/standardLinesDiffComputer.ts
@@ -9,7 +9,7 @@ import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import { OffsetRange, SequenceDiff, ISequence } from 'vs/editor/common/diff/algorithms/diffAlgorithm';
 import { DynamicProgrammingDiffing } from 'vs/editor/common/diff/algorithms/dynamicProgrammingDiffing';
-import { optimizeSequenceDiffs } from 'vs/editor/common/diff/algorithms/joinSequenceDiffs';
+import { optimizeSequenceDiffs, smoothenSequenceDiffs } from 'vs/editor/common/diff/algorithms/joinSequenceDiffs';
 import { MyersDiffAlgorithm } from 'vs/editor/common/diff/algorithms/myersDiffAlgorithm';
 import { ILinesDiff, ILinesDiffComputer, ILinesDiffComputerOptions, LineRange, LineRangeMapping, RangeMapping } from 'vs/editor/common/diff/linesDiffComputer';
 
@@ -116,7 +116,8 @@ export class StandardLinesDiffComputer implements ILinesDiffComputer {
 			? this.dynamicProgrammingDiffing.compute(sourceSlice, targetSlice)
 			: this.myersDiffingAlgorithm.compute(sourceSlice, targetSlice);
 
-		const diffs = optimizeSequenceDiffs(sourceSlice, targetSlice, originalDiffs);
+		let diffs = optimizeSequenceDiffs(sourceSlice, targetSlice, originalDiffs);
+		diffs = smoothenSequenceDiffs(sourceSlice, targetSlice, diffs);
 		const result = diffs.map(
 			(d) =>
 				new RangeMapping(
diff --git a/src/vs/editor/common/languages.ts b/src/vs/editor/common/languages.ts
index 0d25cd047b4a14..6c0aec4c9b0e56 100644
--- a/src/vs/editor/common/languages.ts
+++ b/src/vs/editor/common/languages.ts
@@ -385,6 +385,8 @@ export const enum CompletionItemTag {
 }
 
 export const enum CompletionItemInsertTextRule {
+	None = 0,
+
 	/**
 	 * Adjust whitespace/indentation of multiline insert texts to
 	 * match the current line indentation.
diff --git a/src/vs/editor/common/languages/autoIndent.ts b/src/vs/editor/common/languages/autoIndent.ts
index c25ca147448159..9ae3df974aa59d 100644
--- a/src/vs/editor/common/languages/autoIndent.ts
+++ b/src/vs/editor/common/languages/autoIndent.ts
@@ -93,6 +93,19 @@ export function getInheritIndentForLine(
 		};
 	}
 
+	// Use no indent if this is the first non-blank line
+	for (let priorLineNumber = lineNumber - 1; priorLineNumber > 0; priorLineNumber--) {
+		if (model.getLineContent(priorLineNumber) !== '') {
+			break;
+		}
+		if (priorLineNumber === 1) {
+			return {
+				indentation: '',
+				action: null
+			};
+		}
+	}
+
 	const precedingUnIgnoredLine = getPrecedingValidLine(model, lineNumber, indentRulesSupport);
 	if (precedingUnIgnoredLine < 0) {
 		return null;
diff --git a/src/vs/editor/common/languages/languageConfigurationRegistry.ts b/src/vs/editor/common/languages/languageConfigurationRegistry.ts
index 49a50bcc93c898..a7c2a01e1ad01b 100644
--- a/src/vs/editor/common/languages/languageConfigurationRegistry.ts
+++ b/src/vs/editor/common/languages/languageConfigurationRegistry.ts
@@ -442,8 +442,8 @@ export class ResolvedLanguageConfiguration {
 		return new AutoClosingPairs(this.characterPair.getAutoClosingPairs());
 	}
 
-	public getAutoCloseBeforeSet(): string {
-		return this.characterPair.getAutoCloseBeforeSet();
+	public getAutoCloseBeforeSet(forQuotes: boolean): string {
+		return this.characterPair.getAutoCloseBeforeSet(forQuotes);
 	}
 
 	public getSurroundingPairs(): IAutoClosingPair[] {
diff --git a/src/vs/editor/common/languages/linkComputer.ts b/src/vs/editor/common/languages/linkComputer.ts
index 52f4eaee2fb71d..d80b29c65015b9 100644
--- a/src/vs/editor/common/languages/linkComputer.ts
+++ b/src/vs/editor/common/languages/linkComputer.ts
@@ -155,12 +155,12 @@ function getClassifier(): CharacterClassifier<CharacterClass> {
 		_classifier = new CharacterClassifier<CharacterClass>(CharacterClass.None);
 
 		// allow-any-unicode-next-line
-		const FORCE_TERMINATION_CHARACTERS = ' \t<>\'\"、。｡､，．：；‘〈「『〔（［｛｢｣｝］）〕』」〉’｀～…';
+		const FORCE_TERMINATION_CHARACTERS = ', \t<>\'\"、。｡､，．：；‘〈「『〔（［｛｢｣｝］）〕』」〉’｀～…';
 		for (let i = 0; i < FORCE_TERMINATION_CHARACTERS.length; i++) {
 			_classifier.set(FORCE_TERMINATION_CHARACTERS.charCodeAt(i), CharacterClass.ForceTermination);
 		}
 
-		const CANNOT_END_WITH_CHARACTERS = '.,;:';
+		const CANNOT_END_WITH_CHARACTERS = '.;:';
 		for (let i = 0; i < CANNOT_END_WITH_CHARACTERS.length; i++) {
 			_classifier.set(CANNOT_END_WITH_CHARACTERS.charCodeAt(i), CharacterClass.CannotEndIn);
 		}
diff --git a/src/vs/editor/common/languages/supports/characterPair.ts b/src/vs/editor/common/languages/supports/characterPair.ts
index 9ee152e7519d14..18eee773dd2798 100644
--- a/src/vs/editor/common/languages/supports/characterPair.ts
+++ b/src/vs/editor/common/languages/supports/characterPair.ts
@@ -7,12 +7,14 @@ import { IAutoClosingPair, StandardAutoClosingPairConditional, LanguageConfigura
 
 export class CharacterPairSupport {
 
-	static readonly DEFAULT_AUTOCLOSE_BEFORE_LANGUAGE_DEFINED = ';:.,=}])> \n\t';
+	static readonly DEFAULT_AUTOCLOSE_BEFORE_LANGUAGE_DEFINED_QUOTES = ';:.,=}])> \n\t';
+	static readonly DEFAULT_AUTOCLOSE_BEFORE_LANGUAGE_DEFINED_BRACKETS = '\'"`;:.,=}])> \n\t';
 	static readonly DEFAULT_AUTOCLOSE_BEFORE_WHITESPACE = ' \n\t';
 
 	private readonly _autoClosingPairs: StandardAutoClosingPairConditional[];
 	private readonly _surroundingPairs: IAutoClosingPair[];
-	private readonly _autoCloseBefore: string;
+	private readonly _autoCloseBeforeForQuotes: string;
+	private readonly _autoCloseBeforeForBrackets: string;
 
 	constructor(config: LanguageConfiguration) {
 		if (config.autoClosingPairs) {
@@ -29,7 +31,8 @@ export class CharacterPairSupport {
 			this._autoClosingPairs.push(new StandardAutoClosingPairConditional({ open: docComment.open, close: docComment.close || '' }));
 		}
 
-		this._autoCloseBefore = typeof config.autoCloseBefore === 'string' ? config.autoCloseBefore : CharacterPairSupport.DEFAULT_AUTOCLOSE_BEFORE_LANGUAGE_DEFINED;
+		this._autoCloseBeforeForQuotes = typeof config.autoCloseBefore === 'string' ? config.autoCloseBefore : CharacterPairSupport.DEFAULT_AUTOCLOSE_BEFORE_LANGUAGE_DEFINED_QUOTES;
+		this._autoCloseBeforeForBrackets = typeof config.autoCloseBefore === 'string' ? config.autoCloseBefore : CharacterPairSupport.DEFAULT_AUTOCLOSE_BEFORE_LANGUAGE_DEFINED_BRACKETS;
 
 		this._surroundingPairs = config.surroundingPairs || this._autoClosingPairs;
 	}
@@ -38,8 +41,8 @@ export class CharacterPairSupport {
 		return this._autoClosingPairs;
 	}
 
-	public getAutoCloseBeforeSet(): string {
-		return this._autoCloseBefore;
+	public getAutoCloseBeforeSet(forQuotes: boolean): string {
+		return (forQuotes ? this._autoCloseBeforeForQuotes : this._autoCloseBeforeForBrackets);
 	}
 
 	public getSurroundingPairs(): IAutoClosingPair[] {
diff --git a/src/vs/editor/common/model.ts b/src/vs/editor/common/model.ts
index 861ad5b5832527..109d553e7d2efb 100644
--- a/src/vs/editor/common/model.ts
+++ b/src/vs/editor/common/model.ts
@@ -424,24 +424,35 @@ export class TextModelResolvedOptions {
 
 	readonly tabSize: number;
 	readonly indentSize: number;
+	private readonly _indentSizeIsTabSize: boolean;
 	readonly insertSpaces: boolean;
 	readonly defaultEOL: DefaultEndOfLine;
 	readonly trimAutoWhitespace: boolean;
 	readonly bracketPairColorizationOptions: BracketPairColorizationOptions;
 
+	public get originalIndentSize(): number | 'tabSize' {
+		return this._indentSizeIsTabSize ? 'tabSize' : this.indentSize;
+	}
+
 	/**
 	 * @internal
 	 */
 	constructor(src: {
 		tabSize: number;
-		indentSize: number;
+		indentSize: number | 'tabSize';
 		insertSpaces: boolean;
 		defaultEOL: DefaultEndOfLine;
 		trimAutoWhitespace: boolean;
 		bracketPairColorizationOptions: BracketPairColorizationOptions;
 	}) {
 		this.tabSize = Math.max(1, src.tabSize | 0);
-		this.indentSize = Math.max(1, src.indentSize | 0);
+		if (src.indentSize === 'tabSize') {
+			this.indentSize = this.tabSize;
+			this._indentSizeIsTabSize = true;
+		} else {
+			this.indentSize = Math.max(1, src.indentSize | 0);
+			this._indentSizeIsTabSize = false;
+		}
 		this.insertSpaces = Boolean(src.insertSpaces);
 		this.defaultEOL = src.defaultEOL | 0;
 		this.trimAutoWhitespace = Boolean(src.trimAutoWhitespace);
@@ -454,6 +465,7 @@ export class TextModelResolvedOptions {
 	public equals(other: TextModelResolvedOptions): boolean {
 		return (
 			this.tabSize === other.tabSize
+			&& this._indentSizeIsTabSize === other._indentSizeIsTabSize
 			&& this.indentSize === other.indentSize
 			&& this.insertSpaces === other.insertSpaces
 			&& this.defaultEOL === other.defaultEOL
@@ -480,7 +492,7 @@ export class TextModelResolvedOptions {
  */
 export interface ITextModelCreationOptions {
 	tabSize: number;
-	indentSize: number;
+	indentSize: number | 'tabSize';
 	insertSpaces: boolean;
 	detectIndentation: boolean;
 	trimAutoWhitespace: boolean;
@@ -497,7 +509,7 @@ export interface BracketPairColorizationOptions {
 
 export interface ITextModelUpdateOptions {
 	tabSize?: number;
-	indentSize?: number;
+	indentSize?: number | 'tabSize';
 	insertSpaces?: boolean;
 	trimAutoWhitespace?: boolean;
 	bracketColorizationOptions?: BracketPairColorizationOptions;
diff --git a/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/bracketPairsTree.ts b/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/bracketPairsTree.ts
index 1a85bec9ec64cf..7a8f115c8dcc33 100644
--- a/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/bracketPairsTree.ts
+++ b/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/bracketPairsTree.ts
@@ -320,6 +320,7 @@ function collectBrackets(
 							// No child after this child in the requested window, don't recurse
 							node = child;
 							level++;
+							nestingLevelOfEqualBracketType = levelPerBracket + 1;
 							continue whileLoop;
 						}
 
diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts
index 9447ad435700e8..f6cfde8a2b9c6e 100644
--- a/src/vs/editor/common/model/textModel.ts
+++ b/src/vs/editor/common/model/textModel.ts
@@ -193,7 +193,7 @@ export class TextModel extends Disposable implements model.ITextModel, IDecorati
 			const guessedIndentation = guessIndentation(textBuffer, options.tabSize, options.insertSpaces);
 			return new model.TextModelResolvedOptions({
 				tabSize: guessedIndentation.tabSize,
-				indentSize: guessedIndentation.tabSize, // TODO@Alex: guess indentSize independent of tabSize
+				indentSize: 'tabSize', // TODO@Alex: guess indentSize independent of tabSize
 				insertSpaces: guessedIndentation.insertSpaces,
 				trimAutoWhitespace: options.trimAutoWhitespace,
 				defaultEOL: options.defaultEOL,
@@ -201,15 +201,7 @@ export class TextModel extends Disposable implements model.ITextModel, IDecorati
 			});
 		}
 
-		return new model.TextModelResolvedOptions({
-			tabSize: options.tabSize,
-			indentSize: options.indentSize,
-			insertSpaces: options.insertSpaces,
-			trimAutoWhitespace: options.trimAutoWhitespace,
-			defaultEOL: options.defaultEOL,
-			bracketPairColorizationOptions: options.bracketPairColorizationOptions,
-		});
-
+		return new model.TextModelResolvedOptions(options);
 	}
 
 	//#region Events
@@ -629,7 +621,7 @@ export class TextModel extends Disposable implements model.ITextModel, IDecorati
 	public updateOptions(_newOpts: model.ITextModelUpdateOptions): void {
 		this._assertNotDisposed();
 		const tabSize = (typeof _newOpts.tabSize !== 'undefined') ? _newOpts.tabSize : this._options.tabSize;
-		const indentSize = (typeof _newOpts.indentSize !== 'undefined') ? _newOpts.indentSize : this._options.indentSize;
+		const indentSize = (typeof _newOpts.indentSize !== 'undefined') ? _newOpts.indentSize : this._options.originalIndentSize;
 		const insertSpaces = (typeof _newOpts.insertSpaces !== 'undefined') ? _newOpts.insertSpaces : this._options.insertSpaces;
 		const trimAutoWhitespace = (typeof _newOpts.trimAutoWhitespace !== 'undefined') ? _newOpts.trimAutoWhitespace : this._options.trimAutoWhitespace;
 		const bracketPairColorizationOptions = (typeof _newOpts.bracketColorizationOptions !== 'undefined') ? _newOpts.bracketColorizationOptions : this._options.bracketPairColorizationOptions;
diff --git a/src/vs/editor/common/services/modelService.ts b/src/vs/editor/common/services/modelService.ts
index 9df6c050c1f758..56b329f32e4b0d 100644
--- a/src/vs/editor/common/services/modelService.ts
+++ b/src/vs/editor/common/services/modelService.ts
@@ -191,7 +191,7 @@ export class ModelService extends Disposable implements IModelService {
 			}
 		}
 
-		let indentSize = tabSize;
+		let indentSize: number | 'tabSize' = 'tabSize';
 		if (config.editor && typeof config.editor.indentSize !== 'undefined' && config.editor.indentSize !== 'tabSize') {
 			const parsedIndentSize = parseInt(config.editor.indentSize, 10);
 			if (!isNaN(parsedIndentSize)) {
diff --git a/src/vs/editor/common/services/textResourceConfiguration.ts b/src/vs/editor/common/services/textResourceConfiguration.ts
index 23a2335b6dfd47..feeeceaa1c11ce 100644
--- a/src/vs/editor/common/services/textResourceConfiguration.ts
+++ b/src/vs/editor/common/services/textResourceConfiguration.ts
@@ -16,7 +16,7 @@ export interface ITextResourceConfigurationChangeEvent {
 	/**
 	 * All affected keys. Also includes language overrides and keys changed under language overrides.
 	 */
-	readonly affectedKeys: string[];
+	readonly affectedKeys: ReadonlySet<string>;
 
 	/**
 	 * Returns `true` if the given section has changed for the given resource.
diff --git a/src/vs/editor/common/services/unicodeTextModelHighlighter.ts b/src/vs/editor/common/services/unicodeTextModelHighlighter.ts
index e4d5b6effcc28f..86103738c483b5 100644
--- a/src/vs/editor/common/services/unicodeTextModelHighlighter.ts
+++ b/src/vs/editor/common/services/unicodeTextModelHighlighter.ts
@@ -61,7 +61,11 @@ export class UnicodeTextModelHighlighter {
 						}
 					}
 					const str = lineContent.substring(startIndex, endIndex);
-					const word = getWordAtText(startIndex + 1, DEFAULT_WORD_REGEXP, lineContent, 0);
+					let word = getWordAtText(startIndex + 1, DEFAULT_WORD_REGEXP, lineContent, 0);
+					if (word && word.endColumn <= startIndex + 1) {
+						// The word does not include the problematic character, ignore the word
+						word = null;
+					}
 					const highlightReason = codePointHighlighter.shouldHighlightNonBasicASCII(str, word ? word.word : null);
 
 					if (highlightReason !== SimpleHighlightReason.None) {
diff --git a/src/vs/editor/common/standalone/standaloneEnums.ts b/src/vs/editor/common/standalone/standaloneEnums.ts
index f14555d191f1e3..d15fc2e84d20c2 100644
--- a/src/vs/editor/common/standalone/standaloneEnums.ts
+++ b/src/vs/editor/common/standalone/standaloneEnums.ts
@@ -21,6 +21,7 @@ export enum CodeActionTriggerType {
 }
 
 export enum CompletionItemInsertTextRule {
+	None = 0,
 	/**
 	 * Adjust whitespace/indentation of multiline insert texts to
 	 * match the current line indentation.
@@ -190,126 +191,128 @@ export enum EditorOption {
 	codeLensFontFamily = 15,
 	codeLensFontSize = 16,
 	colorDecorators = 17,
-	columnSelection = 18,
-	comments = 19,
-	contextmenu = 20,
-	copyWithSyntaxHighlighting = 21,
-	cursorBlinking = 22,
-	cursorSmoothCaretAnimation = 23,
-	cursorStyle = 24,
-	cursorSurroundingLines = 25,
-	cursorSurroundingLinesStyle = 26,
-	cursorWidth = 27,
-	disableLayerHinting = 28,
-	disableMonospaceOptimizations = 29,
-	domReadOnly = 30,
-	dragAndDrop = 31,
-	dropIntoEditor = 32,
-	emptySelectionClipboard = 33,
-	extraEditorClassName = 34,
-	fastScrollSensitivity = 35,
-	find = 36,
-	fixedOverflowWidgets = 37,
-	folding = 38,
-	foldingStrategy = 39,
-	foldingHighlight = 40,
-	foldingImportsByDefault = 41,
-	foldingMaximumRegions = 42,
-	unfoldOnClickAfterEndOfLine = 43,
-	fontFamily = 44,
-	fontInfo = 45,
-	fontLigatures = 46,
-	fontSize = 47,
-	fontWeight = 48,
-	fontVariations = 49,
-	formatOnPaste = 50,
-	formatOnType = 51,
-	glyphMargin = 52,
-	gotoLocation = 53,
-	hideCursorInOverviewRuler = 54,
-	hover = 55,
-	inDiffEditor = 56,
-	inlineSuggest = 57,
-	letterSpacing = 58,
-	lightbulb = 59,
-	lineDecorationsWidth = 60,
-	lineHeight = 61,
-	lineNumbers = 62,
-	lineNumbersMinChars = 63,
-	linkedEditing = 64,
-	links = 65,
-	matchBrackets = 66,
-	minimap = 67,
-	mouseStyle = 68,
-	mouseWheelScrollSensitivity = 69,
-	mouseWheelZoom = 70,
-	multiCursorMergeOverlapping = 71,
-	multiCursorModifier = 72,
-	multiCursorPaste = 73,
-	multiCursorLimit = 74,
-	occurrencesHighlight = 75,
-	overviewRulerBorder = 76,
-	overviewRulerLanes = 77,
-	padding = 78,
-	parameterHints = 79,
-	peekWidgetDefaultFocus = 80,
-	definitionLinkOpensInPeek = 81,
-	quickSuggestions = 82,
-	quickSuggestionsDelay = 83,
-	readOnly = 84,
-	renameOnType = 85,
-	renderControlCharacters = 86,
-	renderFinalNewline = 87,
-	renderLineHighlight = 88,
-	renderLineHighlightOnlyWhenFocus = 89,
-	renderValidationDecorations = 90,
-	renderWhitespace = 91,
-	revealHorizontalRightPadding = 92,
-	roundedSelection = 93,
-	rulers = 94,
-	scrollbar = 95,
-	scrollBeyondLastColumn = 96,
-	scrollBeyondLastLine = 97,
-	scrollPredominantAxis = 98,
-	selectionClipboard = 99,
-	selectionHighlight = 100,
-	selectOnLineNumbers = 101,
-	showFoldingControls = 102,
-	showUnused = 103,
-	snippetSuggestions = 104,
-	smartSelect = 105,
-	smoothScrolling = 106,
-	stickyScroll = 107,
-	stickyTabStops = 108,
-	stopRenderingLineAfter = 109,
-	suggest = 110,
-	suggestFontSize = 111,
-	suggestLineHeight = 112,
-	suggestOnTriggerCharacters = 113,
-	suggestSelection = 114,
-	tabCompletion = 115,
-	tabIndex = 116,
-	unicodeHighlighting = 117,
-	unusualLineTerminators = 118,
-	useShadowDOM = 119,
-	useTabStops = 120,
-	wordBreak = 121,
-	wordSeparators = 122,
-	wordWrap = 123,
-	wordWrapBreakAfterCharacters = 124,
-	wordWrapBreakBeforeCharacters = 125,
-	wordWrapColumn = 126,
-	wordWrapOverride1 = 127,
-	wordWrapOverride2 = 128,
-	wrappingIndent = 129,
-	wrappingStrategy = 130,
-	showDeprecated = 131,
-	inlayHints = 132,
-	editorClassName = 133,
-	pixelRatio = 134,
-	tabFocusMode = 135,
-	layoutInfo = 136,
-	wrappingInfo = 137
+	colorDecoratorsLimit = 18,
+	columnSelection = 19,
+	comments = 20,
+	contextmenu = 21,
+	copyWithSyntaxHighlighting = 22,
+	cursorBlinking = 23,
+	cursorSmoothCaretAnimation = 24,
+	cursorStyle = 25,
+	cursorSurroundingLines = 26,
+	cursorSurroundingLinesStyle = 27,
+	cursorWidth = 28,
+	disableLayerHinting = 29,
+	disableMonospaceOptimizations = 30,
+	domReadOnly = 31,
+	dragAndDrop = 32,
+	dropIntoEditor = 33,
+	emptySelectionClipboard = 34,
+	experimentalWhitespaceRendering = 35,
+	extraEditorClassName = 36,
+	fastScrollSensitivity = 37,
+	find = 38,
+	fixedOverflowWidgets = 39,
+	folding = 40,
+	foldingStrategy = 41,
+	foldingHighlight = 42,
+	foldingImportsByDefault = 43,
+	foldingMaximumRegions = 44,
+	unfoldOnClickAfterEndOfLine = 45,
+	fontFamily = 46,
+	fontInfo = 47,
+	fontLigatures = 48,
+	fontSize = 49,
+	fontWeight = 50,
+	fontVariations = 51,
+	formatOnPaste = 52,
+	formatOnType = 53,
+	glyphMargin = 54,
+	gotoLocation = 55,
+	hideCursorInOverviewRuler = 56,
+	hover = 57,
+	inDiffEditor = 58,
+	inlineSuggest = 59,
+	letterSpacing = 60,
+	lightbulb = 61,
+	lineDecorationsWidth = 62,
+	lineHeight = 63,
+	lineNumbers = 64,
+	lineNumbersMinChars = 65,
+	linkedEditing = 66,
+	links = 67,
+	matchBrackets = 68,
+	minimap = 69,
+	mouseStyle = 70,
+	mouseWheelScrollSensitivity = 71,
+	mouseWheelZoom = 72,
+	multiCursorMergeOverlapping = 73,
+	multiCursorModifier = 74,
+	multiCursorPaste = 75,
+	multiCursorLimit = 76,
+	occurrencesHighlight = 77,
+	overviewRulerBorder = 78,
+	overviewRulerLanes = 79,
+	padding = 80,
+	parameterHints = 81,
+	peekWidgetDefaultFocus = 82,
+	definitionLinkOpensInPeek = 83,
+	quickSuggestions = 84,
+	quickSuggestionsDelay = 85,
+	readOnly = 86,
+	renameOnType = 87,
+	renderControlCharacters = 88,
+	renderFinalNewline = 89,
+	renderLineHighlight = 90,
+	renderLineHighlightOnlyWhenFocus = 91,
+	renderValidationDecorations = 92,
+	renderWhitespace = 93,
+	revealHorizontalRightPadding = 94,
+	roundedSelection = 95,
+	rulers = 96,
+	scrollbar = 97,
+	scrollBeyondLastColumn = 98,
+	scrollBeyondLastLine = 99,
+	scrollPredominantAxis = 100,
+	selectionClipboard = 101,
+	selectionHighlight = 102,
+	selectOnLineNumbers = 103,
+	showFoldingControls = 104,
+	showUnused = 105,
+	snippetSuggestions = 106,
+	smartSelect = 107,
+	smoothScrolling = 108,
+	stickyScroll = 109,
+	stickyTabStops = 110,
+	stopRenderingLineAfter = 111,
+	suggest = 112,
+	suggestFontSize = 113,
+	suggestLineHeight = 114,
+	suggestOnTriggerCharacters = 115,
+	suggestSelection = 116,
+	tabCompletion = 117,
+	tabIndex = 118,
+	unicodeHighlighting = 119,
+	unusualLineTerminators = 120,
+	useShadowDOM = 121,
+	useTabStops = 122,
+	wordBreak = 123,
+	wordSeparators = 124,
+	wordWrap = 125,
+	wordWrapBreakAfterCharacters = 126,
+	wordWrapBreakBeforeCharacters = 127,
+	wordWrapColumn = 128,
+	wordWrapOverride1 = 129,
+	wordWrapOverride2 = 130,
+	wrappingIndent = 131,
+	wrappingStrategy = 132,
+	showDeprecated = 133,
+	inlayHints = 134,
+	editorClassName = 135,
+	pixelRatio = 136,
+	tabFocusMode = 137,
+	layoutInfo = 138,
+	wrappingInfo = 139
 }
 
 /**
diff --git a/src/vs/editor/common/viewEvents.ts b/src/vs/editor/common/viewEvents.ts
index 636f618af6cf29..2182d17b7f8cd1 100644
--- a/src/vs/editor/common/viewEvents.ts
+++ b/src/vs/editor/common/viewEvents.ts
@@ -7,6 +7,7 @@ import { ScrollEvent } from 'vs/base/common/scrollable';
 import { ConfigurationChangedEvent, EditorOption } from 'vs/editor/common/config/editorOptions';
 import { Range } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
+import { CursorChangeReason } from 'vs/editor/common/cursorEvents';
 import { ScrollType } from 'vs/editor/common/editorCommon';
 import { IModelDecorationsChangedEvent } from 'vs/editor/common/textModelEvents';
 import { IColorTheme } from 'vs/platform/theme/common/themeService';
@@ -61,13 +62,11 @@ export class ViewCursorStateChangedEvent {
 
 	public readonly type = ViewEventType.ViewCursorStateChanged;
 
-	public readonly selections: Selection[];
-	public readonly modelSelections: Selection[];
-
-	constructor(selections: Selection[], modelSelections: Selection[]) {
-		this.selections = selections;
-		this.modelSelections = modelSelections;
-	}
+	constructor(
+		public readonly selections: Selection[],
+		public readonly modelSelections: Selection[],
+		public readonly reason: CursorChangeReason
+	) { }
 }
 
 export class ViewDecorationsChangedEvent {
diff --git a/src/vs/editor/common/viewLayout/viewLineRenderer.ts b/src/vs/editor/common/viewLayout/viewLineRenderer.ts
index 1e87e79bd5f681..0e94382f9a8ae3 100644
--- a/src/vs/editor/common/viewLayout/viewLineRenderer.ts
+++ b/src/vs/editor/common/viewLayout/viewLineRenderer.ts
@@ -465,8 +465,8 @@ function resolveRenderLineInput(input: RenderLineInput): ResolvedRenderLineInput
 	if (input.renderWhitespace === RenderWhitespace.All ||
 		input.renderWhitespace === RenderWhitespace.Boundary ||
 		(input.renderWhitespace === RenderWhitespace.Selection && !!input.selectionsOnLine) ||
-		input.renderWhitespace === RenderWhitespace.Trailing) {
-
+		(input.renderWhitespace === RenderWhitespace.Trailing && !input.continuesWithWrappedLine)
+	) {
 		tokens = _applyRenderWhitespace(input, lineContent, len, tokens);
 	}
 	let containsForeignElements = ForeignElementType.None;
diff --git a/src/vs/editor/contrib/codeAction/browser/codeAction.ts b/src/vs/editor/contrib/codeAction/browser/codeAction.ts
index 1ab20efe339b49..da54b65ee99434 100644
--- a/src/vs/editor/contrib/codeAction/browser/codeAction.ts
+++ b/src/vs/editor/contrib/codeAction/browser/codeAction.ts
@@ -232,6 +232,7 @@ export async function applyCodeAction(
 	item: CodeActionItem,
 	codeActionReason: ApplyCodeActionReason,
 	options?: { preview?: boolean; editor?: ICodeEditor },
+	token: CancellationToken = CancellationToken.None,
 ): Promise<void> {
 	const bulkEditService = accessor.get(IBulkEditService);
 	const commandService = accessor.get(ICommandService);
@@ -260,10 +261,13 @@ export async function applyCodeAction(
 		reason: codeActionReason,
 	});
 
-	await item.resolve(CancellationToken.None);
+	await item.resolve(token);
+	if (token.isCancellationRequested) {
+		return;
+	}
 
-	if (item.action.edit) {
-		await bulkEditService.apply(item.action.edit, {
+	if (item.action.edit?.edits.length) {
+		const result = await bulkEditService.apply(item.action.edit, {
 			editor: options?.editor,
 			label: item.action.title,
 			quotableLabel: item.action.title,
@@ -271,6 +275,10 @@ export async function applyCodeAction(
 			respectAutoSaveConfig: codeActionReason !== ApplyCodeActionReason.OnSave,
 			showPreview: options?.preview,
 		});
+
+		if (!result.isApplied) {
+			return;
+		}
 	}
 
 	if (item.action.command) {
diff --git a/src/vs/editor/contrib/codeAction/browser/codeActionKeybindingResolver.ts b/src/vs/editor/contrib/codeAction/browser/codeActionKeybindingResolver.ts
index 6724067213130d..2ee4108224f6a9 100644
--- a/src/vs/editor/contrib/codeAction/browser/codeActionKeybindingResolver.ts
+++ b/src/vs/editor/contrib/codeAction/browser/codeActionKeybindingResolver.ts
@@ -8,7 +8,6 @@ import { Lazy } from 'vs/base/common/lazy';
 import { CodeAction } from 'vs/editor/common/languages';
 import { codeActionCommandId, fixAllCommandId, organizeImportsCommandId, refactorCommandId, sourceActionCommandId } from 'vs/editor/contrib/codeAction/browser/codeAction';
 import { CodeActionAutoApply, CodeActionCommandArgs, CodeActionKind } from 'vs/editor/contrib/codeAction/common/types';
-import { IActionKeybindingResolver } from 'vs/platform/actionWidget/common/actionWidget';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 
 interface ResolveCodeActionKeybinding {
@@ -17,7 +16,7 @@ interface ResolveCodeActionKeybinding {
 	readonly resolvedKeybinding: ResolvedKeybinding;
 }
 
-export class CodeActionKeybindingResolver implements IActionKeybindingResolver {
+export class CodeActionKeybindingResolver {
 	private static readonly codeActionCommands: readonly string[] = [
 		refactorCommandId,
 		codeActionCommandId,
@@ -27,7 +26,7 @@ export class CodeActionKeybindingResolver implements IActionKeybindingResolver {
 	];
 
 	constructor(
-		private readonly keybindingService: IKeybindingService
+		@IKeybindingService private readonly keybindingService: IKeybindingService
 	) { }
 
 	public getResolver(): (action: CodeAction) => ResolvedKeybinding | undefined {
diff --git a/src/vs/editor/contrib/codeAction/browser/codeActionMenuItems.ts b/src/vs/editor/contrib/codeAction/browser/codeActionMenu.ts
similarity index 84%
rename from src/vs/editor/contrib/codeAction/browser/codeActionMenuItems.ts
rename to src/vs/editor/contrib/codeAction/browser/codeActionMenu.ts
index 18f495dc5d8e74..87d5e99356bbec 100644
--- a/src/vs/editor/contrib/codeAction/browser/codeActionMenuItems.ts
+++ b/src/vs/editor/contrib/codeAction/browser/codeActionMenu.ts
@@ -5,12 +5,14 @@
 
 import 'vs/base/browser/ui/codicons/codiconStyles'; // The codicon symbol styles are defined here and must be loaded
 import { Codicon } from 'vs/base/common/codicons';
+import { ResolvedKeybinding } from 'vs/base/common/keybindings';
+import { CodeAction } from 'vs/editor/common/languages';
 import { CodeActionItem, CodeActionKind } from 'vs/editor/contrib/codeAction/common/types';
 import 'vs/editor/contrib/symbolIcons/browser/symbolIcons'; // The codicon symbol colors are defined here and must be loaded to get colors
 import { localize } from 'vs/nls';
 import { ActionListItemKind, IListMenuItem } from 'vs/platform/actionWidget/browser/actionList';
 
-export interface ActionGroup {
+interface ActionGroup {
 	readonly kind: CodeActionKind;
 	readonly title: string;
 	readonly icon?: { readonly codicon: Codicon; readonly color?: string };
@@ -29,7 +31,11 @@ const codeActionGroups = Object.freeze<ActionGroup[]>([
 	uncategorizedCodeActionGroup,
 ]);
 
-export function toMenuItems(inputCodeActions: readonly CodeActionItem[], showHeaders: boolean): IListMenuItem<CodeActionItem>[] {
+export function toMenuItems(
+	inputCodeActions: readonly CodeActionItem[],
+	showHeaders: boolean,
+	keybindingResolver: (action: CodeAction) => ResolvedKeybinding | undefined
+): IListMenuItem<CodeActionItem>[] {
 	if (!showHeaders) {
 		return inputCodeActions.map((action): IListMenuItem<CodeActionItem> => {
 			return {
@@ -60,7 +66,14 @@ export function toMenuItems(inputCodeActions: readonly CodeActionItem[], showHea
 		if (menuEntry.actions.length) {
 			allMenuItems.push({ kind: ActionListItemKind.Header, group: menuEntry.group });
 			for (const action of menuEntry.actions) {
-				allMenuItems.push({ kind: ActionListItemKind.Action, item: action, group: menuEntry.group, label: action.action.title, disabled: !!action.action.disabled });
+				allMenuItems.push({
+					kind: ActionListItemKind.Action,
+					item: action,
+					group: menuEntry.group,
+					label: action.action.title,
+					disabled: !!action.action.disabled,
+					keybinding: keybindingResolver(action.action),
+				});
 			}
 		}
 	}
diff --git a/src/vs/editor/contrib/codeAction/browser/codeActionUi.ts b/src/vs/editor/contrib/codeAction/browser/codeActionUi.ts
index a6eafa3be4fe55..6d57e9903677fc 100644
--- a/src/vs/editor/contrib/codeAction/browser/codeActionUi.ts
+++ b/src/vs/editor/contrib/codeAction/browser/codeActionUi.ts
@@ -13,7 +13,8 @@ import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { IPosition, Position } from 'vs/editor/common/core/position';
 import { ScrollType } from 'vs/editor/common/editorCommon';
 import { CodeActionTriggerType } from 'vs/editor/common/languages';
-import { toMenuItems } from 'vs/editor/contrib/codeAction/browser/codeActionMenuItems';
+import { CodeActionKeybindingResolver } from 'vs/editor/contrib/codeAction/browser/codeActionKeybindingResolver';
+import { toMenuItems } from 'vs/editor/contrib/codeAction/browser/codeActionMenu';
 import { MessageController } from 'vs/editor/contrib/message/browser/messageController';
 import { localize } from 'vs/nls';
 import { IActionWidgetService, IRenderDelegate } from 'vs/platform/actionWidget/browser/actionWidget';
@@ -30,9 +31,12 @@ export interface IActionShowOptions {
 }
 
 export class CodeActionUi extends Disposable {
+
 	private readonly _lightBulbWidget: Lazy<LightBulbWidget>;
 	private readonly _activeCodeActions = this._register(new MutableDisposable<CodeActionSet>());
 
+	private readonly _resolver: CodeActionKeybindingResolver;
+
 	#disposed = false;
 
 	private _showDisabled = false;
@@ -44,8 +48,8 @@ export class CodeActionUi extends Disposable {
 		private readonly delegate: {
 			applyCodeAction: (action: CodeActionItem, regtriggerAfterApply: boolean, preview: boolean) => Promise<void>;
 		},
+		@IInstantiationService instantiationService: IInstantiationService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
-		@IInstantiationService readonly instantiationService: IInstantiationService,
 		@IActionWidgetService private readonly _actionWidgetService: IActionWidgetService,
 		@ICommandService private readonly _commandService: ICommandService,
 	) {
@@ -57,6 +61,8 @@ export class CodeActionUi extends Disposable {
 			return widget;
 		});
 
+		this._resolver = instantiationService.createInstance(CodeActionKeybindingResolver);
+
 		this._register(this._editor.onDidLayoutChange(() => this._actionWidgetService.hide()));
 	}
 
@@ -187,7 +193,8 @@ export class CodeActionUi extends Disposable {
 
 		this._actionWidgetService.show(
 			'codeActionWidget',
-			toMenuItems(actionsToShow, this._shouldShowHeaders()),
+			true,
+			toMenuItems(actionsToShow, this._shouldShowHeaders(), this._resolver.getResolver()),
 			delegate,
 			anchor,
 			editorDom,
diff --git a/src/vs/editor/contrib/codeAction/common/types.ts b/src/vs/editor/contrib/codeAction/common/types.ts
index 25ac6511a6d29e..07f55364a3bc5d 100644
--- a/src/vs/editor/contrib/codeAction/common/types.ts
+++ b/src/vs/editor/contrib/codeAction/common/types.ts
@@ -193,8 +193,7 @@ export class CodeActionItem implements IActionItem {
 	constructor(
 		public readonly action: languages.CodeAction,
 		public readonly provider: languages.CodeActionProvider | undefined,
-	) {
-	}
+	) { }
 
 	async resolve(token: CancellationToken): Promise<this> {
 		if (this.provider?.resolveCodeAction && !this.action.edit) {
diff --git a/src/vs/editor/contrib/codelens/browser/codelensWidget.ts b/src/vs/editor/contrib/codelens/browser/codelensWidget.ts
index 120eae969a312b..ebdd3a70b69ada 100644
--- a/src/vs/editor/contrib/codelens/browser/codelensWidget.ts
+++ b/src/vs/editor/contrib/codelens/browser/codelensWidget.ts
@@ -182,6 +182,11 @@ export class CodeLensHelper {
 	}
 }
 
+const codeLensDecorationOptions = ModelDecorationOptions.register({
+	collapseOnReplaceEdit: true,
+	description: 'codelens'
+});
+
 export class CodeLensWidget {
 
 	private readonly _editor: IActiveCodeEditor;
@@ -218,7 +223,7 @@ export class CodeLensWidget {
 
 			helper.addDecoration({
 				range: codeLensData.symbol.range,
-				options: ModelDecorationOptions.EMPTY
+				options: codeLensDecorationOptions
 			}, id => this._decorationIds[i] = id);
 
 			// the range contains all lenses on this line
@@ -277,7 +282,7 @@ export class CodeLensWidget {
 		this._data.forEach((codeLensData, i) => {
 			helper.addDecoration({
 				range: codeLensData.symbol.range,
-				options: ModelDecorationOptions.EMPTY
+				options: codeLensDecorationOptions
 			}, id => this._decorationIds[i] = id);
 		});
 	}
diff --git a/src/vs/editor/contrib/colorPicker/browser/colorDetector.ts b/src/vs/editor/contrib/colorPicker/browser/colorDetector.ts
index fb11e6833b9959..779bae9e416b50 100644
--- a/src/vs/editor/contrib/colorPicker/browser/colorDetector.ts
+++ b/src/vs/editor/contrib/colorPicker/browser/colorDetector.ts
@@ -25,7 +25,6 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 
 export const ColorDecorationInjectedTextMarker = Object.create({});
 
-const MAX_DECORATORS = 500;
 
 export class ColorDetector extends Disposable implements IEditorContribution {
 
@@ -61,10 +60,11 @@ export class ColorDetector extends Disposable implements IEditorContribution {
 		}));
 		this._register(_editor.onDidChangeModelLanguage(() => this.onModelChanged()));
 		this._register(_languageFeaturesService.colorProvider.onDidChange(() => this.onModelChanged()));
-		this._register(_editor.onDidChangeConfiguration(() => {
+		this._register(_editor.onDidChangeConfiguration((e) => {
 			const prevIsEnabled = this._isEnabled;
 			this._isEnabled = this.isEnabled();
-			if (prevIsEnabled !== this._isEnabled) {
+			const updated = prevIsEnabled !== this._isEnabled || e.hasChanged(EditorOption.colorDecoratorsLimit);
+			if (updated) {
 				if (this._isEnabled) {
 					this.onModelChanged();
 				} else {
@@ -97,6 +97,10 @@ export class ColorDetector extends Disposable implements IEditorContribution {
 		return this._editor.getOption(EditorOption.colorDecorators);
 	}
 
+	private getDecoratorLimit(): number {
+		return this._editor.getOption(EditorOption.colorDecoratorsLimit);
+	}
+
 	static get(editor: ICodeEditor): ColorDetector | null {
 		return editor.getContribution<ColorDetector>(this.ID);
 	}
@@ -187,7 +191,7 @@ export class ColorDetector extends Disposable implements IEditorContribution {
 
 		const decorations: IModelDeltaDecoration[] = [];
 
-		for (let i = 0; i < colorData.length && decorations.length < MAX_DECORATORS; i++) {
+		for (let i = 0; i < colorData.length && decorations.length < this.getDecoratorLimit(); i++) {
 			const { red, green, blue, alpha } = colorData[i].colorInfo.color;
 			const rgba = new RGBA(Math.round(red * 255), Math.round(green * 255), Math.round(blue * 255), alpha);
 			const color = `rgba(${rgba.r}, ${rgba.g}, ${rgba.b}, ${rgba.a})`;
diff --git a/src/vs/editor/contrib/colorPicker/browser/colorPickerModel.ts b/src/vs/editor/contrib/colorPicker/browser/colorPickerModel.ts
index 142c64ba497b6a..0bd8ff1c17197a 100644
--- a/src/vs/editor/contrib/colorPicker/browser/colorPickerModel.ts
+++ b/src/vs/editor/contrib/colorPicker/browser/colorPickerModel.ts
@@ -63,13 +63,29 @@ export class ColorPickerModel {
 	}
 
 	guessColorPresentation(color: Color, originalText: string): void {
+		let presentationIndex = -1;
 		for (let i = 0; i < this.colorPresentations.length; i++) {
 			if (originalText.toLowerCase() === this.colorPresentations[i].label) {
-				this.presentationIndex = i;
-				this._onDidChangePresentation.fire(this.presentation);
+				presentationIndex = i;
 				break;
 			}
 		}
+
+		if (presentationIndex === -1) {
+			// check which color presentation text has same prefix as original text's prefix
+			const originalTextPrefix = originalText.split('(')[0].toLowerCase();
+			for (let i = 0; i < this.colorPresentations.length; i++) {
+				if (this.colorPresentations[i].label.toLowerCase().startsWith(originalTextPrefix)) {
+					presentationIndex = i;
+					break;
+				}
+			}
+		}
+
+		if (presentationIndex !== -1 && presentationIndex !== this.presentationIndex) {
+			this.presentationIndex = presentationIndex;
+			this._onDidChangePresentation.fire(this.presentation);
+		}
 	}
 
 	flushColor(): void {
diff --git a/src/vs/editor/contrib/contextmenu/browser/contextmenu.ts b/src/vs/editor/contrib/contextmenu/browser/contextmenu.ts
index e21a5618319336..e087c797b27076 100644
--- a/src/vs/editor/contrib/contextmenu/browser/contextmenu.ts
+++ b/src/vs/editor/contrib/contextmenu/browser/contextmenu.ts
@@ -250,7 +250,6 @@ export class ContextMenuController implements IEditorContribution {
 
 			onHide: (wasCancelled: boolean) => {
 				this._contextMenuIsBeingShownCount--;
-				this._editor.focus();
 				this._editor.updateOptions({
 					hover: oldHoverSetting
 				});
diff --git a/src/vs/editor/contrib/find/browser/findController.ts b/src/vs/editor/contrib/find/browser/findController.ts
index e1d3ae550693ee..25528bf835370d 100644
--- a/src/vs/editor/contrib/find/browser/findController.ts
+++ b/src/vs/editor/contrib/find/browser/findController.ts
@@ -24,6 +24,7 @@ import { IContextViewService } from 'vs/platform/contextview/browser/contextView
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 
@@ -368,6 +369,14 @@ export class CommonFindController extends Disposable implements IEditorContribut
 		return false;
 	}
 
+	public goToMatch(index: number): boolean {
+		if (this._model) {
+			this._model.moveToMatch(index);
+			return true;
+		}
+		return false;
+	}
+
 	public replace(): boolean {
 		if (this._model) {
 			this._model.replace();
@@ -732,6 +741,55 @@ export class PreviousMatchFindAction extends MatchFindAction {
 	}
 }
 
+export class MoveToMatchFindAction extends EditorAction {
+	constructor() {
+		super({
+			id: FIND_IDS.GoToMatchFindAction,
+			label: nls.localize('findMatchAction.goToMatch', "Go to Match..."),
+			alias: 'Go to Match...',
+			precondition: CONTEXT_FIND_WIDGET_VISIBLE
+		});
+	}
+
+	public run(accessor: ServicesAccessor, editor: ICodeEditor, args: any): void | Promise<void> {
+		const controller = CommonFindController.get(editor);
+
+		if (!controller) {
+			return;
+		}
+
+		const quickInputService = accessor.get(IQuickInputService);
+		const inputBox = quickInputService.createInputBox();
+		inputBox.placeholder = nls.localize('findMatchAction.inputPlaceHolder', "Type a number to go to a specific match (between 1 and {0})", controller.getState().matchesCount);
+		inputBox.onDidChangeValue(value => {
+			const index = parseInt(value);
+
+			if (!isNaN(index) && index > 0 && index <= controller.getState().matchesCount) {
+				// valid
+				inputBox.validationMessage = undefined;
+			} else {
+				inputBox.validationMessage = nls.localize('findMatchAction.inputValidationMessage', "Please type a number between 1 and {0}", controller.getState().matchesCount);
+			}
+		});
+
+		inputBox.onDidAccept(() => {
+			const index = parseInt(inputBox.value);
+			if (!isNaN(index) && index > 0 && index <= controller.getState().matchesCount) {
+				controller.goToMatch(index - 1);
+				inputBox.hide();
+			} else {
+				inputBox.validationMessage = nls.localize('findMatchAction.inputValidationMessage', "Please type a number between 1 and {0}", controller.getState().matchesCount);
+			}
+		});
+
+		inputBox.onDidHide(() => {
+			inputBox.dispose();
+		});
+
+		inputBox.show();
+	}
+}
+
 export abstract class SelectionMatchFindAction extends EditorAction {
 	public async run(accessor: ServicesAccessor | null, editor: ICodeEditor): Promise<void> {
 		const controller = CommonFindController.get(editor);
@@ -739,19 +797,15 @@ export abstract class SelectionMatchFindAction extends EditorAction {
 			return;
 		}
 
-		const seedSearchStringFromNonEmptySelection = editor.getOption(EditorOption.find).seedSearchStringFromSelection === 'selection';
-		let selectionSearchString = null;
-		if (editor.getOption(EditorOption.find).seedSearchStringFromSelection !== 'never') {
-			selectionSearchString = getSelectionSearchString(editor, 'single', seedSearchStringFromNonEmptySelection);
-		}
+		const selectionSearchString = getSelectionSearchString(editor, 'single', false);
 		if (selectionSearchString) {
 			controller.setSearchString(selectionSearchString);
 		}
 		if (!this._run(controller)) {
 			await controller.start({
 				forceRevealReplace: false,
-				seedSearchStringFromSelection: editor.getOption(EditorOption.find).seedSearchStringFromSelection !== 'never' ? 'single' : 'none',
-				seedSearchStringFromNonEmptySelection: seedSearchStringFromNonEmptySelection,
+				seedSearchStringFromSelection: 'none',
+				seedSearchStringFromNonEmptySelection: false,
 				seedSearchStringFromGlobalClipboard: false,
 				shouldFocus: FindStartFocusAction.NoFocusChange,
 				shouldAnimate: true,
@@ -871,6 +925,7 @@ registerEditorAction(StartFindWithArgsAction);
 registerEditorAction(StartFindWithSelectionAction);
 registerEditorAction(NextMatchFindAction);
 registerEditorAction(PreviousMatchFindAction);
+registerEditorAction(MoveToMatchFindAction);
 registerEditorAction(NextSelectionMatchFindAction);
 registerEditorAction(PreviousSelectionMatchFindAction);
 
diff --git a/src/vs/editor/contrib/find/browser/findDecorations.ts b/src/vs/editor/contrib/find/browser/findDecorations.ts
index 4d1c39cd97957f..62bfb58fb9cedb 100644
--- a/src/vs/editor/contrib/find/browser/findDecorations.ts
+++ b/src/vs/editor/contrib/find/browser/findDecorations.ts
@@ -91,6 +91,14 @@ export class FindDecorations implements IDisposable {
 		return 1;
 	}
 
+	public getDecorationRangeAt(index: number): Range | null {
+		const decorationId = index < this._decorations.length ? this._decorations[index] : null;
+		if (decorationId) {
+			return this._editor.getModel().getDecorationRange(decorationId);
+		}
+		return null;
+	}
+
 	public getCurrentMatchesPosition(desiredRange: Range): number {
 		const candidates = this._editor.getModel().getDecorationsInRange(desiredRange);
 		for (const candidate of candidates) {
diff --git a/src/vs/editor/contrib/find/browser/findModel.ts b/src/vs/editor/contrib/find/browser/findModel.ts
index e0f806101f1f2a..8cdb9cbd804a25 100644
--- a/src/vs/editor/contrib/find/browser/findModel.ts
+++ b/src/vs/editor/contrib/find/browser/findModel.ts
@@ -58,6 +58,7 @@ export const FIND_IDS = {
 	StartFindWithArgs: 'editor.actions.findWithArgs',
 	NextMatchFindAction: 'editor.action.nextMatchFindAction',
 	PreviousMatchFindAction: 'editor.action.previousMatchFindAction',
+	GoToMatchFindAction: 'editor.action.goToMatchFindAction',
 	NextSelectionMatchFindAction: 'editor.action.nextSelectionMatchFindAction',
 	PreviousSelectionMatchFindAction: 'editor.action.previousSelectionMatchFindAction',
 	StartFindReplaceAction: 'editor.action.startFindReplaceAction',
@@ -449,6 +450,17 @@ export class FindModelBoundToEditorModel {
 		this._moveToNextMatch(this._editor.getSelection().getEndPosition());
 	}
 
+	private _moveToMatch(index: number): void {
+		const decorationRange = this._decorations.getDecorationRangeAt(index);
+		if (decorationRange) {
+			this._setCurrentFindMatch(decorationRange);
+		}
+	}
+
+	public moveToMatch(index: number): void {
+		this._moveToMatch(index);
+	}
+
 	private _getReplacePattern(): ReplacePattern {
 		if (this._state.isRegex) {
 			return parseReplaceString(this._state.replaceString);
diff --git a/src/vs/editor/contrib/find/browser/findWidget.css b/src/vs/editor/contrib/find/browser/findWidget.css
index 2a7478d362e6c1..767b0659fdb560 100644
--- a/src/vs/editor/contrib/find/browser/findWidget.css
+++ b/src/vs/editor/contrib/find/browser/findWidget.css
@@ -14,6 +14,8 @@
 	padding: 0 4px;
 	box-sizing: border-box;
 	transform: translateY(calc(-100% - 10px)); /* shadow (10px) */
+	border-bottom-left-radius: 4px;
+	border-bottom-right-radius: 4px;
 }
 
 .monaco-workbench.reduce-motion .monaco-editor .find-widget {
@@ -53,7 +55,7 @@
 
 .monaco-editor .find-widget > .find-part,
 .monaco-editor .find-widget > .replace-part {
-	margin: 4px 0 0 17px;
+	margin: 3px 0 0 17px;
 	font-size: 12px;
 	display: flex;
 }
diff --git a/src/vs/editor/contrib/find/browser/findWidget.ts b/src/vs/editor/contrib/find/browser/findWidget.ts
index 5d4b9f76f638bf..772aa647cc86e2 100644
--- a/src/vs/editor/contrib/find/browser/findWidget.ts
+++ b/src/vs/editor/contrib/find/browser/findWidget.ts
@@ -36,7 +36,7 @@ import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/c
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { asCssValue, contrastBorder, editorFindMatch, editorFindMatchBorder, editorFindMatchHighlight, editorFindMatchHighlightBorder, editorFindRangeHighlight, editorFindRangeHighlightBorder, editorWidgetBackground, editorWidgetBorder, editorWidgetForeground, editorWidgetResizeBorder, errorForeground, focusBorder, inputActiveOptionBackground, inputActiveOptionBorder, inputActiveOptionForeground, toolbarHoverBackground, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
+import { asCssValue, contrastBorder, editorFindMatch, editorFindMatchBorder, editorFindMatchHighlight, editorFindMatchHighlightBorder, editorFindRangeHighlight, editorFindRangeHighlightBorder, editorWidgetBackground, editorWidgetBorder, editorWidgetForeground, editorWidgetResizeBorder, errorForeground, focusBorder, inputActiveOptionBackground, inputActiveOptionBorder, inputActiveOptionForeground, toolbarHoverBackground, widgetBorder, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
 import { registerIcon, widgetClose } from 'vs/platform/theme/common/iconRegistry';
 import { IThemeService, registerThemingParticipant, ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { isHighContrast } from 'vs/platform/theme/common/theme';
@@ -209,6 +209,8 @@ export class FindWidget extends Widget implements IOverlayWidget, IVerticalSashL
 			}
 
 			if (e.hasChanged(EditorOption.find)) {
+				const supportLoop = this._codeEditor.getOption(EditorOption.find).loop;
+				this._state.change({ loop: supportLoop }, false);
 				const addExtraSpaceOnTop = this._codeEditor.getOption(EditorOption.find).addExtraSpaceOnTop;
 				if (addExtraSpaceOnTop && !this._viewZone) {
 					this._viewZone = new FindWidgetViewZone(0);
@@ -1387,6 +1389,11 @@ registerThemingParticipant((theme, collector) => {
 		collector.addRule(`.monaco-editor .find-widget { box-shadow: 0 0 8px 2px ${widgetShadowColor}; }`);
 	}
 
+	const widgetBorderColor = theme.getColor(widgetBorder);
+	if (widgetBorderColor) {
+		collector.addRule(`.monaco-editor .find-widget { border-left: 1px solid ${widgetBorderColor}; border-right: 1px solid ${widgetBorderColor}; border-bottom: 1px solid ${widgetBorderColor}; }`);
+	}
+
 	const findMatchHighlightBorder = theme.getColor(editorFindMatchHighlightBorder);
 	if (findMatchHighlightBorder) {
 		collector.addRule(`.monaco-editor .findMatch { border: 1px ${isHighContrast(theme.type) ? 'dotted' : 'solid'} ${findMatchHighlightBorder}; box-sizing: border-box; }`);
diff --git a/src/vs/editor/contrib/folding/browser/folding.css b/src/vs/editor/contrib/folding/browser/folding.css
index 98ae93d37ab6c1..049465c97b73ad 100644
--- a/src/vs/editor/contrib/folding/browser/folding.css
+++ b/src/vs/editor/contrib/folding/browser/folding.css
@@ -32,3 +32,14 @@
 	cursor: pointer;
 }
 
+.monaco-editor .folded-background {
+	background-color: var(--vscode-editor-foldBackground);
+}
+
+.monaco-editor .cldr.codicon.codicon-folding-expanded,
+.monaco-editor .cldr.codicon.codicon-folding-collapsed,
+.monaco-editor .cldr.codicon.codicon-folding-manual-expanded,
+.monaco-editor .cldr.codicon.codicon-folding-manual-collapsed {
+	color: var(--vscode-editorGutter-foldingControlForeground) !important;
+}
+
diff --git a/src/vs/editor/contrib/folding/browser/folding.ts b/src/vs/editor/contrib/folding/browser/folding.ts
index 1cd4878299b28d..10348b37c58077 100644
--- a/src/vs/editor/contrib/folding/browser/folding.ts
+++ b/src/vs/editor/contrib/folding/browser/folding.ts
@@ -29,9 +29,7 @@ import { IndentRangeProvider } from 'vs/editor/contrib/folding/browser/indentRan
 import * as nls from 'vs/nls';
 import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { editorSelectionBackground, iconForeground, registerColor, transparent } from 'vs/platform/theme/common/colorRegistry';
-import { registerThemingParticipant, ThemeIcon } from 'vs/platform/theme/common/themeService';
-import { foldingCollapsedIcon, FoldingDecorationProvider, foldingExpandedIcon, foldingManualCollapsedIcon, foldingManualExpandedIcon } from './foldingDecorations';
+import { FoldingDecorationProvider } from './foldingDecorations';
 import { FoldingRegion, FoldingRegions, FoldRange, FoldSource, ILineRange } from './foldingRanges';
 import { SyntaxRangeProvider } from './syntaxRangeProvider';
 import { INotificationService } from 'vs/platform/notification/common/notification';
@@ -1087,8 +1085,8 @@ class FoldRangeFromSelectionAction extends FoldingAction<void> {
 	constructor() {
 		super({
 			id: 'editor.createFoldingRangeFromSelection',
-			label: nls.localize('createManualFoldRange.label', "Create Manual Folding Range from Selection"),
-			alias: 'Create Manual Folding Range from Selection',
+			label: nls.localize('createManualFoldRange.label', "Create Folding Range from Selection"),
+			alias: 'Create Folding Range from Selection',
 			precondition: CONTEXT_FOLDING_ENABLED,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
@@ -1199,25 +1197,3 @@ for (let i = 1; i <= 7; i++) {
 		})
 	);
 }
-
-export const foldBackgroundBackground = registerColor('editor.foldBackground', { light: transparent(editorSelectionBackground, 0.3), dark: transparent(editorSelectionBackground, 0.3), hcDark: null, hcLight: null }, nls.localize('foldBackgroundBackground', "Background color behind folded ranges. The color must not be opaque so as not to hide underlying decorations."), true);
-export const editorFoldForeground = registerColor('editorGutter.foldingControlForeground', { dark: iconForeground, light: iconForeground, hcDark: iconForeground, hcLight: iconForeground }, nls.localize('editorGutter.foldingControlForeground', 'Color of the folding control in the editor gutter.'));
-
-registerThemingParticipant((theme, collector) => {
-	const foldBackground = theme.getColor(foldBackgroundBackground);
-	if (foldBackground) {
-		collector.addRule(`.monaco-editor .folded-background { background-color: ${foldBackground}; }`);
-	}
-
-	const editorFoldColor = theme.getColor(editorFoldForeground);
-	if (editorFoldColor) {
-		collector.addRule(`
-		.monaco-editor .cldr${ThemeIcon.asCSSSelector(foldingExpandedIcon)},
-		.monaco-editor .cldr${ThemeIcon.asCSSSelector(foldingCollapsedIcon)},
-		.monaco-editor .cldr${ThemeIcon.asCSSSelector(foldingManualExpandedIcon)},
-		.monaco-editor .cldr${ThemeIcon.asCSSSelector(foldingManualCollapsedIcon)} {
-			color: ${editorFoldColor} !important;
-		}
-		`);
-	}
-});
diff --git a/src/vs/editor/contrib/folding/browser/foldingDecorations.ts b/src/vs/editor/contrib/folding/browser/foldingDecorations.ts
index 6a163da1beb1df..b9a9d7ac9dcef9 100644
--- a/src/vs/editor/contrib/folding/browser/foldingDecorations.ts
+++ b/src/vs/editor/contrib/folding/browser/foldingDecorations.ts
@@ -5,18 +5,24 @@
 
 import { Codicon } from 'vs/base/common/codicons';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IModelDecorationOptions, IModelDecorationsChangeAccessor, TrackedRangeStickiness } from 'vs/editor/common/model';
+import { IModelDecorationOptions, IModelDecorationsChangeAccessor, MinimapPosition, TrackedRangeStickiness } from 'vs/editor/common/model';
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 import { IDecorationProvider } from 'vs/editor/contrib/folding/browser/foldingModel';
 import { localize } from 'vs/nls';
+import { editorSelectionBackground, iconForeground, registerColor, transparent } from 'vs/platform/theme/common/colorRegistry';
 import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { themeColorFromId, ThemeIcon } from 'vs/platform/theme/common/themeService';
+
+const foldBackground = registerColor('editor.foldBackground', { light: transparent(editorSelectionBackground, 0.3), dark: transparent(editorSelectionBackground, 0.3), hcDark: null, hcLight: null }, localize('foldBackgroundBackground', "Background color behind folded ranges. The color must not be opaque so as not to hide underlying decorations."), true);
+registerColor('editorGutter.foldingControlForeground', { dark: iconForeground, light: iconForeground, hcDark: iconForeground, hcLight: iconForeground }, localize('editorGutter.foldingControlForeground', 'Color of the folding control in the editor gutter.'));
 
 export const foldingExpandedIcon = registerIcon('folding-expanded', Codicon.chevronDown, localize('foldingExpandedIcon', 'Icon for expanded ranges in the editor glyph margin.'));
 export const foldingCollapsedIcon = registerIcon('folding-collapsed', Codicon.chevronRight, localize('foldingCollapsedIcon', 'Icon for collapsed ranges in the editor glyph margin.'));
 export const foldingManualCollapsedIcon = registerIcon('folding-manual-collapsed', foldingCollapsedIcon, localize('foldingManualCollapedIcon', 'Icon for manually collapsed ranges in the editor glyph margin.'));
 export const foldingManualExpandedIcon = registerIcon('folding-manual-expanded', foldingExpandedIcon, localize('foldingManualExpandedIcon', 'Icon for manually expanded ranges in the editor glyph margin.'));
 
+const foldedBackgroundMinimap = { color: themeColorFromId(foldBackground), position: MinimapPosition.Inline };
+
 export class FoldingDecorationProvider implements IDecorationProvider {
 
 	private static readonly COLLAPSED_VISUAL_DECORATION = ModelDecorationOptions.register({
@@ -24,7 +30,7 @@ export class FoldingDecorationProvider implements IDecorationProvider {
 		stickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges,
 		afterContentClassName: 'inline-folded',
 		isWholeLine: true,
-		firstLineDecorationClassName: ThemeIcon.asClassName(foldingCollapsedIcon)
+		firstLineDecorationClassName: ThemeIcon.asClassName(foldingCollapsedIcon),
 	});
 
 	private static readonly COLLAPSED_HIGHLIGHTED_VISUAL_DECORATION = ModelDecorationOptions.register({
@@ -32,6 +38,7 @@ export class FoldingDecorationProvider implements IDecorationProvider {
 		stickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges,
 		afterContentClassName: 'inline-folded',
 		className: 'folded-background',
+		minimap: foldedBackgroundMinimap,
 		isWholeLine: true,
 		firstLineDecorationClassName: ThemeIcon.asClassName(foldingCollapsedIcon)
 	});
@@ -49,6 +56,7 @@ export class FoldingDecorationProvider implements IDecorationProvider {
 		stickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges,
 		afterContentClassName: 'inline-folded',
 		className: 'folded-background',
+		minimap: foldedBackgroundMinimap,
 		isWholeLine: true,
 		firstLineDecorationClassName: ThemeIcon.asClassName(foldingManualCollapsedIcon)
 	});
@@ -65,6 +73,7 @@ export class FoldingDecorationProvider implements IDecorationProvider {
 		stickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges,
 		afterContentClassName: 'inline-folded',
 		className: 'folded-background',
+		minimap: foldedBackgroundMinimap,
 		isWholeLine: true
 	});
 
diff --git a/src/vs/editor/contrib/format/browser/formattingEdit.ts b/src/vs/editor/contrib/format/browser/formattingEdit.ts
index 0ba4bbb0bb1eae..2f4a830a5cf92a 100644
--- a/src/vs/editor/contrib/format/browser/formattingEdit.ts
+++ b/src/vs/editor/contrib/format/browser/formattingEdit.ts
@@ -8,6 +8,7 @@ import { EditOperation, ISingleEditOperation } from 'vs/editor/common/core/editO
 import { Range } from 'vs/editor/common/core/range';
 import { EndOfLineSequence } from 'vs/editor/common/model';
 import { TextEdit } from 'vs/editor/common/languages';
+import { StableEditorScrollState } from 'vs/editor/browser/stableEditorScroll';
 
 export class FormattingEdit {
 
@@ -47,6 +48,7 @@ export class FormattingEdit {
 		if (addUndoStops) {
 			editor.pushUndoStop();
 		}
+		const scrollState = StableEditorScrollState.capture(editor);
 		const edits = FormattingEdit._handleEolEdits(editor, _edits);
 		if (edits.length === 1 && FormattingEdit._isFullModelReplaceEdit(editor, edits[0])) {
 			// We use replace semantics and hope that markers stay put...
@@ -57,5 +59,6 @@ export class FormattingEdit {
 		if (addUndoStops) {
 			editor.pushUndoStop();
 		}
+		scrollState.restoreRelativeVerticalPositionOfCursor(editor);
 	}
 }
diff --git a/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.ts b/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.ts
index c44bae5cb13179..24ffac212bd5f8 100644
--- a/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.ts
+++ b/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.ts
@@ -27,7 +27,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { ILabelService } from 'vs/platform/label/common/label';
 import { IMarker, IRelatedInformation, MarkerSeverity } from 'vs/platform/markers/common/markers';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { SeverityIcon } from 'vs/platform/severityIcon/common/severityIcon';
+import { SeverityIcon } from 'vs/platform/severityIcon/browser/severityIcon';
 import { contrastBorder, editorBackground, editorErrorBorder, editorErrorForeground, editorInfoBorder, editorInfoForeground, editorWarningBorder, editorWarningForeground, oneOf, registerColor, transparent } from 'vs/platform/theme/common/colorRegistry';
 import { IColorTheme, IThemeService } from 'vs/platform/theme/common/themeService';
 
diff --git a/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.ts b/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.ts
index 37338ef5d16298..d164b19a6072e6 100644
--- a/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.ts
+++ b/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.ts
@@ -306,6 +306,7 @@ registerAction2(class GoToDefinitionAction extends DefinitionAction {
 				order: 1.1
 			}, {
 				id: MenuId.MenubarGoMenu,
+				precondition: null,
 				group: '4_symbol_nav',
 				order: 2,
 			}]
@@ -429,6 +430,7 @@ registerAction2(class GoToDeclarationAction extends DeclarationAction {
 				order: 1.3
 			}, {
 				id: MenuId.MenubarGoMenu,
+				precondition: null,
 				group: '4_symbol_nav',
 				order: 3,
 			}],
@@ -523,6 +525,7 @@ registerAction2(class GoToTypeDefinitionAction extends TypeDefinitionAction {
 				order: 1.4
 			}, {
 				id: MenuId.MenubarGoMenu,
+				precondition: null,
 				group: '4_symbol_nav',
 				order: 3,
 			}]
@@ -614,6 +617,7 @@ registerAction2(class GoToImplementationAction extends ImplementationAction {
 				order: 1.45
 			}, {
 				id: MenuId.MenubarGoMenu,
+				precondition: null,
 				group: '4_symbol_nav',
 				order: 4,
 			}]
@@ -706,6 +710,7 @@ registerAction2(class GoToReferencesAction extends ReferencesAction {
 				order: 1.45
 			}, {
 				id: MenuId.MenubarGoMenu,
+				precondition: null,
 				group: '4_symbol_nav',
 				order: 5,
 			}]
diff --git a/src/vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.ts b/src/vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.ts
index 291288719a56e8..a71163b6deb8ca 100644
--- a/src/vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.ts
+++ b/src/vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.ts
@@ -31,6 +31,7 @@ import { DefinitionAction } from '../goToCommands';
 import { getDefinitionsAtPosition } from '../goToSymbol';
 import { IWordAtPosition } from 'vs/editor/common/core/wordHelper';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
+import { ModelDecorationInjectedTextOptions } from 'vs/editor/common/model/textModel';
 
 export class GotoDefinitionAtPositionEditorContribution implements IEditorContribution {
 
@@ -62,12 +63,13 @@ export class GotoDefinitionAtPositionEditorContribution implements IEditorContri
 
 		this.toUnhook.add(linkGesture.onExecute((mouseEvent: ClickLinkMouseEvent) => {
 			if (this.isEnabled(mouseEvent)) {
-				this.gotoDefinition(mouseEvent.target.position!, mouseEvent.hasSideBySideModifier).then(() => {
-					this.removeLinkDecorations();
-				}, (error: Error) => {
-					this.removeLinkDecorations();
-					onUnexpectedError(error);
-				});
+				this.gotoDefinition(mouseEvent.target.position!, mouseEvent.hasSideBySideModifier)
+					.catch((error: Error) => {
+						onUnexpectedError(error);
+					})
+					.finally(() => {
+						this.removeLinkDecorations();
+					});
 			}
 		}));
 
@@ -81,33 +83,30 @@ export class GotoDefinitionAtPositionEditorContribution implements IEditorContri
 		return editor.getContribution<GotoDefinitionAtPositionEditorContribution>(GotoDefinitionAtPositionEditorContribution.ID);
 	}
 
-	startFindDefinitionFromCursor(position: Position) {
+	async startFindDefinitionFromCursor(position: Position) {
 		// For issue: https://github.com/microsoft/vscode/issues/46257
 		// equivalent to mouse move with meta/ctrl key
 
 		// First find the definition and add decorations
 		// to the editor to be shown with the content hover widget
-		return this.startFindDefinition(position).then(() => {
-
-			// Add listeners for editor cursor move and key down events
-			// Dismiss the "extended" editor decorations when the user hides
-			// the hover widget. There is no event for the widget itself so these
-			// serve as a best effort. After removing the link decorations, the hover
-			// widget is clean and will only show declarations per next request.
-			this.toUnhookForKeyboard.add(this.editor.onDidChangeCursorPosition(() => {
+		await this.startFindDefinition(position);
+		// Add listeners for editor cursor move and key down events
+		// Dismiss the "extended" editor decorations when the user hides
+		// the hover widget. There is no event for the widget itself so these
+		// serve as a best effort. After removing the link decorations, the hover
+		// widget is clean and will only show declarations per next request.
+		this.toUnhookForKeyboard.add(this.editor.onDidChangeCursorPosition(() => {
+			this.currentWordAtPosition = null;
+			this.removeLinkDecorations();
+			this.toUnhookForKeyboard.clear();
+		}));
+		this.toUnhookForKeyboard.add(this.editor.onKeyDown((e: IKeyboardEvent) => {
+			if (e) {
 				this.currentWordAtPosition = null;
 				this.removeLinkDecorations();
 				this.toUnhookForKeyboard.clear();
-			}));
-
-			this.toUnhookForKeyboard.add(this.editor.onKeyDown((e: IKeyboardEvent) => {
-				if (e) {
-					this.currentWordAtPosition = null;
-					this.removeLinkDecorations();
-					this.toUnhookForKeyboard.clear();
-				}
-			}));
-		});
+			}
+		}));
 	}
 
 	private startFindDefinitionFromMouse(mouseEvent: ClickLinkMouseEvent, withKey?: ClickLinkKeyboardEvent): void {
@@ -128,7 +127,7 @@ export class GotoDefinitionAtPositionEditorContribution implements IEditorContri
 		this.startFindDefinition(position);
 	}
 
-	private startFindDefinition(position: Position): Promise<number | undefined> {
+	private async startFindDefinition(position: Position): Promise<void> {
 
 		// Dispose listeners for updating decorations when using keyboard to show definition hover
 		this.toUnhookForKeyboard.clear();
@@ -138,12 +137,12 @@ export class GotoDefinitionAtPositionEditorContribution implements IEditorContri
 		if (!word) {
 			this.currentWordAtPosition = null;
 			this.removeLinkDecorations();
-			return Promise.resolve(0);
+			return;
 		}
 
 		// Return early if word at position is still the same
 		if (this.currentWordAtPosition && this.currentWordAtPosition.startColumn === word.startColumn && this.currentWordAtPosition.endColumn === word.endColumn && this.currentWordAtPosition.word === word.word) {
-			return Promise.resolve(0);
+			return;
 		}
 
 		this.currentWordAtPosition = word;
@@ -158,66 +157,71 @@ export class GotoDefinitionAtPositionEditorContribution implements IEditorContri
 
 		this.previousPromise = createCancelablePromise(token => this.findDefinition(position, token));
 
-		return this.previousPromise.then(results => {
-			if (!results || !results.length || !state.validate(this.editor)) {
-				this.removeLinkDecorations();
-				return;
-			}
+		let results: LocationLink[] | null;
+		try {
+			results = await this.previousPromise;
 
-			const linkRange = results[0].originSelectionRange
-				? Range.lift(results[0].originSelectionRange)
-				: new Range(position.lineNumber, word.startColumn, position.lineNumber, word.endColumn);
+		} catch (error) {
+			onUnexpectedError(error);
+			return;
+		}
 
-			// Multiple results
-			if (results.length > 1) {
+		if (!results || !results.length || !state.validate(this.editor)) {
+			this.removeLinkDecorations();
+			return;
+		}
 
-				let combinedRange = linkRange;
-				for (const { originSelectionRange } of results) {
-					if (originSelectionRange) {
-						combinedRange = Range.plusRange(combinedRange, originSelectionRange);
-					}
-				}
+		const linkRange = results[0].originSelectionRange
+			? Range.lift(results[0].originSelectionRange)
+			: new Range(position.lineNumber, word.startColumn, position.lineNumber, word.endColumn);
 
-				this.addDecoration(
-					combinedRange,
-					new MarkdownString().appendText(nls.localize('multipleResults', "Click to show {0} definitions.", results.length))
-				);
+		// Multiple results
+		if (results.length > 1) {
+
+			let combinedRange = linkRange;
+			for (const { originSelectionRange } of results) {
+				if (originSelectionRange) {
+					combinedRange = Range.plusRange(combinedRange, originSelectionRange);
+				}
 			}
 
+			this.addDecoration(
+				combinedRange,
+				new MarkdownString().appendText(nls.localize('multipleResults', "Click to show {0} definitions.", results.length))
+			);
+		} else {
 			// Single result
-			else {
-				const result = results[0];
-
-				if (!result.uri) {
-					return;
-				}
+			const result = results[0];
 
-				this.textModelResolverService.createModelReference(result.uri).then(ref => {
+			if (!result.uri) {
+				return;
+			}
 
-					if (!ref.object || !ref.object.textEditorModel) {
-						ref.dispose();
-						return;
-					}
+			this.textModelResolverService.createModelReference(result.uri).then(ref => {
 
-					const { object: { textEditorModel } } = ref;
-					const { startLineNumber } = result.range;
+				if (!ref.object || !ref.object.textEditorModel) {
+					ref.dispose();
+					return;
+				}
 
-					if (startLineNumber < 1 || startLineNumber > textEditorModel.getLineCount()) {
-						// invalid range
-						ref.dispose();
-						return;
-					}
+				const { object: { textEditorModel } } = ref;
+				const { startLineNumber } = result.range;
 
-					const previewValue = this.getPreviewValue(textEditorModel, startLineNumber, result);
-					const languageId = this.languageService.guessLanguageIdByFilepathOrFirstLine(textEditorModel.uri);
-					this.addDecoration(
-						linkRange,
-						new MarkdownString().appendCodeblock(languageId ? languageId : '', previewValue)
-					);
+				if (startLineNumber < 1 || startLineNumber > textEditorModel.getLineCount()) {
+					// invalid range
 					ref.dispose();
-				});
-			}
-		}).then(undefined, onUnexpectedError);
+					return;
+				}
+
+				const previewValue = this.getPreviewValue(textEditorModel, startLineNumber, result);
+				const languageId = this.languageService.guessLanguageIdByFilepathOrFirstLine(textEditorModel.uri);
+				this.addDecoration(
+					linkRange,
+					previewValue ? new MarkdownString().appendCodeblock(languageId ? languageId : '', previewValue) : undefined
+				);
+				ref.dispose();
+			});
+		}
 	}
 
 	private getPreviewValue(textEditorModel: ITextModel, startLineNumber: number, result: LocationLink) {
@@ -260,7 +264,7 @@ export class GotoDefinitionAtPositionEditorContribution implements IEditorContri
 		return new Range(startLineNumber, 1, endLineNumber + 1, 1);
 	}
 
-	private addDecoration(range: Range, hoverMessage: MarkdownString): void {
+	private addDecoration(range: Range, hoverMessage: MarkdownString | undefined): void {
 
 		const newDecorations: IModelDeltaDecoration = {
 			range: range,
@@ -283,6 +287,7 @@ export class GotoDefinitionAtPositionEditorContribution implements IEditorContri
 			&& mouseEvent.isLeftClick
 			&& mouseEvent.isNoneOrSingleMouseDown
 			&& mouseEvent.target.type === MouseTargetType.CONTENT_TEXT
+			&& !(mouseEvent.target.detail.injectedText?.options instanceof ModelDecorationInjectedTextOptions)
 			&& (mouseEvent.hasTriggerModifier || (withKey ? withKey.keyCodeIsTriggerKey : false))
 			&& this.languageFeaturesService.definitionProvider.has(this.editor.getModel());
 	}
@@ -301,7 +306,7 @@ export class GotoDefinitionAtPositionEditorContribution implements IEditorContri
 		return this.editor.invokeWithinContext((accessor) => {
 			const canPeek = !openToSide && this.editor.getOption(EditorOption.definitionLinkOpensInPeek) && !this.isInPeekEditor(accessor);
 			const action = new DefinitionAction({ openToSide, openInPeek: canPeek, muteMessage: true }, { title: { value: '', original: '' }, id: '', precondition: undefined });
-			return action.run(accessor, this.editor);
+			return action.run(accessor);
 		});
 	}
 
@@ -312,6 +317,7 @@ export class GotoDefinitionAtPositionEditorContribution implements IEditorContri
 
 	public dispose(): void {
 		this.toUnhook.dispose();
+		this.toUnhookForKeyboard.dispose();
 	}
 }
 
diff --git a/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesController.ts b/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesController.ts
index b35ba50247ddeb..1eefd9eaa69db2 100644
--- a/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesController.ts
+++ b/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesController.ts
@@ -126,7 +126,7 @@ export abstract class ReferencesController implements IEditorContribution {
 					break;
 				case 'goto':
 					if (peekMode) {
-						this._gotoReference(element);
+						this._gotoReference(element, true);
 					} else {
 						this.openReference(element, false, true);
 					}
@@ -207,7 +207,7 @@ export abstract class ReferencesController implements IEditorContribution {
 		const editorFocus = this._editor.hasTextFocus();
 		const previewEditorFocus = this._widget.isPreviewEditorFocused();
 		await this._widget.setSelection(target);
-		await this._gotoReference(target);
+		await this._gotoReference(target, false);
 		if (editorFocus) {
 			this._editor.focus();
 		} else if (this._widget && previewEditorFocus) {
@@ -237,7 +237,7 @@ export abstract class ReferencesController implements IEditorContribution {
 		this._requestIdPool += 1; // Cancel pending requests
 	}
 
-	private _gotoReference(ref: Location): Promise<any> {
+	private _gotoReference(ref: Location, pinned: boolean): Promise<any> {
 		this._widget?.hide();
 
 		this._ignoreModelChangeEvent = true;
@@ -245,7 +245,7 @@ export abstract class ReferencesController implements IEditorContribution {
 
 		return this._editorService.openCodeEditor({
 			resource: ref.uri,
-			options: { selection: range, selectionSource: TextEditorSelectionSource.JUMP }
+			options: { selection: range, selectionSource: TextEditorSelectionSource.JUMP, pinned }
 		}, this._editor).then(openedEditor => {
 			this._ignoreModelChangeEvent = false;
 
diff --git a/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesTree.ts b/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesTree.ts
index 8e8ce91c40ea65..ec127689cb02a9 100644
--- a/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesTree.ts
+++ b/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesTree.ts
@@ -19,8 +19,7 @@ import { localize } from 'vs/nls';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { ILabelService } from 'vs/platform/label/common/label';
-import { attachBadgeStyler } from 'vs/platform/theme/common/styler';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { defaultCountBadgeStyles } from 'vs/platform/theme/browser/defaultStyles';
 import { FileReferences, OneReference, ReferencesModel } from '../referencesModel';
 
 //#region data source
@@ -112,16 +111,14 @@ class FileReferencesTemplate extends Disposable {
 
 	constructor(
 		container: HTMLElement,
-		@ILabelService private readonly _labelService: ILabelService,
-		@IThemeService themeService: IThemeService,
+		@ILabelService private readonly _labelService: ILabelService
 	) {
 		super();
 		const parent = document.createElement('div');
 		parent.classList.add('reference-file');
 		this.file = this._register(new IconLabel(parent, { supportHighlights: true }));
 
-		this.badge = new CountBadge(dom.append(parent, dom.$('.count')));
-		this._register(attachBadgeStyler(this.badge, themeService));
+		this.badge = new CountBadge(dom.append(parent, dom.$('.count')), {}, defaultCountBadgeStyles);
 
 		container.appendChild(parent);
 	}
diff --git a/src/vs/editor/contrib/hover/browser/hover.ts b/src/vs/editor/contrib/hover/browser/hover.ts
index a1a0e1e12fdce6..3442be6b8186f1 100644
--- a/src/vs/editor/contrib/hover/browser/hover.ts
+++ b/src/vs/editor/contrib/hover/browser/hover.ts
@@ -167,6 +167,12 @@ export class ModesHoverController implements IEditorContribution {
 			return;
 		}
 
+		if (this._isHoverSticky && this._contentWidget?.isVisibleFromKeyboard()) {
+			// Sticky mode is on and the hover has been shown via keyboard
+			// so moving the mouse has no effect
+			return;
+		}
+
 		if (!this._isHoverEnabled) {
 			this._hideWidgets();
 			return;
@@ -174,12 +180,6 @@ export class ModesHoverController implements IEditorContribution {
 
 		const contentWidget = this._getOrCreateContentWidget();
 
-		if (this._isHoverSticky && contentWidget.isVisibleFromKeyboard()) {
-			// Sticky mode is on and the hover has been shown via keyboard
-			// so moving the mouse has no effect
-			return;
-		}
-
 		if (contentWidget.maybeShowAt(mouseEvent)) {
 			this._glyphWidget?.hide();
 			return;
diff --git a/src/vs/editor/contrib/indentation/browser/indentation.ts b/src/vs/editor/contrib/indentation/browser/indentation.ts
index dcda82dd6d79fd..a14b7d6d5aec94 100644
--- a/src/vs/editor/contrib/indentation/browser/indentation.ts
+++ b/src/vs/editor/contrib/indentation/browser/indentation.ts
@@ -252,7 +252,7 @@ export class ChangeIndentationSizeAction extends EditorAction {
 							});
 						} else {
 							model.updateOptions({
-								tabSize: this.insertSpaces ? undefined : pickedVal,
+								tabSize: pickedVal,
 								indentSize: pickedVal,
 								insertSpaces: this.insertSpaces
 							});
diff --git a/src/vs/editor/contrib/indentation/test/browser/indentation.test.ts b/src/vs/editor/contrib/indentation/test/browser/indentation.test.ts
index fc218a1398edc2..054d8a2937c497 100644
--- a/src/vs/editor/contrib/indentation/test/browser/indentation.test.ts
+++ b/src/vs/editor/contrib/indentation/test/browser/indentation.test.ts
@@ -265,3 +265,54 @@ suite('Editor Contrib - Auto Indent On Paste', () => {
 		});
 	});
 });
+
+suite('Editor Contrib - Keep Indent On Paste', () => {
+	let disposables: DisposableStore;
+
+	setup(() => {
+		disposables = new DisposableStore();
+	});
+
+	teardown(() => {
+		disposables.dispose();
+	});
+
+	test('issue #167299: Blank line removes indent', () => {
+		const languageId = 'blankLineRemovesIndent';
+		const model = createTextModel("", languageId, {});
+		disposables.add(model);
+		withTestCodeEditor(model, { autoIndent: 'full' }, (editor, viewModel, instantiationService) => {
+			const languageService = instantiationService.get(ILanguageService);
+			const languageConfigurationService = instantiationService.get(ILanguageConfigurationService);
+			disposables.add(languageService.registerLanguage({ id: languageId }));
+			disposables.add(languageConfigurationService.register(languageId, {
+				brackets: [
+					['{', '}'],
+					['[', ']'],
+					['(', ')']
+				],
+				indentationRules: javascriptIndentationRules,
+				onEnterRules: javascriptOnEnterRules
+			}));
+
+			const autoIndentOnPasteController = editor.registerAndInstantiateContribution(AutoIndentOnPaste.ID, AutoIndentOnPaste);
+			const pasteText = [
+				'',
+				'export type IncludeReference =',
+				'	| BaseReference',
+				'	| SelfReference',
+				'	| RelativeReference;',
+				'',
+				'export const enum IncludeReferenceKind {',
+				'	Base,',
+				'	Self,',
+				'	RelativeReference,',
+				'}'
+			].join('\n');
+
+			viewModel.paste(pasteText, true, undefined, 'keyboard');
+			autoIndentOnPasteController.trigger(new Range(1, 1, 11, 2));
+			assert.strictEqual(model.getValue(), pasteText);
+		});
+	});
+});
diff --git a/src/vs/editor/contrib/inlayHints/browser/inlayHintsController.ts b/src/vs/editor/contrib/inlayHints/browser/inlayHintsController.ts
index 4e7cce9783da11..dc40d34872c8bc 100644
--- a/src/vs/editor/contrib/inlayHints/browser/inlayHintsController.ts
+++ b/src/vs/editor/contrib/inlayHints/browser/inlayHintsController.ts
@@ -15,6 +15,7 @@ import { assertType } from 'vs/base/common/types';
 import { URI } from 'vs/base/common/uri';
 import { IActiveCodeEditor, ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
 import { ClassNameReference, CssProperties, DynamicCssRules } from 'vs/editor/browser/editorDom';
+import { StableEditorScrollState } from 'vs/editor/browser/stableEditorScroll';
 import { EditorOption, EDITOR_FONT_DEFAULTS } from 'vs/editor/common/config/editorOptions';
 import { EditOperation } from 'vs/editor/common/core/editOperation';
 import { Range } from 'vs/editor/common/core/range';
@@ -250,7 +251,7 @@ export class InlayHintsController implements IEditorContribution {
 				if (!this._editor.hasModel()) {
 					return;
 				}
-				const newRenderMode = e.altKey && e.ctrlKey ? altMode : defaultMode;
+				const newRenderMode = e.altKey && e.ctrlKey && !(e.shiftKey || e.metaKey) ? altMode : defaultMode;
 				if (newRenderMode !== this._activeRenderMode) {
 					this._activeRenderMode = newRenderMode;
 					const model = this._editor.getModel();
@@ -297,7 +298,7 @@ export class InlayHintsController implements IEditorContribution {
 				? new ActiveInlayHintInfo(labelPart, mouseEvent.hasTriggerModifier)
 				: undefined;
 
-			const lineNumber = labelPart.item.hint.position.lineNumber;
+			const lineNumber = model.validatePosition(labelPart.item.hint.position).lineNumber;
 			const range = new Range(lineNumber, 1, lineNumber, model.getLineMaxColumn(lineNumber));
 			const lineHints = this._getInlineHintsForRange(range);
 			this._updateHintsDecorators([range], lineHints);
@@ -563,6 +564,8 @@ export class InlayHintsController implements IEditorContribution {
 			}
 		}
 
+		const scrollState = StableEditorScrollState.capture(this._editor);
+
 		this._editor.changeDecorations(accessor => {
 			const newDecorationIds = accessor.deltaDecorations(decorationIdsToReplace, newDecorationsData.map(d => d.decoration));
 			for (let i = 0; i < newDecorationIds.length; i++) {
@@ -570,6 +573,8 @@ export class InlayHintsController implements IEditorContribution {
 				this._decorationsMetadata.set(newDecorationIds[i], data);
 			}
 		});
+
+		scrollState.restore(this._editor);
 	}
 
 	private _fillInColors(props: CssProperties, hint: languages.InlayHint): void {
diff --git a/src/vs/editor/contrib/inlayHints/browser/inlayHintsHover.ts b/src/vs/editor/contrib/inlayHints/browser/inlayHintsHover.ts
index f9781fcf0296f1..4b33142996d5ce 100644
--- a/src/vs/editor/contrib/inlayHints/browser/inlayHintsHover.ts
+++ b/src/vs/editor/contrib/inlayHints/browser/inlayHintsHover.ts
@@ -96,7 +96,7 @@ export class InlayHintsHover extends MarkdownHoverParticipant implements IEditor
 			}
 			// (1.2) Inlay dbl-click gesture
 			if (isNonEmptyArray(part.item.hint.textEdits)) {
-				executor.emitOne(new MarkdownHover(this, anchor.range, [new MarkdownString().appendText(localize('hint.dbl', "Double click to insert"))], false, 10001));
+				executor.emitOne(new MarkdownHover(this, anchor.range, [new MarkdownString().appendText(localize('hint.dbl', "Double-click to insert"))], false, 10001));
 			}
 
 			// (2) Inlay Label Part Tooltip
diff --git a/src/vs/editor/contrib/inlayHints/browser/inlayHintsLocations.ts b/src/vs/editor/contrib/inlayHints/browser/inlayHintsLocations.ts
index b2df34e97ecc81..b9ba892e1082ff 100644
--- a/src/vs/editor/contrib/inlayHints/browser/inlayHintsLocations.ts
+++ b/src/vs/editor/contrib/inlayHints/browser/inlayHintsLocations.ts
@@ -105,7 +105,7 @@ export async function goToDefinitionWithLocation(accessor: ServicesAccessor, eve
 		const canPeek = !openToSide && editor.getOption(EditorOption.definitionLinkOpensInPeek) && !isInPeek;
 
 		const action = new DefinitionAction({ openToSide, openInPeek: canPeek, muteMessage: true }, { title: { value: '', original: '' }, id: '', precondition: undefined });
-		return action.run(accessor, editor, { model: ref.object.textEditorModel, position: Range.getStartPosition(location.range) }, Range.lift(location.range));
+		return action.run(accessor, new SymbolNavigationAnchor(ref.object.textEditorModel, Range.getStartPosition(location.range)), Range.lift(location.range));
 	});
 
 	ref.dispose();
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/ghostText.contribution.ts b/src/vs/editor/contrib/inlineCompletions/browser/ghostText.contribution.ts
index 38151191829ff7..f6ed98005d5d96 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/ghostText.contribution.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/ghostText.contribution.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyCode } from 'vs/base/common/keyCodes';
-import { EditorCommand, registerEditorAction, registerEditorCommand, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
+import { EditorCommand, EditorContributionInstantiation, registerEditorAction, registerEditorCommand, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { HoverParticipantRegistry } from 'vs/editor/contrib/hover/browser/hoverTypes';
 import { inlineSuggestCommitId } from 'vs/editor/contrib/inlineCompletions/browser/consts';
@@ -13,7 +13,7 @@ import { InlineCompletionsHoverParticipant } from 'vs/editor/contrib/inlineCompl
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
 
-registerEditorContribution(GhostTextController.ID, GhostTextController);
+registerEditorContribution(GhostTextController.ID, GhostTextController, EditorContributionInstantiation.Eventually);
 registerEditorAction(TriggerInlineSuggestionAction);
 registerEditorAction(ShowNextInlineSuggestionAction);
 registerEditorAction(ShowPreviousInlineSuggestionAction);
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/ghostTextController.ts b/src/vs/editor/contrib/inlineCompletions/browser/ghostTextController.ts
index ad44af2d158887..a5567bb9557404 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/ghostTextController.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/ghostTextController.ts
@@ -49,10 +49,7 @@ export class GhostTextController extends Disposable {
 			this.updateModelController();
 		}));
 		this._register(this.editor.onDidChangeConfiguration((e) => {
-			if (e.hasChanged(EditorOption.suggest)) {
-				this.updateModelController();
-			}
-			if (e.hasChanged(EditorOption.inlineSuggest)) {
+			if (e.hasChanged(EditorOption.suggest) || e.hasChanged(EditorOption.inlineSuggest)) {
 				this.updateModelController();
 			}
 		}));
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts
index 2016d8877225a5..a43d70e6cc5e90 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts
@@ -3,10 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { assertNever } from 'vs/base/common/assert';
 import { CancelablePromise, createCancelablePromise, RunOnceScheduler } from 'vs/base/common/async';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { onUnexpectedError, onUnexpectedExternalError } from 'vs/base/common/errors';
 import { Emitter } from 'vs/base/common/event';
+import { matchesSubString } from 'vs/base/common/filters';
 import { Disposable, IDisposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { CoreEditingCommands } from 'vs/editor/browser/coreCommands';
 import { IActiveCodeEditor } from 'vs/editor/browser/editorBrowser';
@@ -14,25 +16,23 @@ import { EditorOption } from 'vs/editor/common/config/editorOptions';
 import { EditOperation } from 'vs/editor/common/core/editOperation';
 import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
-import { ITextModel } from 'vs/editor/common/model';
+import { CursorChangeReason } from 'vs/editor/common/cursorEvents';
+import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
 import { Command, InlineCompletion, InlineCompletionContext, InlineCompletions, InlineCompletionsProvider, InlineCompletionTriggerKind } from 'vs/editor/common/languages';
-import { BaseGhostTextWidgetModel, GhostText, GhostTextReplacement, GhostTextWidgetModel } from 'vs/editor/contrib/inlineCompletions/browser/ghostText';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { inlineSuggestCommitId } from 'vs/editor/contrib/inlineCompletions/browser/consts';
-import { SharedInlineCompletionCache } from 'vs/editor/contrib/inlineCompletions/browser/ghostTextModel';
-import { inlineCompletionToGhostText, NormalizedInlineCompletion } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionToGhostText';
 import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
+import { ITextModel } from 'vs/editor/common/model';
 import { fixBracketsInLine } from 'vs/editor/common/model/bracketPairsTextModelPart/fixBrackets';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
 import { IFeatureDebounceInformation, ILanguageFeatureDebounceService } from 'vs/editor/common/services/languageFeatureDebounce';
-import { SnippetParser } from 'vs/editor/contrib/snippet/browser/snippetParser';
-import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
-import { assertNever } from 'vs/base/common/assert';
-import { matchesSubString } from 'vs/base/common/filters';
+import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
+import { inlineSuggestCommitId } from 'vs/editor/contrib/inlineCompletions/browser/consts';
+import { BaseGhostTextWidgetModel, GhostText, GhostTextReplacement, GhostTextWidgetModel } from 'vs/editor/contrib/inlineCompletions/browser/ghostText';
+import { SharedInlineCompletionCache } from 'vs/editor/contrib/inlineCompletions/browser/ghostTextModel';
+import { inlineCompletionToGhostText, NormalizedInlineCompletion } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionToGhostText';
 import { getReadonlyEmptyArray } from 'vs/editor/contrib/inlineCompletions/browser/utils';
+import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
+import { SnippetParser, Text } from 'vs/editor/contrib/snippet/browser/snippetParser';
+import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { CursorChangeReason } from 'vs/editor/common/cursorEvents';
 
 export class InlineCompletionsModel extends Disposable implements GhostTextWidgetModel {
 	protected readonly onDidChangeEmitter = new Emitter<void>();
@@ -507,6 +507,7 @@ export class InlineCompletionsSession extends BaseGhostTextWidgetModel {
 		if (!completion) {
 			return;
 		}
+
 		if (completion.snippetInfo || completion.filterText !== completion.insertText) {
 			// not in WYSIWYG mode, partial commit might change completion, thus it is not supported
 			this.commit(completion);
@@ -522,7 +523,8 @@ export class InlineCompletionsSession extends BaseGhostTextWidgetModel {
 		const line = firstPart.lines[0];
 		const langId = this.editor.getModel()!.getLanguageIdAtPosition(ghostText.lineNumber, 1);
 		const config = this.languageConfigurationService.getLanguageConfiguration(langId);
-		const m = line.match(config.wordDefinition);
+		const r = new RegExp(config.wordDefinition, config.wordDefinition.flags.replace('g', ''));
+		const m = line.match(r);
 		let acceptUntilIndexExclusive = 0;
 		if (m && m.index !== undefined) {
 			if (m.index === 0) {
@@ -805,12 +807,17 @@ export async function provideInlineCompletions(
 				}
 
 				const snippet = new SnippetParser().parse(item.insertText.snippet);
-				insertText = snippet.toString();
 
-				snippetInfo = {
-					snippet: item.insertText.snippet,
-					range: range
-				};
+				if (snippet.children.length === 1 && snippet.children[0] instanceof Text) {
+					insertText = snippet.children[0].value;
+					snippetInfo = undefined;
+				} else {
+					insertText = snippet.toString();
+					snippetInfo = {
+						snippet: item.insertText.snippet,
+						range: range
+					};
+				}
 			} else {
 				assertNever(item.insertText);
 			}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/suggestWidgetInlineCompletionProvider.ts b/src/vs/editor/contrib/inlineCompletions/browser/suggestWidgetInlineCompletionProvider.ts
index b2d9acaf0ba1c2..0ff0c4d5726ddb 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/suggestWidgetInlineCompletionProvider.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/suggestWidgetInlineCompletionProvider.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { compareBy, findMaxBy, numberComparator } from 'vs/base/common/arrays';
-import { RunOnceScheduler } from 'vs/base/common/async';
 import { Emitter, Event } from 'vs/base/common/event';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IActiveCodeEditor } from 'vs/editor/browser/editorBrowser';
@@ -39,16 +38,6 @@ export class SuggestWidgetInlineCompletionProvider extends Disposable {
 
 	public readonly onDidChange = this.onDidChangeEmitter.event;
 
-	// This delay fixes a suggest widget issue when typing "." immediately restarts the suggestion session.
-	private readonly setInactiveDelayed = this._register(new RunOnceScheduler(() => {
-		if (!this.isSuggestWidgetVisible) {
-			if (this._isActive) {
-				this._isActive = false;
-				this.onDidChangeEmitter.fire();
-			}
-		}
-	}, 100));
-
 	/**
 	 * Returns undefined if the suggest widget is not active.
 	*/
@@ -126,8 +115,7 @@ export class SuggestWidgetInlineCompletionProvider extends Disposable {
 				}));
 				this._register(suggestController.widget.value.onDidHide(() => {
 					this.isSuggestWidgetVisible = false;
-					this.setInactiveDelayed.schedule();
-					this.update(this._isActive);
+					this.update(false);
 				}));
 				this._register(suggestController.widget.value.onDidFocus(() => {
 					this.isSuggestWidgetVisible = true;
@@ -243,7 +231,7 @@ function suggestionToSuggestItemInfo(suggestController: SuggestController, posit
 			return undefined;
 		}
 
-		SnippetSession.adjustWhitespace(model, position, snippet, true, true);
+		SnippetSession.adjustWhitespace(model, position, true, snippet);
 		insertText = snippet.toString();
 		isSnippetText = true;
 	}
diff --git a/src/vs/editor/contrib/inlineCompletions/test/browser/suggestWidgetModel.test.ts b/src/vs/editor/contrib/inlineCompletions/test/browser/suggestWidgetModel.test.ts
index da634d390d5896..632700ef5314ab 100644
--- a/src/vs/editor/contrib/inlineCompletions/test/browser/suggestWidgetModel.test.ts
+++ b/src/vs/editor/contrib/inlineCompletions/test/browser/suggestWidgetModel.test.ts
@@ -48,7 +48,8 @@ suite('Suggest Widget Model', () => {
 		assert.strictEqual(rangeStartsWith(new Range(1, 1, 10, 5), new Range(1, 1, 11, 4)), false);
 	});
 
-	test('Active', async () => {
+	// This test is skipped because the fix for this causes https://github.com/microsoft/vscode/issues/166023
+	test.skip('Active', async () => {
 		await withAsyncTestCodeEditorAndInlineCompletionsModel('',
 			{ fakeClock: true, provider, },
 			async ({ editor, editorViewModel, context, model }) => {
diff --git a/src/vs/editor/contrib/multicursor/browser/multicursor.ts b/src/vs/editor/contrib/multicursor/browser/multicursor.ts
index ce576bbfcad598..be89dcf1bb08fc 100644
--- a/src/vs/editor/contrib/multicursor/browser/multicursor.ts
+++ b/src/vs/editor/contrib/multicursor/browser/multicursor.ts
@@ -18,17 +18,16 @@ import { Range } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
 import { IEditorContribution, IEditorDecorationsCollection, ScrollType } from 'vs/editor/common/editorCommon';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { FindMatch, ITextModel, OverviewRulerLane, TrackedRangeStickiness, MinimapPosition } from 'vs/editor/common/model';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
+import { FindMatch, ITextModel } from 'vs/editor/common/model';
 import { CommonFindController } from 'vs/editor/contrib/find/browser/findController';
 import { FindOptionOverride, INewFindReplaceState } from 'vs/editor/contrib/find/browser/findState';
 import * as nls from 'vs/nls';
 import { MenuId } from 'vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { overviewRulerSelectionHighlightForeground, minimapSelectionOccurrenceHighlight } from 'vs/platform/theme/common/colorRegistry';
-import { themeColorFromId } from 'vs/platform/theme/common/themeService';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
+import { getSelectionHighlightDecorationOptions } from 'vs/editor/contrib/wordHighlighter/browser/highlightDecorations';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 
 function announceCursorChange(previousCursorState: CursorState[], cursorState: CursorState[]): void {
 	const cursorDiff = cursorState.filter(cs => !previousCursorState.find(pcs => pcs.equals(cs)));
@@ -669,14 +668,18 @@ export abstract class MultiCursorSelectionControllerAction extends EditorAction
 		if (!multiCursorController) {
 			return;
 		}
-		const findController = CommonFindController.get(editor);
-		if (!findController) {
-			return;
-		}
 		const viewModel = editor._getViewModel();
 		if (viewModel) {
 			const previousCursorState = viewModel.getCursorStates();
-			this._run(multiCursorController, findController);
+			const findController = CommonFindController.get(editor);
+			if (findController) {
+				this._run(multiCursorController, findController);
+			} else {
+				const newFindController = accessor.get(IInstantiationService).createInstance(CommonFindController, editor);
+				this._run(multiCursorController, newFindController);
+				newFindController.dispose();
+			}
+
 			announceCursorChange(previousCursorState, viewModel.getCursorStates());
 		}
 	}
@@ -1034,38 +1037,17 @@ export class SelectionHighlighter extends Disposable implements IEditorContribut
 			}
 		}
 
-		const hasFindOccurrences = this._languageFeaturesService.documentHighlightProvider.has(model) && this.editor.getOption(EditorOption.occurrencesHighlight);
+		const hasSemanticHighlights = this._languageFeaturesService.documentHighlightProvider.has(model) && this.editor.getOption(EditorOption.occurrencesHighlight);
 		const decorations = matches.map(r => {
 			return {
 				range: r,
-				// Show in overviewRuler only if model has no semantic highlighting
-				options: (hasFindOccurrences ? SelectionHighlighter._SELECTION_HIGHLIGHT : SelectionHighlighter._SELECTION_HIGHLIGHT_OVERVIEW)
+				options: getSelectionHighlightDecorationOptions(hasSemanticHighlights)
 			};
 		});
 
 		this._decorations.set(decorations);
 	}
 
-	private static readonly _SELECTION_HIGHLIGHT_OVERVIEW = ModelDecorationOptions.register({
-		description: 'selection-highlight-overview',
-		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-		className: 'selectionHighlight',
-		minimap: {
-			color: themeColorFromId(minimapSelectionOccurrenceHighlight),
-			position: MinimapPosition.Inline
-		},
-		overviewRuler: {
-			color: themeColorFromId(overviewRulerSelectionHighlightForeground),
-			position: OverviewRulerLane.Center
-		}
-	});
-
-	private static readonly _SELECTION_HIGHLIGHT = ModelDecorationOptions.register({
-		description: 'selection-highlight',
-		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-		className: 'selectionHighlight',
-	});
-
 	public override dispose(): void {
 		this._setState(null);
 		super.dispose();
diff --git a/src/vs/editor/contrib/parameterHints/browser/parameterHints.css b/src/vs/editor/contrib/parameterHints/browser/parameterHints.css
index 98c398d2792fbb..d6537f63f1c0be 100644
--- a/src/vs/editor/contrib/parameterHints/browser/parameterHints.css
+++ b/src/vs/editor/contrib/parameterHints/browser/parameterHints.css
@@ -10,6 +10,14 @@
 	flex-direction: column;
 	line-height: 1.5em;
 	cursor: default;
+	color: var(--vscode-editor-hoverForeground);
+	background-color: var(--vscode-editorHoverWidget-background);
+	border: 1px solid var(--vscode-editorHoverWidget-border);
+}
+
+.hc-black .monaco-editor .parameter-hints-widget,
+.hc-light .monaco-editor .parameter-hints-widget {
+	border-width: 2px;
 }
 
 .monaco-editor .parameter-hints-widget > .phwrapper {
@@ -23,8 +31,13 @@
 	padding: 0;
 }
 
-.monaco-editor .parameter-hints-widget.visible {
-	transition: left .05s ease-in-out;
+.monaco-editor .parameter-hints-widget.multiple .body::before {
+	content: "";
+	display: block;
+	height: 100%;
+	position: absolute;
+	opacity: 0.5;
+	border-left: 1px solid var(--vscode-editorHoverWidget-border);
 }
 
 .monaco-editor .parameter-hints-widget p,
@@ -42,6 +55,18 @@
 
 .monaco-editor .parameter-hints-widget .signature {
 	padding: 4px 5px;
+	position: relative;
+}
+
+.monaco-editor .parameter-hints-widget .signature.has-docs::after {
+	content: "";
+	display: block;
+	position: absolute;
+	left: 0;
+	width: 100%;
+	padding-top: 4px;
+	opacity: 0.5;
+	border-bottom: 1px solid var(--vscode-editorHoverWidget-border);
 }
 
 .monaco-editor .parameter-hints-widget .docs {
@@ -53,26 +78,29 @@
 	display: none;
 }
 
-.monaco-editor .parameter-hints-widget .docs .markdown-docs {
-	white-space: initial;
+.monaco-editor .parameter-hints-widget .docs a {
+	color: var(--vscode-textLink-foreground);
 }
 
-.monaco-editor .parameter-hints-widget .docs .markdown-docs a:hover {
+.monaco-editor .parameter-hints-widget .docs a:hover {
+	color: var(--vscode-textLink-activeForeground);
 	cursor: pointer;
 }
 
-.monaco-editor .parameter-hints-widget .docs .markdown-docs code {
-	font-family: var(--monaco-monospace-font);
-}
-
-.monaco-editor .parameter-hints-widget .docs  .monaco-tokenized-source,
-.monaco-editor .parameter-hints-widget .docs .code {
-	white-space: pre-wrap;
+.monaco-editor .parameter-hints-widget .docs .markdown-docs {
+	white-space: initial;
 }
 
 .monaco-editor .parameter-hints-widget .docs code {
+	font-family: var(--monaco-monospace-font);
 	border-radius: 3px;
 	padding: 0 0.4em;
+	background-color: var(--vscode-textCodeBlock-background);
+}
+
+.monaco-editor .parameter-hints-widget .docs .monaco-tokenized-source,
+.monaco-editor .parameter-hints-widget .docs .code {
+	white-space: pre-wrap;
 }
 
 .monaco-editor .parameter-hints-widget .controls {
@@ -107,6 +135,7 @@
 }
 
 .monaco-editor .parameter-hints-widget .signature .parameter.active {
+	color: var(--vscode-editorHoverWidget-highlightForeground);
 	font-weight: bold;
 }
 
diff --git a/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts b/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts
index d535cb804d8c0e..dc9d11eda4ea2e 100644
--- a/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts
+++ b/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts
@@ -23,10 +23,9 @@ import { Context } from 'vs/editor/contrib/parameterHints/browser/provideSignatu
 import * as nls from 'vs/nls';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { editorHoverBackground, editorHoverBorder, editorHoverForeground, listHighlightForeground, registerColor, textCodeBlockBackground, textLinkActiveForeground, textLinkForeground } from 'vs/platform/theme/common/colorRegistry';
+import { listHighlightForeground, registerColor } from 'vs/platform/theme/common/colorRegistry';
 import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { isHighContrast } from 'vs/platform/theme/common/theme';
-import { registerThemingParticipant, ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { ThemeIcon } from 'vs/platform/theme/common/themeService';
 
 const $ = dom.$;
 
@@ -366,44 +365,4 @@ export class ParameterHintsWidget extends Disposable implements IContentWidget {
 	}
 }
 
-const editorHoverWidgetHighlightForeground = registerColor('editorHoverWidget.highlightForeground', { dark: listHighlightForeground, light: listHighlightForeground, hcDark: listHighlightForeground, hcLight: listHighlightForeground }, nls.localize('editorHoverWidgetHighlightForeground', 'Foreground color of the active item in the parameter hint.'));
-
-registerThemingParticipant((theme, collector) => {
-	const border = theme.getColor(editorHoverBorder);
-	if (border) {
-		const borderWidth = isHighContrast(theme.type) ? 2 : 1;
-		collector.addRule(`.monaco-editor .parameter-hints-widget { border: ${borderWidth}px solid ${border}; }`);
-		collector.addRule(`.monaco-editor .parameter-hints-widget.multiple .body { border-left: 1px solid ${border.transparent(0.5)}; }`);
-		collector.addRule(`.monaco-editor .parameter-hints-widget .signature.has-docs { border-bottom: 1px solid ${border.transparent(0.5)}; }`);
-	}
-	const background = theme.getColor(editorHoverBackground);
-	if (background) {
-		collector.addRule(`.monaco-editor .parameter-hints-widget { background-color: ${background}; }`);
-	}
-
-	const link = theme.getColor(textLinkForeground);
-	if (link) {
-		collector.addRule(`.monaco-editor .parameter-hints-widget a { color: ${link}; }`);
-	}
-
-	const linkHover = theme.getColor(textLinkActiveForeground);
-	if (linkHover) {
-		collector.addRule(`.monaco-editor .parameter-hints-widget a:hover { color: ${linkHover}; }`);
-	}
-
-	const foreground = theme.getColor(editorHoverForeground);
-	if (foreground) {
-		collector.addRule(`.monaco-editor .parameter-hints-widget { color: ${foreground}; }`);
-	}
-
-	const codeBackground = theme.getColor(textCodeBlockBackground);
-	if (codeBackground) {
-		collector.addRule(`.monaco-editor .parameter-hints-widget code { background-color: ${codeBackground}; }`);
-	}
-
-	const parameterHighlightColor = theme.getColor(editorHoverWidgetHighlightForeground);
-	if (parameterHighlightColor) {
-		collector.addRule(`.monaco-editor .parameter-hints-widget .parameter.active { color: ${parameterHighlightColor}}`);
-	}
-
-});
+registerColor('editorHoverWidget.highlightForeground', { dark: listHighlightForeground, light: listHighlightForeground, hcDark: listHighlightForeground, hcLight: listHighlightForeground }, nls.localize('editorHoverWidgetHighlightForeground', 'Foreground color of the active item in the parameter hint.'));
diff --git a/src/vs/editor/contrib/peekView/browser/media/peekViewWidget.css b/src/vs/editor/contrib/peekView/browser/media/peekViewWidget.css
index 6ee26557e031a3..f49973bfea3fe4 100644
--- a/src/vs/editor/contrib/peekView/browser/media/peekViewWidget.css
+++ b/src/vs/editor/contrib/peekView/browser/media/peekViewWidget.css
@@ -12,7 +12,7 @@
 
 .monaco-editor .peekview-widget .head .peekview-title {
 	display: flex;
-	align-items: center;
+	align-items: baseline;
 	font-size: 13px;
 	margin-left: 20px;
 	min-width: 0;
@@ -27,8 +27,6 @@
 .monaco-editor .peekview-widget .head .peekview-title .dirname:not(:empty) {
 	font-size: 0.9em;
 	margin-left: 0.5em;
-	text-overflow: ellipsis;
-	overflow: hidden;
 }
 
 .monaco-editor .peekview-widget .head .peekview-title .meta {
@@ -38,6 +36,8 @@
 }
 
 .monaco-editor .peekview-widget .head .peekview-title .dirname {
+	overflow: hidden;
+	text-overflow: ellipsis;
 	white-space: nowrap;
 }
 
@@ -74,6 +74,7 @@
 
 .monaco-editor .peekview-widget .head .peekview-title .codicon {
 	margin-right: 4px;
+	align-self: center;
 }
 
 .monaco-editor .peekview-widget .monaco-list .monaco-list-row.focused .codicon {
diff --git a/src/vs/editor/contrib/peekView/browser/peekView.ts b/src/vs/editor/contrib/peekView/browser/peekView.ts
index 6bbf18383b5d78..cfbc31654e997e 100644
--- a/src/vs/editor/contrib/peekView/browser/peekView.ts
+++ b/src/vs/editor/contrib/peekView/browser/peekView.ts
@@ -288,6 +288,7 @@ export const peekViewResultsSelectionBackground = registerColor('peekViewResult.
 export const peekViewResultsSelectionForeground = registerColor('peekViewResult.selectionForeground', { dark: Color.white, light: '#6C6C6C', hcDark: Color.white, hcLight: editorForeground }, nls.localize('peekViewResultsSelectionForeground', 'Foreground color of the selected entry in the peek view result list.'));
 export const peekViewEditorBackground = registerColor('peekViewEditor.background', { dark: '#001F33', light: '#F2F8FC', hcDark: Color.black, hcLight: Color.white }, nls.localize('peekViewEditorBackground', 'Background color of the peek view editor.'));
 export const peekViewEditorGutterBackground = registerColor('peekViewEditorGutter.background', { dark: peekViewEditorBackground, light: peekViewEditorBackground, hcDark: peekViewEditorBackground, hcLight: peekViewEditorBackground }, nls.localize('peekViewEditorGutterBackground', 'Background color of the gutter in the peek view editor.'));
+export const peekViewEditorStickScrollBackground = registerColor('peekViewEditorStickScroll.background', { dark: peekViewEditorBackground, light: peekViewEditorBackground, hcDark: peekViewEditorBackground, hcLight: peekViewEditorBackground }, nls.localize('peekViewEditorStickScrollBackground', 'Background color of sticky scroll in the peek view editor.'));
 
 export const peekViewResultsMatchHighlight = registerColor('peekViewResult.matchHighlightBackground', { dark: '#ea5c004d', light: '#ea5c004d', hcDark: null, hcLight: null }, nls.localize('peekViewResultsMatchHighlight', 'Match highlight color in the peek view result list.'));
 export const peekViewEditorMatchHighlight = registerColor('peekViewEditor.matchHighlightBackground', { dark: '#ff8f0099', light: '#f5d802de', hcDark: null, hcLight: null }, nls.localize('peekViewEditorMatchHighlight', 'Match highlight color in the peek view editor.'));
diff --git a/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.ts b/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.ts
index 7ee6a8d4260bae..4a2cf99c170904 100644
--- a/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.ts
+++ b/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.ts
@@ -202,16 +202,9 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
 
 
 		// Reveal and decorate when active item changes
-		// However, ignore the very first two events so that
-		// opening the picker is not immediately revealing
-		// and decorating the first entry.
-		let ignoreFirstActiveEvent = 2;
 		disposables.add(picker.onDidChangeActive(() => {
 			const [item] = picker.activeItems;
 			if (item && item.range) {
-				if (ignoreFirstActiveEvent-- > 0) {
-					return;
-				}
 
 				// Reveal
 				editor.revealRangeInCenter(item.range.selection, ScrollType.Smooth);
diff --git a/src/vs/editor/contrib/rename/browser/renameInputField.css b/src/vs/editor/contrib/rename/browser/renameInputField.css
index 9000a713ec2ebd..1b5de07fab00fe 100644
--- a/src/vs/editor/contrib/rename/browser/renameInputField.css
+++ b/src/vs/editor/contrib/rename/browser/renameInputField.css
@@ -6,15 +6,15 @@
 .monaco-editor .rename-box {
 	z-index: 100;
 	color: inherit;
+	border-radius: 4px;
 }
 
 .monaco-editor .rename-box.preview {
-	padding: 3px 3px 0 3px;
+	padding: 4px 4px 0 4px;
 }
 
 .monaco-editor .rename-box .rename-input {
 	padding: 3px;
-	width: calc(100% - 6px);
 	border-radius: 2px;
 }
 
diff --git a/src/vs/editor/contrib/rename/browser/renameInputField.ts b/src/vs/editor/contrib/rename/browser/renameInputField.ts
index 64b88fb6f822b6..9e27efec8b7dd0 100644
--- a/src/vs/editor/contrib/rename/browser/renameInputField.ts
+++ b/src/vs/editor/contrib/rename/browser/renameInputField.ts
@@ -14,7 +14,7 @@ import { ScrollType } from 'vs/editor/common/editorCommon';
 import { localize } from 'vs/nls';
 import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { editorWidgetBackground, inputBackground, inputBorder, inputForeground, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
+import { editorWidgetBackground, inputBackground, inputBorder, inputForeground, widgetBorder, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
 import { IColorTheme, IThemeService } from 'vs/platform/theme/common/themeService';
 
 export const CONTEXT_RENAME_INPUT_VISIBLE = new RawContextKey<boolean>('renameInputVisible', false, localize('renameInputVisible', "Whether the rename input widget is visible"));
@@ -99,8 +99,10 @@ export class RenameInputField implements IContentWidget {
 		}
 
 		const widgetShadowColor = theme.getColor(widgetShadow);
+		const widgetBorderColor = theme.getColor(widgetBorder);
 		this._domNode.style.backgroundColor = String(theme.getColor(editorWidgetBackground) ?? '');
 		this._domNode.style.boxShadow = widgetShadowColor ? ` 0 0 8px 2px ${widgetShadowColor}` : '';
+		this._domNode.style.border = widgetBorderColor ? `1px solid ${widgetBorderColor}` : '';
 		this._domNode.style.color = String(theme.getColor(inputForeground) ?? '');
 
 		this._input.style.backgroundColor = String(theme.getColor(inputBackground) ?? '');
@@ -190,7 +192,7 @@ export class RenameInputField implements IContentWidget {
 			};
 
 			disposeOnDone.add(token.onCancellationRequested(() => this.cancelInput(true)));
-			disposeOnDone.add(this._editor.onDidBlurEditorWidget(() => this.cancelInput(false)));
+			disposeOnDone.add(this._editor.onDidBlurEditorWidget(() => this.cancelInput(!document.hasFocus())));
 
 			this._show();
 
diff --git a/src/vs/editor/contrib/snippet/browser/snippetController2.ts b/src/vs/editor/contrib/snippet/browser/snippetController2.ts
index e44288ff401911..390ada85b06502 100644
--- a/src/vs/editor/contrib/snippet/browser/snippetController2.ts
+++ b/src/vs/editor/contrib/snippet/browser/snippetController2.ts
@@ -188,7 +188,8 @@ export class SnippetController2 implements IEditorContribution {
 			const registration = this._languageFeaturesService.completionProvider.register({
 				language: this._editor.getModel().getLanguageId(),
 				pattern: this._editor.getModel().uri.fsPath,
-				scheme: this._editor.getModel().uri.scheme
+				scheme: this._editor.getModel().uri.scheme,
+				exclusive: true
 			}, this._choiceCompletionItemProvider);
 
 			this._snippetListener.add(registration);
diff --git a/src/vs/editor/contrib/snippet/browser/snippetParser.ts b/src/vs/editor/contrib/snippet/browser/snippetParser.ts
index f262ddf34dcfd4..7e7b42a7be9774 100644
--- a/src/vs/editor/contrib/snippet/browser/snippetParser.ts
+++ b/src/vs/editor/contrib/snippet/browser/snippetParser.ts
@@ -300,7 +300,7 @@ export class Choice extends Marker {
 
 	toTextmateString(): string {
 		return this.options
-			.map(option => option.value.replace(/\||,/g, '\\$&'))
+			.map(option => option.value.replace(/\||,|\\/g, '\\$&'))
 			.join(',');
 	}
 
@@ -656,16 +656,30 @@ export class SnippetParser {
 			return true;
 		});
 
-		for (const placeholder of incompletePlaceholders) {
+		const fillInIncompletePlaceholder = (placeholder: Placeholder, stack: Set<number>) => {
 			const defaultValues = placeholderDefaultValues.get(placeholder.index);
-			if (defaultValues) {
-				const clone = new Placeholder(placeholder.index);
-				clone.transform = placeholder.transform;
-				for (const child of defaultValues) {
-					clone.appendChild(child.clone());
+			if (!defaultValues) {
+				return;
+			}
+			const clone = new Placeholder(placeholder.index);
+			clone.transform = placeholder.transform;
+			for (const child of defaultValues) {
+				const newChild = child.clone();
+				clone.appendChild(newChild);
+
+				// "recurse" on children that are again placeholders
+				if (newChild instanceof Placeholder && placeholderDefaultValues.has(newChild.index) && !stack.has(newChild.index)) {
+					stack.add(newChild.index);
+					fillInIncompletePlaceholder(newChild, stack);
+					stack.delete(newChild.index);
 				}
-				snippet.replace(placeholder, [clone]);
 			}
+			snippet.replace(placeholder, [clone]);
+		};
+
+		const stack = new Set<number>();
+		for (const placeholder of incompletePlaceholders) {
+			fillInIncompletePlaceholder(placeholder, stack);
 		}
 
 		return snippet.children.slice(offset);
diff --git a/src/vs/editor/contrib/snippet/browser/snippetSession.ts b/src/vs/editor/contrib/snippet/browser/snippetSession.ts
index c50df9d79142be..78b6a87e8b28b2 100644
--- a/src/vs/editor/contrib/snippet/browser/snippetSession.ts
+++ b/src/vs/editor/contrib/snippet/browser/snippetSession.ts
@@ -380,7 +380,7 @@ export interface ISnippetEdit {
 
 export class SnippetSession {
 
-	static adjustWhitespace(model: ITextModel, position: IPosition, snippet: TextmateSnippet, adjustIndentation: boolean, adjustNewlines: boolean): string {
+	static adjustWhitespace(model: ITextModel, position: IPosition, adjustIndentation: boolean, snippet: TextmateSnippet, filter?: Set<Marker>): string {
 		const line = model.getLineContent(position.lineNumber);
 		const lineLeadingWhitespace = getLeadingWhitespace(line, 0, position.column - 1);
 
@@ -393,6 +393,11 @@ export class SnippetSession {
 				return true;
 			}
 
+			// check with filter (iff provided)
+			if (filter && !filter.has(marker)) {
+				return true;
+			}
+
 			const lines = marker.value.split(/\r\n|\r|\n/);
 
 			if (adjustIndentation) {
@@ -510,9 +515,9 @@ export class SnippetSession {
 			// cursor and the leading whitespace is different
 			const start = snippetSelection.getStartPosition();
 			const snippetLineLeadingWhitespace = SnippetSession.adjustWhitespace(
-				model, start, snippet,
+				model, start,
 				adjustWhitespace || (idx > 0 && firstLineFirstNonWhitespace !== model.getLineFirstNonWhitespaceColumn(selection.positionLineNumber)),
-				true
+				snippet,
 			);
 
 			snippet.resolveVariables(new CompositeSnippetVariableResolver([
@@ -577,7 +582,8 @@ export class SnippetSession {
 				offset += textNode.value.length;
 			}
 
-			parser.parseFragment(template, snippet);
+			const newNodes = parser.parseFragment(template, snippet);
+			SnippetSession.adjustWhitespace(model, range.getStartPosition(), true, snippet, new Set(newNodes));
 			snippet.resolveVariables(resolver);
 
 			const snippetText = snippet.toString();
diff --git a/src/vs/editor/contrib/snippet/browser/snippetVariables.ts b/src/vs/editor/contrib/snippet/browser/snippetVariables.ts
index a6d7066193a657..1bb47245482085 100644
--- a/src/vs/editor/contrib/snippet/browser/snippetVariables.ts
+++ b/src/vs/editor/contrib/snippet/browser/snippetVariables.ts
@@ -15,7 +15,7 @@ import { Text, Variable, VariableResolver } from 'vs/editor/contrib/snippet/brow
 import { OvertypingCapturer } from 'vs/editor/contrib/suggest/browser/suggestOvertypingCapturer';
 import * as nls from 'vs/nls';
 import { ILabelService } from 'vs/platform/label/common/label';
-import { WORKSPACE_EXTENSION, isSingleFolderWorkspaceIdentifier, toWorkspaceIdentifier, IWorkspaceContextService, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import { WORKSPACE_EXTENSION, isSingleFolderWorkspaceIdentifier, toWorkspaceIdentifier, IWorkspaceContextService, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier, isEmptyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
 
 export const KnownSnippetVariableNames = Object.freeze<{ [key: string]: true }>({
 	'CURRENT_YEAR': true,
@@ -311,7 +311,7 @@ export class WorkspaceBasedVariableResolver implements VariableResolver {
 		}
 
 		const workspaceIdentifier = toWorkspaceIdentifier(this._workspaceService.getWorkspace());
-		if (!workspaceIdentifier) {
+		if (isEmptyWorkspaceIdentifier(workspaceIdentifier)) {
 			return undefined;
 		}
 
diff --git a/src/vs/editor/contrib/snippet/test/browser/snippetController2.test.ts b/src/vs/editor/contrib/snippet/test/browser/snippetController2.test.ts
index 4279ca422a481e..3823efda632059 100644
--- a/src/vs/editor/contrib/snippet/test/browser/snippetController2.test.ts
+++ b/src/vs/editor/contrib/snippet/test/browser/snippetController2.test.ts
@@ -21,6 +21,7 @@ import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKe
 import { ILabelService } from 'vs/platform/label/common/label';
 import { ILogService, NullLogService } from 'vs/platform/log/common/log';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { EndOfLineSequence } from 'vs/editor/common/model';
 
 suite('SnippetController2', function () {
 
@@ -59,7 +60,11 @@ suite('SnippetController2', function () {
 		model = createTextModel('if\n    $state\nfi');
 		const serviceCollection = new ServiceCollection(
 			[ILabelService, new class extends mock<ILabelService>() { }],
-			[IWorkspaceContextService, new class extends mock<IWorkspaceContextService>() { }],
+			[IWorkspaceContextService, new class extends mock<IWorkspaceContextService>() {
+				override getWorkspace() {
+					return { id: 'foo', folders: [] };
+				}
+			}],
 			[ILogService, new NullLogService()],
 			[IContextKeyService, contextKeys],
 		);
@@ -334,7 +339,7 @@ suite('SnippetController2', function () {
 		assertContextKeys(contextKeys, false, false, false);
 	});
 
-	test('Problems with nested snippet insertion #39594', function () {
+	test('Problems with nested snippet insertion #39594 (part2)', function () {
 		// ensure selection-change-to-cancel logic isn't too aggressive
 		const ctrl = instaService.createInstance(SnippetController2, editor);
 
@@ -706,4 +711,31 @@ suite('SnippetController2', function () {
 		assert.deepStrictEqual(editor.getSelections(), [new Selection(1, 34, 1, 34)]);
 
 	});
+
+	test('EOL-Sequence (CRLF) shifts tab stop in isFileTemplate snippets #167386', function () {
+		const ctrl = instaService.createInstance(SnippetController2, editor);
+		model.setValue('');
+		model.setEOL(EndOfLineSequence.CRLF);
+
+		ctrl.apply([{
+			range: model.getFullModelRange(),
+			template: 'line 54321${1:FOO}\nline 54321${1:FOO}\n(no tab stop)\nline 54321${1:FOO}\nline 54321'
+		}]);
+
+		assert.deepStrictEqual(editor.getSelections(), [new Selection(1, 11, 1, 14), new Selection(2, 11, 2, 14), new Selection(4, 11, 4, 14)]);
+
+	});
+
+	test('"Surround With" code action snippets use incorrect indentation levels and styles #169319', function () {
+		model.setValue('function foo(f, x, condition) {\n    f();\n    return x;\n}');
+		const sel = new Range(2, 5, 3, 14);
+		editor.setSelection(sel);
+		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl.apply([{
+			range: sel,
+			template: 'if (${1:condition}) {\n\t$TM_SELECTED_TEXT$0\n}'
+		}]);
+
+		assert.strictEqual(model.getValue(), `function foo(f, x, condition) {\n    if (condition) {\n        f();\n        return x;\n    }\n}`);
+	});
 });
diff --git a/src/vs/editor/contrib/snippet/test/browser/snippetParser.test.ts b/src/vs/editor/contrib/snippet/test/browser/snippetParser.test.ts
index 4c79dd836a7747..b308befe5a479c 100644
--- a/src/vs/editor/contrib/snippet/test/browser/snippetParser.test.ts
+++ b/src/vs/editor/contrib/snippet/test/browser/snippetParser.test.ts
@@ -299,6 +299,7 @@ suite('SnippetParser', () => {
 		assertTextsnippetString('\\$1', '\\$1');
 		assertTextsnippetString('console.log(${1|not\\, not, five, 5, 1   23|});', 'console.log(${1|not\\, not, five, 5, 1   23|});');
 		assertTextsnippetString('console.log(${1|not\\, not, \\| five, 5, 1   23|});', 'console.log(${1|not\\, not, \\| five, 5, 1   23|});');
+		assertTextsnippetString('${1|cho\\,ices,wi\\|th,esc\\\\aping,chall\\\\\\,enges|}', '${1|cho\\,ices,wi\\|th,esc\\\\aping,chall\\\\\\,enges|}');
 		assertTextsnippetString('this is text', 'this is text');
 		assertTextsnippetString('this ${1:is ${2:nested with $var}}', 'this ${1:is ${2:nested with ${var}}}');
 		assertTextsnippetString('this ${1:is ${2:nested with $var}}}', 'this ${1:is ${2:nested with ${var}}}\\}');
@@ -790,4 +791,20 @@ suite('SnippetParser', () => {
 		assert.strictEqual((<FormatString>variable.transform!.children[0]).ifValue, '\\');
 		assert.strictEqual((<FormatString>variable.transform!.children[0]).elseValue, undefined);
 	});
+
+	test('Snippet placeholder empty right after expansion #152553', function () {
+
+		const snippet = new SnippetParser().parse('${1:prog}: ${2:$1.cc} - $2');
+		const actual = snippet.toString();
+		assert.strictEqual(actual, 'prog: prog.cc - prog.cc');
+
+		const snippet2 = new SnippetParser().parse('${1:prog}: ${3:${2:$1.cc}.33} - $2 $3');
+		const actual2 = snippet2.toString();
+		assert.strictEqual(actual2, 'prog: prog.cc.33 - prog.cc prog.cc.33');
+
+		// cyclic references of placeholders
+		const snippet3 = new SnippetParser().parse('${1:$2.one} <> ${2:$1.two}');
+		const actual3 = snippet3.toString();
+		assert.strictEqual(actual3, '.two.one.two.one <> .one.two.one.two');
+	});
 });
diff --git a/src/vs/editor/contrib/snippet/test/browser/snippetSession.test.ts b/src/vs/editor/contrib/snippet/test/browser/snippetSession.test.ts
index aab47e06c9a718..a9563c30f13395 100644
--- a/src/vs/editor/contrib/snippet/test/browser/snippetSession.test.ts
+++ b/src/vs/editor/contrib/snippet/test/browser/snippetSession.test.ts
@@ -62,7 +62,7 @@ suite('SnippetSession', function () {
 
 		function assertNormalized(position: IPosition, input: string, expected: string): void {
 			const snippet = new SnippetParser().parse(input);
-			SnippetSession.adjustWhitespace(model, position, snippet, true, true);
+			SnippetSession.adjustWhitespace(model, position, true, snippet);
 			assert.strictEqual(snippet.toTextmateString(), expected);
 		}
 
diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css b/src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css
index f3dc213f679c71..f72bc2b0deb204 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css
@@ -16,7 +16,7 @@
 }
 
 .monaco-editor .sticky-line-root {
-	background-color : var(--vscode-editorStickyScroll-background);
+	background-color : inherit;
 	overflow : hidden;
 	white-space : nowrap;
 	width : 100%;
@@ -33,3 +33,7 @@
 	z-index : 2;
 	background-color : var(--vscode-editorStickyScroll-background);
 }
+
+.monaco-editor .sticky-widget.peek {
+	background-color : var(--vscode-peekViewEditorStickScroll-background);
+}
diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.ts
index 5f4a5db854a2db..7332eb58ad52f6 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.ts
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.ts
@@ -17,14 +17,14 @@ export class ToggleStickyScroll extends Action2 {
 			id: 'editor.action.toggleStickyScroll',
 			title: {
 				value: localize('toggleStickyScroll', "Toggle Sticky Scroll"),
-				mnemonicTitle: localize('mitoggleStickyScroll', "&&Toggle Sticky Scroll"),
+				mnemonicTitle: localize({ key: 'mitoggleStickyScroll', comment: ['&& denotes a mnemonic'] }, "&&Toggle Sticky Scroll"),
 				original: 'Toggle Sticky Scroll',
 			},
 			category: Categories.View,
 			toggled: {
 				condition: ContextKeyExpr.equals('config.editor.stickyScroll.enabled', true),
 				title: localize('stickyScroll', "Sticky Scroll"),
-				mnemonicTitle: localize('miStickyScroll', "&&Sticky Scroll"),
+				mnemonicTitle: localize({ key: 'miStickyScroll', comment: ['&& denotes a mnemonic'] }, "&&Sticky Scroll"),
 			},
 			menu: [
 				{ id: MenuId.CommandPalette },
diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts
index ed4f02e586cbf0..26884a05a77247 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts
@@ -13,13 +13,13 @@ import { Position } from 'vs/editor/common/core/position';
 import { ClickLinkGesture } from 'vs/editor/contrib/gotoSymbol/browser/link/clickLinkGesture';
 import { getDefinitionsAtPosition } from 'vs/editor/contrib/gotoSymbol/browser/goToSymbol';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { Location } from 'vs/editor/common/languages';
 import { goToDefinitionWithLocation } from 'vs/editor/contrib/inlayHints/browser/inlayHintsLocations';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
 import { IRange, Range } from 'vs/editor/common/core/range';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import 'vs/css!./stickyScroll';
+import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget';
 
 interface CustomMouseEvent {
 	detail: string;
@@ -28,8 +28,8 @@ interface CustomMouseEvent {
 
 export class StickyScrollWidgetState {
 	constructor(
-		public readonly lineNumbers: number[],
-		public readonly lastLineRelativePosition: number
+		readonly lineNumbers: number[],
+		readonly lastLineRelativePosition: number
 	) { }
 }
 
@@ -40,13 +40,13 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 	private readonly _layoutInfo: EditorLayoutInfo;
 	private readonly _rootDomNode: HTMLElement = document.createElement('div');
 	private readonly _disposableStore = this._register(new DisposableStore());
-	private _lineHeight: number;
-	private _lineNumbers: number[];
-	private _lastLineRelativePosition: number;
-	private _hoverOnLine: number;
-	private _hoverOnColumn: number;
-	private _stickyRangeProjectedOnEditor: IRange | null;
-	private _candidateDefinitionsLength: number;
+
+	private _lineNumbers: number[] = [];
+	private _lastLineRelativePosition: number = 0;
+	private _hoverOnLine: number = -1;
+	private _hoverOnColumn: number = -1;
+	private _stickyRangeProjectedOnEditor: IRange | undefined;
+	private _candidateDefinitionsLength: number = -1;
 
 	constructor(
 		private readonly _editor: ICodeEditor,
@@ -57,25 +57,13 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 		this._layoutInfo = this._editor.getLayoutInfo();
 		this._rootDomNode = document.createElement('div');
 		this._rootDomNode.className = 'sticky-widget';
+		this._rootDomNode.classList.toggle('peek', _editor instanceof EmbeddedCodeEditorWidget);
 		this._rootDomNode.style.width = `${this._layoutInfo.width - this._layoutInfo.minimap.minimapCanvasOuterWidth - this._layoutInfo.verticalScrollbarWidth}px`;
-		this._lineNumbers = [];
-		this._lastLineRelativePosition = 0;
-		this._hoverOnLine = -1;
-		this._hoverOnColumn = -1;
-		this._stickyRangeProjectedOnEditor = null;
-		this._candidateDefinitionsLength = -1;
-		this._lineHeight = this._editor.getOption(EditorOption.lineHeight);
-		this._register(this._editor.onDidChangeConfiguration(e => {
-			if (e.hasChanged(EditorOption.lineHeight)) {
-				this._lineHeight = this._editor.getOption(EditorOption.lineHeight);
-			}
 
-		}));
-		this._register(this.updateLinkGesture());
+		this._register(this._updateLinkGesture());
 	}
 
-	private updateLinkGesture(): IDisposable {
-
+	private _updateLinkGesture(): IDisposable {
 
 		const linkGestureStore = new DisposableStore();
 		const sessionStore = new DisposableStore();
@@ -151,38 +139,42 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 				if (this._candidateDefinitionsLength > 1) {
 					this._editor.revealPosition({ lineNumber: this._hoverOnLine, column: 1 });
 				}
-				this._instaService.invokeFunction(goToDefinitionWithLocation, e, this._editor as IActiveCodeEditor, { uri: this._editor.getModel()!.uri, range: this._stickyRangeProjectedOnEditor } as Location);
+				this._instaService.invokeFunction(goToDefinitionWithLocation, e, this._editor as IActiveCodeEditor, { uri: this._editor.getModel()!.uri, range: this._stickyRangeProjectedOnEditor! });
+
 			} else if (!e.isRightClick) {
 				// Normal click
-				this._editor.revealPosition({ lineNumber: this._hoverOnLine, column: 1 });
+				const position = { lineNumber: this._hoverOnLine, column: this._hoverOnColumn };
+				this._editor.revealPosition(position);
+				this._editor.setSelection(Range.fromPositions(position));
+				this._editor.focus();
 			}
 		}));
 		return linkGestureStore;
 	}
 
-	public get lineNumbers(): number[] {
+	get lineNumbers(): number[] {
 		return this._lineNumbers;
 	}
 
-	public get codeLineCount(): number {
+	get codeLineCount(): number {
 		return this._lineNumbers.length;
 	}
 
-	public getCurrentLines(): readonly number[] {
+	getCurrentLines(): readonly number[] {
 		return this._lineNumbers;
 	}
 
-	public setState(state: StickyScrollWidgetState): void {
+	setState(state: StickyScrollWidgetState): void {
 		this._disposableStore.clear();
 		this._lineNumbers.length = 0;
 		dom.clearNode(this._rootDomNode);
 
 		this._lastLineRelativePosition = state.lastLineRelativePosition;
 		this._lineNumbers = state.lineNumbers;
-		this.renderRootNode();
+		this._renderRootNode();
 	}
 
-	private getChildNode(index: number, line: number): HTMLElement {
+	private _renderChildNode(index: number, line: number): HTMLElement {
 
 		const child = document.createElement('div');
 		const viewModel = this._editor._getViewModel();
@@ -201,14 +193,13 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 			actualInlineDecorations = [];
 		}
 
-		const renderLineInput: RenderLineInput =
-			new RenderLineInput(true, true, lineRenderingData.content,
-				lineRenderingData.continuesWithWrappedLine,
-
-				lineRenderingData.isBasicASCII, lineRenderingData.containsRTL, 0,
-				lineRenderingData.tokens, actualInlineDecorations,
-				lineRenderingData.tabSize, lineRenderingData.startVisibleColumn,
-				1, 1, 1, 500, 'none', true, true, null);
+		const renderLineInput: RenderLineInput = new RenderLineInput(true, true, lineRenderingData.content,
+			lineRenderingData.continuesWithWrappedLine,
+			lineRenderingData.isBasicASCII, lineRenderingData.containsRTL, 0,
+			lineRenderingData.tokens, actualInlineDecorations,
+			lineRenderingData.tabSize, lineRenderingData.startVisibleColumn,
+			1, 1, 1, 500, 'none', true, true, null
+		);
 
 		const sb = new StringBuilder(2000);
 		renderViewLine(renderLineInput, sb);
@@ -283,41 +274,34 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 		return child;
 	}
 
-	private renderRootNode(): void {
+	private _renderRootNode(): void {
 		if (!this._editor._getViewModel()) {
 			return;
 		}
 		for (const [index, line] of this._lineNumbers.entries()) {
-			this._rootDomNode.appendChild(this.getChildNode(index, line));
+			this._rootDomNode.appendChild(this._renderChildNode(index, line));
 		}
-
-		const widgetHeight: number = this._lineNumbers.length * this._lineHeight + this._lastLineRelativePosition;
+		const editorLineHeight = this._editor.getOption(EditorOption.lineHeight);
+		const widgetHeight: number = this._lineNumbers.length * editorLineHeight + this._lastLineRelativePosition;
 		this._rootDomNode.style.height = widgetHeight.toString() + 'px';
 		const minimapSide = this._editor.getOption(EditorOption.minimap).side;
 		if (minimapSide === 'left') {
 			this._rootDomNode.style.marginLeft = this._editor.getLayoutInfo().minimap.minimapCanvasOuterWidth + 'px';
 		}
-		else if (minimapSide === 'right') {
-			this._rootDomNode.style.marginLeft = '1px';
-		}
 		this._rootDomNode.style.zIndex = '11';
 	}
 
-	public getId(): string {
+	getId(): string {
 		return 'editor.contrib.stickyScrollWidget';
 	}
 
-	public getDomNode(): HTMLElement {
+	getDomNode(): HTMLElement {
 		return this._rootDomNode;
 	}
 
-	public getPosition(): IOverlayWidgetPosition | null {
+	getPosition(): IOverlayWidgetPosition | null {
 		return {
 			preference: null
 		};
 	}
-
-	override dispose(): void {
-		super.dispose();
-	}
 }
diff --git a/src/vs/editor/contrib/suggest/browser/completionModel.ts b/src/vs/editor/contrib/suggest/browser/completionModel.ts
index 43b7969f1fe784..de860b992e203b 100644
--- a/src/vs/editor/contrib/suggest/browser/completionModel.ts
+++ b/src/vs/editor/contrib/suggest/browser/completionModel.ts
@@ -46,7 +46,8 @@ export class CompletionModel {
 	private _lineContext: LineContext;
 	private _refilterKind: Refilter;
 	private _filteredItems?: StrictCompletionItem[];
-	private _providerInfo?: Map<CompletionItemProvider, boolean>;
+
+	private _itemsByProvider?: Map<CompletionItemProvider, CompletionItem[]>;
 	private _stats?: ICompletionStats;
 
 	constructor(
@@ -92,40 +93,22 @@ export class CompletionModel {
 		return this._filteredItems!;
 	}
 
-	get allProvider(): IterableIterator<CompletionItemProvider> {
+	getItemsByProvider(): ReadonlyMap<CompletionItemProvider, CompletionItem[]> {
 		this._ensureCachedState();
-		return this._providerInfo!.keys();
+		return this._itemsByProvider!;
 	}
 
-	get incomplete(): Set<CompletionItemProvider> {
+	getIncompleteProvider(): Set<CompletionItemProvider> {
 		this._ensureCachedState();
 		const result = new Set<CompletionItemProvider>();
-		for (const [provider, incomplete] of this._providerInfo!) {
-			if (incomplete) {
+		for (const [provider, items] of this.getItemsByProvider()) {
+			if (items.length > 0 && items[0].container.incomplete) {
 				result.add(provider);
 			}
 		}
 		return result;
 	}
 
-	adopt(except: Set<CompletionItemProvider>): CompletionItem[] {
-		const res: CompletionItem[] = [];
-		for (let i = 0; i < this._items.length;) {
-			if (!except.has(this._items[i].provider)) {
-				res.push(this._items[i]);
-
-				// unordered removed
-				this._items[i] = this._items[this._items.length - 1];
-				this._items.pop();
-			} else {
-				// continue with next item
-				i++;
-			}
-		}
-		this._refilterKind = Refilter.All;
-		return res;
-	}
-
 	get stats(): ICompletionStats {
 		this._ensureCachedState();
 		return this._stats!;
@@ -139,7 +122,7 @@ export class CompletionModel {
 
 	private _createCachedState(): void {
 
-		this._providerInfo = new Map();
+		this._itemsByProvider = new Map();
 
 		const labelLengths: number[] = [];
 
@@ -164,8 +147,13 @@ export class CompletionModel {
 				continue; // SKIP invalid items
 			}
 
-			// collect all support, know if their result is incomplete
-			this._providerInfo.set(item.provider, Boolean(item.container.incomplete));
+			// keep all items by their provider
+			const arr = this._itemsByProvider.get(item.provider);
+			if (arr) {
+				arr.push(item);
+			} else {
+				this._itemsByProvider.set(item.provider, [item]);
+			}
 
 			// 'word' is that remainder of the current line that we
 			// filter and score against. In theory each suggestion uses a
diff --git a/src/vs/editor/contrib/suggest/browser/suggest.ts b/src/vs/editor/contrib/suggest/browser/suggest.ts
index 805c58df53178b..a4194a93a5864c 100644
--- a/src/vs/editor/contrib/suggest/browser/suggest.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggest.ts
@@ -167,6 +167,7 @@ export class CompletionOptions {
 		readonly snippetSortOrder = SnippetSortOrder.Bottom,
 		readonly kindFilter = new Set<languages.CompletionItemKind>(),
 		readonly providerFilter = new Set<languages.CompletionItemProvider>(),
+		readonly providerItemsToReuse: ReadonlyMap<languages.CompletionItemProvider, CompletionItem[]> = new Map<languages.CompletionItemProvider, CompletionItem[]>(),
 		readonly showDeprecated = true
 	) { }
 }
@@ -281,6 +282,14 @@ export async function provideSuggestionItems(
 		// for each support in the group ask for suggestions
 		let didAddResult = false;
 		await Promise.all(providerGroup.map(async provider => {
+			// we have items from a previous session that we can reuse
+			if (options.providerItemsToReuse.has(provider)) {
+				const items = options.providerItemsToReuse.get(provider)!;
+				items.forEach(item => result.push(item));
+				didAddResult = didAddResult || items.length > 0;
+				return;
+			}
+			// check if this provider is filtered out
 			if (options.providerFilter.size > 0 && !options.providerFilter.has(provider)) {
 				return;
 			}
@@ -382,7 +391,7 @@ CommandsRegistry.registerCommand('_executeCompletionItemProvider', async (access
 		};
 
 		const resolving: Promise<any>[] = [];
-		const completions = await provideSuggestionItems(completionProvider, ref.object.textEditorModel, Position.lift(position), undefined, { triggerCharacter, triggerKind: triggerCharacter ? languages.CompletionTriggerKind.TriggerCharacter : languages.CompletionTriggerKind.Invoke });
+		const completions = await provideSuggestionItems(completionProvider, ref.object.textEditorModel, Position.lift(position), undefined, { triggerCharacter: triggerCharacter ?? undefined, triggerKind: triggerCharacter ? languages.CompletionTriggerKind.TriggerCharacter : languages.CompletionTriggerKind.Invoke });
 		for (const item of completions.items) {
 			if (resolving.length < (maxItemsToResolve ?? 0)) {
 				resolving.push(item.resolve(CancellationToken.None));
diff --git a/src/vs/editor/contrib/suggest/browser/suggestController.ts b/src/vs/editor/contrib/suggest/browser/suggestController.ts
index 35e15d9a165e33..ef98a4527f5eb4 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestController.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestController.ts
@@ -94,6 +94,7 @@ class LineSuffix {
 }
 
 const enum InsertFlags {
+	None = 0,
 	NoBeforeUndoStop = 1,
 	NoAfterUndoStop = 2,
 	KeepAlternativeSuggestions = 4,
@@ -146,7 +147,7 @@ export class SuggestController implements IEditorContribution {
 			const widget = this._instantiationService.createInstance(SuggestWidget, this.editor);
 
 			this._toDispose.add(widget);
-			this._toDispose.add(widget.onDidSelect(item => this._insertSuggestion(item, 0), this));
+			this._toDispose.add(widget.onDidSelect(item => this._insertSuggestion(item, InsertFlags.None), this));
 
 			// Wire up logic to accept a suggestion on certain characters
 			const commitCharacterController = new CommitCharacterController(this.editor, widget, this.model, item => this._insertSuggestion(item, InsertFlags.NoAfterUndoStop));
@@ -242,7 +243,18 @@ export class SuggestController implements IEditorContribution {
 			if (index === -1) {
 				index = 0;
 			}
-			this.widget.value.showSuggestions(e.completionModel, index, e.isFrozen, e.auto, e.auto && !this.editor.getOption(EditorOption.suggest).selectQuickSuggestions);
+
+			let noFocus = false;
+			if (e.auto) {
+				// don't "focus" item when configure to do so or when in snippet mode (and configured to do so)
+				const options = this.editor.getOption(EditorOption.suggest);
+				if (!options.selectQuickSuggestions) {
+					noFocus = true;
+				} else if (options.snippetsPreventQuickSuggestions && SnippetController2.get(this.editor)?.isInSnippet()) {
+					noFocus = true;
+				}
+			}
+			this.widget.value.showSuggestions(e.completionModel, index, e.isFrozen, e.auto, noFocus);
 		}));
 		this._toDispose.add(this.model.onDidCancel(e => {
 			if (!e.retrigger) {
@@ -404,7 +416,7 @@ export class SuggestController implements IEditorContribution {
 		if (item.completion.command) {
 			if (item.completion.command.id === TriggerSuggestAction.id) {
 				// retigger
-				this.model.trigger({ auto: true, shy: false }, true);
+				this.model.trigger({ auto: true, retrigger: true });
 			} else {
 				// exec command, done
 				tasks.push(this._commandService.executeCommand(item.completion.command.id, ...(item.completion.command.arguments ? [...item.completion.command.arguments] : [])).catch(onUnexpectedError));
@@ -499,7 +511,10 @@ export class SuggestController implements IEditorContribution {
 
 	triggerSuggest(onlyFrom?: Set<CompletionItemProvider>, auto?: boolean, noFilter?: boolean): void {
 		if (this.editor.hasModel()) {
-			this.model.trigger({ auto: auto ?? false, shy: false }, false, onlyFrom, undefined, noFilter);
+			this.model.trigger({
+				auto: auto ?? false,
+				completionOptions: { providerFilter: onlyFrom, kindFilter: noFilter ? new Set() : undefined }
+			});
 			this.editor.revealPosition(this.editor.getPosition(), ScrollType.Smooth);
 			this.editor.focus();
 		}
diff --git a/src/vs/editor/contrib/suggest/browser/suggestInlineCompletions.ts b/src/vs/editor/contrib/suggest/browser/suggestInlineCompletions.ts
index 77866fd1eac311..660d7ecdaabdc4 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestInlineCompletions.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestInlineCompletions.ts
@@ -57,7 +57,7 @@ class InlineCompletionResults extends RefCountedDisposable implements InlineComp
 			&& this.line === line
 			&& this.word.word.length > 0
 			&& this.word.startColumn === word.startColumn && this.word.endColumn < word.endColumn // same word
-			&& this.completionModel.incomplete.size === 0; // no incomplete results
+			&& this.completionModel.getIncompleteProvider().size === 0; // no incomplete results
 	}
 
 	get items(): SuggestInlineCompletion[] {
diff --git a/src/vs/editor/contrib/suggest/browser/suggestModel.ts b/src/vs/editor/contrib/suggest/browser/suggestModel.ts
index 90f88fb6539902..462e8f3210992c 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestModel.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestModel.ts
@@ -17,7 +17,6 @@ import { Selection } from 'vs/editor/common/core/selection';
 import { ITextModel } from 'vs/editor/common/model';
 import { CompletionContext, CompletionItemKind, CompletionItemProvider, CompletionTriggerKind } from 'vs/editor/common/languages';
 import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
 import { WordDistance } from 'vs/editor/contrib/suggest/browser/wordDistance';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -25,7 +24,7 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { ILogService } from 'vs/platform/log/common/log';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { CompletionModel } from './completionModel';
-import { CompletionDurations, CompletionItem, CompletionOptions, getSnippetSuggestSupport, getSuggestionComparator, provideSuggestionItems, QuickSuggestionsOptions, SnippetSortOrder } from './suggest';
+import { CompletionDurations, CompletionItem, CompletionOptions, getSnippetSuggestSupport, provideSuggestionItems, QuickSuggestionsOptions, SnippetSortOrder } from './suggest';
 import { IWordAtPosition } from 'vs/editor/common/core/wordHelper';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
 import { FuzzyScoreOptions } from 'vs/base/common/filters';
@@ -48,11 +47,14 @@ export interface ISuggestEvent {
 	readonly shy: boolean;
 }
 
-export interface SuggestTriggerContext {
+export interface SuggestTriggerOptions {
 	readonly auto: boolean;
-	readonly shy: boolean;
+	readonly shy?: boolean;
+	readonly retrigger?: boolean;
 	readonly triggerKind?: CompletionTriggerKind;
 	readonly triggerCharacter?: string;
+	readonly clipboardText?: string;
+	completionOptions?: Partial<CompletionOptions>;
 }
 
 export class LineContext {
@@ -85,13 +87,13 @@ export class LineContext {
 	readonly auto: boolean;
 	readonly shy: boolean;
 
-	constructor(model: ITextModel, position: Position, auto: boolean, shy: boolean) {
+	constructor(model: ITextModel, position: Position, auto: boolean, shy: boolean | undefined) {
 		this.leadingLineContent = model.getLineContent(position.lineNumber).substr(0, position.column - 1);
 		this.leadingWord = model.getWordUntilPosition(position);
 		this.lineNumber = position.lineNumber;
 		this.column = position.column;
 		this.auto = auto;
-		this.shy = shy;
+		this.shy = shy ?? false;
 	}
 }
 
@@ -276,12 +278,25 @@ export class SuggestModel implements IDisposable {
 
 			const supports = supportsByTriggerCharacter.get(lastChar);
 			if (supports) {
+
 				// keep existing items that where not computed by the
 				// supports/providers that want to trigger now
-				const existing = this._completionModel
-					? { items: this._completionModel.adopt(supports), clipboardText: this._completionModel.clipboardText }
-					: undefined;
-				this.trigger({ auto: true, shy: false, triggerCharacter: lastChar }, Boolean(this._completionModel), supports, existing);
+				const providerItemsToReuse = new Map<CompletionItemProvider, CompletionItem[]>();
+				if (this._completionModel) {
+					for (const [provider, items] of this._completionModel.getItemsByProvider()) {
+						if (!supports.has(provider)) {
+							providerItemsToReuse.set(provider, items);
+						}
+					}
+				}
+
+				this.trigger({
+					auto: true,
+					triggerCharacter: lastChar,
+					retrigger: Boolean(this._completionModel),
+					clipboardText: this._completionModel?.clipboardText,
+					completionOptions: { providerFilter: supports, providerItemsToReuse }
+				});
 			}
 		};
 
@@ -316,7 +331,7 @@ export class SuggestModel implements IDisposable {
 			if (!this._editor.hasModel() || !this._languageFeaturesService.completionProvider.has(this._editor.getModel())) {
 				this.cancel();
 			} else {
-				this.trigger({ auto: this._state === State.Auto, shy: false }, true);
+				this.trigger({ auto: this._state === State.Auto, retrigger: true });
 			}
 		}
 	}
@@ -370,11 +385,6 @@ export class SuggestModel implements IDisposable {
 			return;
 		}
 
-		if (this._editor.getOption(EditorOption.suggest).snippetsPreventQuickSuggestions && SnippetController2.get(this._editor)?.isInSnippet()) {
-			// no quick suggestion when in snippet mode
-			return;
-		}
-
 		this.cancel();
 
 		this._triggerQuickSuggest.cancelAndSet(() => {
@@ -415,7 +425,7 @@ export class SuggestModel implements IDisposable {
 			}
 
 			// we made it till here -> trigger now
-			this.trigger({ auto: true, shy: false });
+			this.trigger({ auto: true });
 
 		}, this._editor.getOption(EditorOption.quickSuggestionsDelay));
 	}
@@ -429,29 +439,29 @@ export class SuggestModel implements IDisposable {
 		this._onNewContext(ctx);
 	}
 
-	trigger(context: SuggestTriggerContext, retrigger: boolean = false, onlyFrom?: Set<CompletionItemProvider>, existing?: { items: CompletionItem[]; clipboardText: string | undefined }, noFilter?: boolean): void {
+	trigger(options: SuggestTriggerOptions): void {
 		if (!this._editor.hasModel()) {
 			return;
 		}
 
 		const model = this._editor.getModel();
-		const auto = context.auto;
-		const ctx = new LineContext(model, this._editor.getPosition(), auto, context.shy);
+		const auto = options.auto;
+		const ctx = new LineContext(model, this._editor.getPosition(), auto, options.shy);
 
 		// Cancel previous requests, change state & update UI
-		this.cancel(retrigger);
+		this.cancel(options.retrigger);
 		this._state = auto ? State.Auto : State.Manual;
-		this._onDidTrigger.fire({ auto, shy: context.shy, position: this._editor.getPosition() });
+		this._onDidTrigger.fire({ auto, shy: options.shy ?? false, position: this._editor.getPosition() });
 
 		// Capture context when request was sent
 		this._context = ctx;
 
 		// Build context for request
-		let suggestCtx: CompletionContext = { triggerKind: context.triggerKind ?? CompletionTriggerKind.Invoke };
-		if (context.triggerCharacter) {
+		let suggestCtx: CompletionContext = { triggerKind: options.triggerKind ?? CompletionTriggerKind.Invoke };
+		if (options.triggerCharacter) {
 			suggestCtx = {
 				triggerKind: CompletionTriggerKind.TriggerCharacter,
-				triggerCharacter: context.triggerCharacter
+				triggerCharacter: options.triggerCharacter
 			};
 		}
 
@@ -474,7 +484,7 @@ export class SuggestModel implements IDisposable {
 		}
 
 		const { itemKind: itemKindFilter, showDeprecated } = SuggestModel._createSuggestFilter(this._editor);
-		const completionOptions = new CompletionOptions(snippetSortOrder, !noFilter ? itemKindFilter : new Set(), onlyFrom, showDeprecated);
+		const completionOptions = new CompletionOptions(snippetSortOrder, options.completionOptions?.kindFilter ?? itemKindFilter, options.completionOptions?.providerFilter, options.completionOptions?.providerItemsToReuse, showDeprecated);
 		const wordDistance = WordDistance.create(this._editorWorkerService, this._editor);
 
 		const completions = provideSuggestionItems(
@@ -494,7 +504,7 @@ export class SuggestModel implements IDisposable {
 				return;
 			}
 
-			let clipboardText = existing?.clipboardText;
+			let clipboardText = options?.clipboardText;
 			if (!clipboardText && completions.needsClipboard) {
 				clipboardText = await this._clipboardService.readText();
 			}
@@ -504,19 +514,19 @@ export class SuggestModel implements IDisposable {
 			}
 
 			const model = this._editor.getModel();
-			let items = completions.items;
+			// const items = completions.items;
 
-			if (existing) {
-				const cmpFn = getSuggestionComparator(snippetSortOrder);
-				items = items.concat(existing.items).sort(cmpFn);
-			}
+			// if (existing) {
+			// 	const cmpFn = getSuggestionComparator(snippetSortOrder);
+			// 	items = items.concat(existing.items).sort(cmpFn);
+			// }
 
-			const ctx = new LineContext(model, this._editor.getPosition(), auto, context.shy);
+			const ctx = new LineContext(model, this._editor.getPosition(), auto, options.shy);
 			const fuzzySearchOptions = {
 				...FuzzyScoreOptions.default,
 				firstMatchCanBeWeak: !this._editor.getOption(EditorOption.suggest).matchOnWordStartOnly
 			};
-			this._completionModel = new CompletionModel(items, this._context!.column, {
+			this._completionModel = new CompletionModel(completions.items, this._context!.column, {
 				leadingLineContent: ctx.leadingLineContent,
 				characterCountDelta: ctx.column - this._context!.column
 			},
@@ -625,7 +635,7 @@ export class SuggestModel implements IDisposable {
 		if (ctx.column < this._context.column) {
 			// typed -> moved cursor LEFT -> retrigger if still on a word
 			if (ctx.leadingWord.word) {
-				this.trigger({ auto: this._context.auto, shy: false }, true);
+				this.trigger({ auto: this._context.auto, retrigger: true });
 			} else {
 				this.cancel();
 			}
@@ -638,24 +648,39 @@ export class SuggestModel implements IDisposable {
 		}
 
 		if (ctx.leadingWord.word.length !== 0 && ctx.leadingWord.startColumn > this._context.leadingWord.startColumn) {
-			// started a new word while IntelliSense shows -> retrigger
-
-			// Select those providers have not contributed to this completion model and re-trigger completions for
-			// them. Also adopt the existing items and merge them into the new completion model
-			const inactiveProvider = new Set(this._languageFeaturesService.completionProvider.all(this._editor.getModel()!));
-			for (const provider of this._completionModel.allProvider) {
-				inactiveProvider.delete(provider);
+			// started a new word while IntelliSense shows -> retrigger but reuse all items that we currently have
+			if (LineContext.shouldAutoTrigger(this._editor)) {
+				const map = this._completionModel.getItemsByProvider();
+				this.trigger({
+					auto: this._context.auto,
+					retrigger: true,
+					clipboardText: this._completionModel.clipboardText,
+					completionOptions: { providerItemsToReuse: map }
+				});
 			}
-			const items = this._completionModel.adopt(new Set());
-			this.trigger({ auto: this._context.auto, shy: false }, true, inactiveProvider, { items, clipboardText: this._completionModel.clipboardText });
 			return;
 		}
 
-		if (ctx.column > this._context.column && this._completionModel.incomplete.size > 0 && ctx.leadingWord.word.length !== 0) {
+		if (ctx.column > this._context.column && this._completionModel.getIncompleteProvider().size > 0 && ctx.leadingWord.word.length !== 0) {
 			// typed -> moved cursor RIGHT & incomple model & still on a word -> retrigger
-			const { incomplete } = this._completionModel;
-			const items = this._completionModel.adopt(incomplete);
-			this.trigger({ auto: this._state === State.Auto, shy: false, triggerKind: CompletionTriggerKind.TriggerForIncompleteCompletions }, true, incomplete, { items, clipboardText: this._completionModel.clipboardText });
+
+			const providerItemsToReuse = new Map<CompletionItemProvider, CompletionItem[]>();
+			const providerFilter = new Set<CompletionItemProvider>();
+			for (const [provider, items] of this._completionModel.getItemsByProvider()) {
+				if (items.length > 0 && items[0].container.incomplete) {
+					providerFilter.add(provider);
+				} else {
+					providerItemsToReuse.set(provider, items);
+				}
+			}
+
+			this.trigger({
+				auto: this._state === State.Auto,
+				triggerKind: CompletionTriggerKind.TriggerForIncompleteCompletions,
+				retrigger: true,
+				clipboardText: this._completionModel.clipboardText,
+				completionOptions: { providerFilter, providerItemsToReuse }
+			});
 
 		} else {
 			// typed -> moved cursor RIGHT -> update UI
@@ -669,9 +694,17 @@ export class SuggestModel implements IDisposable {
 
 			if (this._completionModel.items.length === 0) {
 
-				if (LineContext.shouldAutoTrigger(this._editor) && this._context.leadingWord.endColumn < ctx.leadingWord.startColumn) {
+				const shouldAutoTrigger = LineContext.shouldAutoTrigger(this._editor);
+				if (!this._context) {
+					// shouldAutoTrigger forces tokenization, which can cause pending cursor change events to be emitted, which can cause
+					// suggestions to be cancelled, which causes `this._context` to be undefined
+					this.cancel();
+					return;
+				}
+
+				if (shouldAutoTrigger && this._context.leadingWord.endColumn < ctx.leadingWord.startColumn) {
 					// retrigger when heading into a new word
-					this.trigger({ auto: this._context.auto, shy: false }, true);
+					this.trigger({ auto: this._context.auto, retrigger: true });
 					return;
 				}
 
diff --git a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts b/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
index eeaee8bd114928..d8e7465278b394 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
@@ -572,9 +572,8 @@ export class SuggestWidget implements IDisposable {
 	}
 
 	focusSelected(): void {
-		const selection = this._list.getSelection();
-		if (selection.length === 1) {
-			this._list.setFocus([selection[0]]);
+		if (this._list.length > 0) {
+			this._list.setFocus([0]);
 		}
 	}
 
@@ -667,6 +666,7 @@ export class SuggestWidget implements IDisposable {
 			&& this._state !== State.Empty
 			&& this._state !== State.Loading
 			&& this._completionModel
+			&& this._list.getFocus().length > 0
 		) {
 
 			return {
diff --git a/src/vs/editor/contrib/suggest/test/browser/completionModel.test.ts b/src/vs/editor/contrib/suggest/test/browser/completionModel.test.ts
index 42b961a69ad6c4..a9c013b4e7deea 100644
--- a/src/vs/editor/contrib/suggest/test/browser/completionModel.test.ts
+++ b/src/vs/editor/contrib/suggest/test/browser/completionModel.test.ts
@@ -102,7 +102,7 @@ suite('CompletionModel', function () {
 
 	test('complete/incomplete', () => {
 
-		assert.strictEqual(model.incomplete.size, 0);
+		assert.strictEqual(model.getIncompleteProvider().size, 0);
 
 		const incompleteModel = new CompletionModel([
 			createSuggestItem('foo', 3, undefined, true),
@@ -111,25 +111,7 @@ suite('CompletionModel', function () {
 			leadingLineContent: 'foo',
 			characterCountDelta: 0
 		}, WordDistance.None, EditorOptions.suggest.defaultValue, EditorOptions.snippetSuggestions.defaultValue, undefined);
-		assert.strictEqual(incompleteModel.incomplete.size, 1);
-	});
-
-	test('replaceIncomplete', () => {
-
-		const completeItem = createSuggestItem('foobar', 1, undefined, false, { lineNumber: 1, column: 2 });
-		const incompleteItem = createSuggestItem('foofoo', 1, undefined, true, { lineNumber: 1, column: 2 });
-
-		const model = new CompletionModel([completeItem, incompleteItem], 2, { leadingLineContent: 'f', characterCountDelta: 0 }, WordDistance.None, EditorOptions.suggest.defaultValue, EditorOptions.snippetSuggestions.defaultValue, undefined);
-		assert.strictEqual(model.incomplete.size, 1);
-		assert.strictEqual(model.items.length, 2);
-
-		const { incomplete } = model;
-		const complete = model.adopt(incomplete);
-
-		assert.strictEqual(incomplete.size, 1);
-		assert.ok(incomplete.has(incompleteItem.provider));
-		assert.strictEqual(complete.length, 1);
-		assert.ok(complete[0] === completeItem);
+		assert.strictEqual(incompleteModel.getIncompleteProvider().size, 1);
 	});
 
 	test('Fuzzy matching of snippets stopped working with inline snippet suggestions #49895', function () {
@@ -150,15 +132,8 @@ suite('CompletionModel', function () {
 				incompleteItem1,
 			], 2, { leadingLineContent: 'f', characterCountDelta: 0 }, WordDistance.None, EditorOptions.suggest.defaultValue, EditorOptions.snippetSuggestions.defaultValue, undefined
 		);
-		assert.strictEqual(model.incomplete.size, 1);
+		assert.strictEqual(model.getIncompleteProvider().size, 1);
 		assert.strictEqual(model.items.length, 6);
-
-		const { incomplete } = model;
-		const complete = model.adopt(incomplete);
-
-		assert.strictEqual(incomplete.size, 1);
-		assert.ok(incomplete.has(incompleteItem1.provider));
-		assert.strictEqual(complete.length, 5);
 	});
 
 	test('proper current word when length=0, #16380', function () {
diff --git a/src/vs/editor/contrib/suggest/test/browser/suggestModel.test.ts b/src/vs/editor/contrib/suggest/test/browser/suggestModel.test.ts
index 2dd5f01a2846b8..7a49d6f9a0e8e8 100644
--- a/src/vs/editor/contrib/suggest/test/browser/suggestModel.test.ts
+++ b/src/vs/editor/contrib/suggest/test/browser/suggestModel.test.ts
@@ -253,7 +253,7 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 			return Promise.all([
 
 				assertEvent(model.onDidTrigger, function () {
-					model.trigger({ auto: true, shy: false });
+					model.trigger({ auto: true });
 				}, function (event) {
 					assert.strictEqual(event.auto, true);
 
@@ -265,13 +265,13 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 				}),
 
 				assertEvent(model.onDidTrigger, function () {
-					model.trigger({ auto: true, shy: false });
+					model.trigger({ auto: true });
 				}, function (event) {
 					assert.strictEqual(event.auto, true);
 				}),
 
 				assertEvent(model.onDidTrigger, function () {
-					model.trigger({ auto: false, shy: false });
+					model.trigger({ auto: false });
 				}, function (event) {
 					assert.strictEqual(event.auto, false);
 				})
@@ -287,12 +287,12 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 		return withOracle(model => {
 			return Promise.all([
 				assertEvent(model.onDidCancel, function () {
-					model.trigger({ auto: true, shy: false });
+					model.trigger({ auto: true });
 				}, function (event) {
 					assert.strictEqual(event.retrigger, false);
 				}),
 				assertEvent(model.onDidSuggest, function () {
-					model.trigger({ auto: false, shy: false });
+					model.trigger({ auto: false });
 				}, function (event) {
 					assert.strictEqual(event.auto, false);
 					assert.strictEqual(event.isFrozen, false);
@@ -343,7 +343,7 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 
 			return assertEvent(model.onDidSuggest, () => {
 				// make sure completionModel starts here!
-				model.trigger({ auto: true, shy: false });
+				model.trigger({ auto: true });
 			}, event => {
 
 				return assertEvent(model.onDidSuggest, () => {
@@ -456,7 +456,7 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 			editor.setPosition({ lineNumber: 1, column: 3 });
 
 			return assertEvent(model.onDidSuggest, () => {
-				model.trigger({ auto: false, shy: false });
+				model.trigger({ auto: false });
 			}, event => {
 				assert.strictEqual(event.auto, false);
 				assert.strictEqual(event.isFrozen, false);
@@ -481,7 +481,7 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 			editor.setPosition({ lineNumber: 1, column: 3 });
 
 			return assertEvent(model.onDidSuggest, () => {
-				model.trigger({ auto: false, shy: false });
+				model.trigger({ auto: false });
 			}, event => {
 				assert.strictEqual(event.auto, false);
 				assert.strictEqual(event.isFrozen, false);
@@ -518,10 +518,10 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 			editor.setPosition({ lineNumber: 1, column: 4 });
 
 			return assertEvent(model.onDidSuggest, () => {
-				model.trigger({ auto: false, shy: false });
+				model.trigger({ auto: false });
 			}, event => {
 				assert.strictEqual(event.auto, false);
-				assert.strictEqual(event.completionModel.incomplete.size, 1);
+				assert.strictEqual(event.completionModel.getIncompleteProvider().size, 1);
 				assert.strictEqual(event.completionModel.items.length, 1);
 
 				return assertEvent(model.onDidCancel, () => {
@@ -555,10 +555,10 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 			editor.setPosition({ lineNumber: 1, column: 4 });
 
 			return assertEvent(model.onDidSuggest, () => {
-				model.trigger({ auto: false, shy: false });
+				model.trigger({ auto: false });
 			}, event => {
 				assert.strictEqual(event.auto, false);
-				assert.strictEqual(event.completionModel.incomplete.size, 1);
+				assert.strictEqual(event.completionModel.getIncompleteProvider().size, 1);
 				assert.strictEqual(event.completionModel.items.length, 1);
 
 				return assertEvent(model.onDidSuggest, () => {
@@ -568,7 +568,7 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 					editor.trigger('keyboard', Handler.Type, { text: ';' });
 				}, event => {
 					assert.strictEqual(event.auto, false);
-					assert.strictEqual(event.completionModel.incomplete.size, 1);
+					assert.strictEqual(event.completionModel.getIncompleteProvider().size, 1);
 					assert.strictEqual(event.completionModel.items.length, 1);
 
 				});
@@ -714,7 +714,7 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 
 			await assertEvent(sugget.onDidSuggest, () => {
 				editor.setPosition({ lineNumber: 1, column: 3 });
-				sugget.trigger({ auto: false, shy: false });
+				sugget.trigger({ auto: false });
 			}, event => {
 
 				assert.strictEqual(event.completionModel.items.length, 1);
@@ -941,4 +941,130 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 			});
 		});
 	});
+
+	test('Unexpected suggest scoring #167242', async function () {
+		disposables.add(registry.register('*', {
+			// word-based
+			provideCompletionItems(doc, pos) {
+				const word = doc.getWordUntilPosition(pos);
+				return {
+					suggestions: [{
+						kind: CompletionItemKind.Text,
+						label: 'pull',
+						insertText: 'pull',
+						range: new Range(pos.lineNumber, word.startColumn, pos.lineNumber, word.endColumn)
+					}],
+				};
+			}
+		}));
+		disposables.add(registry.register({ scheme: 'test' }, {
+			// JSON-based
+			provideCompletionItems(doc, pos) {
+				return {
+					suggestions: [{
+						kind: CompletionItemKind.Class,
+						label: 'git.pull',
+						insertText: 'git.pull',
+						range: new Range(pos.lineNumber, 1, pos.lineNumber, pos.column)
+					}],
+				};
+			},
+		}));
+
+		return withOracle(async function (model, editor) {
+
+			await assertEvent(model.onDidSuggest, () => {
+				editor.setValue('gi');
+				editor.setSelection(new Selection(1, 3, 1, 3));
+				editor.trigger('keyboard', Handler.Type, { text: 't' });
+
+			}, event => {
+				assert.strictEqual(event.auto, true);
+				assert.strictEqual(event.completionModel.items.length, 1);
+				assert.strictEqual(event.completionModel.items[0].textLabel, 'git.pull');
+			});
+
+			editor.trigger('keyboard', Handler.Type, { text: '.' });
+
+			await assertEvent(model.onDidSuggest, () => {
+				editor.trigger('keyboard', Handler.Type, { text: 'p' });
+
+			}, event => {
+				assert.strictEqual(event.auto, true);
+				assert.strictEqual(event.completionModel.items.length, 1);
+				assert.strictEqual(event.completionModel.items[0].textLabel, 'git.pull');
+			});
+		});
+	});
+
+	test('Completion list closes unexpectedly when typing a digit after a word separator #169390', function () {
+
+		const requestCounts = [0, 0];
+
+		disposables.add(registry.register({ scheme: 'test' }, {
+
+			provideCompletionItems(doc, pos) {
+				requestCounts[0] += 1;
+				return {
+					suggestions: [{
+						kind: CompletionItemKind.Text,
+						label: 'foo-20',
+						insertText: 'foo-20',
+						range: new Range(pos.lineNumber, 1, pos.lineNumber, pos.column)
+					}, {
+						kind: CompletionItemKind.Text,
+						label: 'foo-hello',
+						insertText: 'foo-hello',
+						range: new Range(pos.lineNumber, 1, pos.lineNumber, pos.column)
+					}],
+				};
+			}
+		}));
+		disposables.add(registry.register({ scheme: 'test' }, {
+			triggerCharacters: ['2'],
+			provideCompletionItems(doc, pos, ctx) {
+				requestCounts[1] += 1;
+				if (ctx.triggerKind !== CompletionTriggerKind.TriggerCharacter) {
+					return;
+				}
+				return {
+					suggestions: [{
+						kind: CompletionItemKind.Class,
+						label: 'foo-210',
+						insertText: 'foo-210',
+						range: new Range(pos.lineNumber, 1, pos.lineNumber, pos.column)
+					}],
+				};
+			},
+		}));
+
+		return withOracle(async function (model, editor) {
+
+			await assertEvent(model.onDidSuggest, () => {
+				editor.setValue('foo');
+				editor.setSelection(new Selection(1, 4, 1, 4));
+				model.trigger({ auto: false });
+
+			}, event => {
+				assert.strictEqual(event.auto, false);
+				assert.strictEqual(event.completionModel.items.length, 2);
+				assert.strictEqual(event.completionModel.items[0].textLabel, 'foo-20');
+				assert.strictEqual(event.completionModel.items[1].textLabel, 'foo-hello');
+			});
+
+			editor.trigger('keyboard', Handler.Type, { text: '-' });
+
+
+			await assertEvent(model.onDidSuggest, () => {
+				editor.trigger('keyboard', Handler.Type, { text: '2' });
+
+			}, event => {
+				assert.strictEqual(event.auto, true);
+				assert.strictEqual(event.completionModel.items.length, 2);
+				assert.strictEqual(event.completionModel.items[0].textLabel, 'foo-20');
+				assert.strictEqual(event.completionModel.items[1].textLabel, 'foo-210');
+				assert.deepStrictEqual(requestCounts, [1, 2]);
+			});
+		});
+	});
 });
diff --git a/src/vs/editor/contrib/wordHighlighter/browser/highlightDecorations.css b/src/vs/editor/contrib/wordHighlighter/browser/highlightDecorations.css
new file mode 100644
index 00000000000000..d5406c6d4c8adb
--- /dev/null
+++ b/src/vs/editor/contrib/wordHighlighter/browser/highlightDecorations.css
@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.monaco-editor .focused .selectionHighlight {
+	background-color: var(--vscode-editor-selectionHighlightBackground);
+	box-sizing: border-box;
+	border: 1px solid var(--vscode-editor-selectionHighlightBorder);
+}
+.monaco-editor.hc-black .selectionHighlight, .monaco-editor.hc-light .selectionHighlight {
+	border-style: dotted;
+}
+
+.monaco-editor .wordHighlight {
+	background-color: var(--vscode-editor-wordHighlightBackground);
+	box-sizing: border-box;
+	border: 1px solid var(--vscode-editor-wordHighlightBorder);
+}
+.monaco-editor.hc-black .wordHighlight, .monaco-editor.hc-light .wordHighlight {
+	border-style: dotted;
+}
+
+.monaco-editor .wordHighlightStrong {
+	background-color: var(--vscode-editor-wordHighlightStrongBackground);
+	box-sizing: border-box;
+	border: 1px solid var(--vscode-editor-wordHighlightStrongBorder);
+}
+.monaco-editor.hc-black .wordHighlightStrong, .monaco-editor.hc-light .wordHighlightStrong {
+	border-style: dotted;
+}
+
+.monaco-editor .focused .wordHighlightText {
+	background-color: var(--vscode-editor-wordHighlightTextBackground);
+	box-sizing: border-box;
+	border: 1px solid var(--vscode-editor-wordHighlightTextBorder);
+}
+.monaco-editor.hc-black .wordHighlightText, .monaco-editor.hc-light .wordHighlightText {
+	border-style: dotted;
+}
diff --git a/src/vs/editor/contrib/wordHighlighter/browser/highlightDecorations.ts b/src/vs/editor/contrib/wordHighlighter/browser/highlightDecorations.ts
new file mode 100644
index 00000000000000..b3825b0f05d739
--- /dev/null
+++ b/src/vs/editor/contrib/wordHighlighter/browser/highlightDecorations.ts
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+import 'vs/css!./highlightDecorations';
+import { MinimapPosition, OverviewRulerLane, TrackedRangeStickiness } from 'vs/editor/common/model';
+import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
+import { DocumentHighlightKind } from 'vs/editor/common/languages';
+import * as nls from 'vs/nls';
+import { activeContrastBorder, editorSelectionHighlight, minimapSelectionOccurrenceHighlight, overviewRulerSelectionHighlightForeground, registerColor } from 'vs/platform/theme/common/colorRegistry';
+import { registerThemingParticipant, themeColorFromId } from 'vs/platform/theme/common/themeService';
+
+const wordHighlightBackground = registerColor('editor.wordHighlightBackground', { dark: '#575757B8', light: '#57575740', hcDark: null, hcLight: null }, nls.localize('wordHighlight', 'Background color of a symbol during read-access, like reading a variable. The color must not be opaque so as not to hide underlying decorations.'), true);
+registerColor('editor.wordHighlightStrongBackground', { dark: '#004972B8', light: '#0e639c40', hcDark: null, hcLight: null }, nls.localize('wordHighlightStrong', 'Background color of a symbol during write-access, like writing to a variable. The color must not be opaque so as not to hide underlying decorations.'), true);
+registerColor('editor.wordHighlightTextBackground', { light: wordHighlightBackground, dark: wordHighlightBackground, hcDark: wordHighlightBackground, hcLight: wordHighlightBackground }, nls.localize('wordHighlightText', 'Background color of a textual occurrence for a symbol. The color must not be opaque so as not to hide underlying decorations.'), true);
+const wordHighlightBorder = registerColor('editor.wordHighlightBorder', { light: null, dark: null, hcDark: activeContrastBorder, hcLight: activeContrastBorder }, nls.localize('wordHighlightBorder', 'Border color of a symbol during read-access, like reading a variable.'));
+registerColor('editor.wordHighlightStrongBorder', { light: null, dark: null, hcDark: activeContrastBorder, hcLight: activeContrastBorder }, nls.localize('wordHighlightStrongBorder', 'Border color of a symbol during write-access, like writing to a variable.'));
+registerColor('editor.wordHighlightTextBorder', { light: wordHighlightBorder, dark: wordHighlightBorder, hcDark: wordHighlightBorder, hcLight: wordHighlightBorder }, nls.localize('wordHighlightTextBorder', "Border color of a textual occurrence for a symbol."));
+const overviewRulerWordHighlightForeground = registerColor('editorOverviewRuler.wordHighlightForeground', { dark: '#A0A0A0CC', light: '#A0A0A0CC', hcDark: '#A0A0A0CC', hcLight: '#A0A0A0CC' }, nls.localize('overviewRulerWordHighlightForeground', 'Overview ruler marker color for symbol highlights. The color must not be opaque so as not to hide underlying decorations.'), true);
+const overviewRulerWordHighlightStrongForeground = registerColor('editorOverviewRuler.wordHighlightStrongForeground', { dark: '#C0A0C0CC', light: '#C0A0C0CC', hcDark: '#C0A0C0CC', hcLight: '#C0A0C0CC' }, nls.localize('overviewRulerWordHighlightStrongForeground', 'Overview ruler marker color for write-access symbol highlights. The color must not be opaque so as not to hide underlying decorations.'), true);
+const overviewRulerWordHighlightTextForeground = registerColor('editorOverviewRuler.wordHighlightTextForeground', { dark: overviewRulerSelectionHighlightForeground, light: overviewRulerSelectionHighlightForeground, hcDark: overviewRulerSelectionHighlightForeground, hcLight: overviewRulerSelectionHighlightForeground }, nls.localize('overviewRulerWordHighlightTextForeground', 'Overview ruler marker color of a textual occurrence for a symbol. The color must not be opaque so as not to hide underlying decorations.'), true);
+
+const _WRITE_OPTIONS = ModelDecorationOptions.register({
+	description: 'word-highlight-strong',
+	stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+	className: 'wordHighlightStrong',
+	overviewRuler: {
+		color: themeColorFromId(overviewRulerWordHighlightStrongForeground),
+		position: OverviewRulerLane.Center
+	},
+	minimap: {
+		color: themeColorFromId(minimapSelectionOccurrenceHighlight),
+		position: MinimapPosition.Inline
+	},
+});
+
+const _TEXT_OPTIONS = ModelDecorationOptions.register({
+	description: 'word-highlight-text',
+	stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+	className: 'wordHighlightText',
+	overviewRuler: {
+		color: themeColorFromId(overviewRulerWordHighlightTextForeground),
+		position: OverviewRulerLane.Center
+	},
+	minimap: {
+		color: themeColorFromId(minimapSelectionOccurrenceHighlight),
+		position: MinimapPosition.Inline
+	},
+});
+
+const _SELECTION_HIGHLIGHT_OPTIONS = ModelDecorationOptions.register({
+	description: 'selection-highlight-overview',
+	stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+	className: 'selectionHighlight',
+	overviewRuler: {
+		color: themeColorFromId(overviewRulerSelectionHighlightForeground),
+		position: OverviewRulerLane.Center
+	},
+	minimap: {
+		color: themeColorFromId(minimapSelectionOccurrenceHighlight),
+		position: MinimapPosition.Inline
+	},
+});
+
+const _SELECTION_HIGHLIGHT_OPTIONS_NO_OVERVIEW = ModelDecorationOptions.register({
+	description: 'selection-highlight',
+	stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+	className: 'selectionHighlight',
+});
+
+const _REGULAR_OPTIONS = ModelDecorationOptions.register({
+	description: 'word-highlight',
+	stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+	className: 'wordHighlight',
+	overviewRuler: {
+		color: themeColorFromId(overviewRulerWordHighlightForeground),
+		position: OverviewRulerLane.Center
+	},
+	minimap: {
+		color: themeColorFromId(minimapSelectionOccurrenceHighlight),
+		position: MinimapPosition.Inline
+	},
+});
+
+export function getHighlightDecorationOptions(kind: DocumentHighlightKind | undefined): ModelDecorationOptions {
+	if (kind === DocumentHighlightKind.Write) {
+		return _WRITE_OPTIONS;
+	} else if (kind === DocumentHighlightKind.Text) {
+		return _TEXT_OPTIONS;
+	} else {
+		return _REGULAR_OPTIONS;
+	}
+}
+
+export function getSelectionHighlightDecorationOptions(hasSemanticHighlights: boolean): ModelDecorationOptions {
+	// Show in overviewRuler only if model has no semantic highlighting
+	return (hasSemanticHighlights ? _SELECTION_HIGHLIGHT_OPTIONS_NO_OVERVIEW : _SELECTION_HIGHLIGHT_OPTIONS);
+}
+
+registerThemingParticipant((theme, collector) => {
+	const selectionHighlight = theme.getColor(editorSelectionHighlight);
+	if (selectionHighlight) {
+		collector.addRule(`.monaco-editor .selectionHighlight { background-color: ${selectionHighlight.transparent(0.5)}; }`);
+	}
+});
diff --git a/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.ts b/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.ts
index 94d572b366c23f..4fb065c2823edb 100644
--- a/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.ts
+++ b/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./wordHighlighter';
 import { alert } from 'vs/base/browser/ui/aria/aria';
 import * as arrays from 'vs/base/common/arrays';
 import { CancelablePromise, createCancelablePromise, first, timeout } from 'vs/base/common/async';
@@ -20,26 +19,17 @@ import { Range } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
 import { IEditorContribution, IEditorDecorationsCollection } from 'vs/editor/common/editorCommon';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { IModelDeltaDecoration, ITextModel, MinimapPosition, OverviewRulerLane, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
+import { IModelDeltaDecoration, ITextModel } from 'vs/editor/common/model';
 import { DocumentHighlight, DocumentHighlightKind, DocumentHighlightProvider } from 'vs/editor/common/languages';
 import * as nls from 'vs/nls';
 import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { activeContrastBorder, editorSelectionHighlight, editorSelectionHighlightBorder, minimapSelectionOccurrenceHighlight, overviewRulerSelectionHighlightForeground, registerColor } from 'vs/platform/theme/common/colorRegistry';
-import { registerThemingParticipant, themeColorFromId } from 'vs/platform/theme/common/themeService';
 import { IWordAtPosition } from 'vs/editor/common/core/wordHelper';
 import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { isHighContrast } from 'vs/platform/theme/common/theme';
-
-registerColor('editor.wordHighlightBackground', { dark: '#575757B8', light: '#57575740', hcDark: null, hcLight: null }, nls.localize('wordHighlight', 'Background color of a symbol during read-access, like reading a variable. The color must not be opaque so as not to hide underlying decorations.'), true);
-registerColor('editor.wordHighlightStrongBackground', { dark: '#004972B8', light: '#0e639c40', hcDark: null, hcLight: null }, nls.localize('wordHighlightStrong', 'Background color of a symbol during write-access, like writing to a variable. The color must not be opaque so as not to hide underlying decorations.'), true);
-const editorWordHighlightBorder = registerColor('editor.wordHighlightBorder', { light: null, dark: null, hcDark: activeContrastBorder, hcLight: activeContrastBorder }, nls.localize('wordHighlightBorder', 'Border color of a symbol during read-access, like reading a variable.'));
-const editorWordHighlightStrongBorder = registerColor('editor.wordHighlightStrongBorder', { light: null, dark: null, hcDark: activeContrastBorder, hcLight: activeContrastBorder }, nls.localize('wordHighlightStrongBorder', 'Border color of a symbol during write-access, like writing to a variable.'));
-const overviewRulerWordHighlightForeground = registerColor('editorOverviewRuler.wordHighlightForeground', { dark: '#A0A0A0CC', light: '#A0A0A0CC', hcDark: '#A0A0A0CC', hcLight: '#A0A0A0CC' }, nls.localize('overviewRulerWordHighlightForeground', 'Overview ruler marker color for symbol highlights. The color must not be opaque so as not to hide underlying decorations.'), true);
-const overviewRulerWordHighlightStrongForeground = registerColor('editorOverviewRuler.wordHighlightStrongForeground', { dark: '#C0A0C0CC', light: '#C0A0C0CC', hcDark: '#C0A0C0CC', hcLight: '#C0A0C0CC' }, nls.localize('overviewRulerWordHighlightStrongForeground', 'Overview ruler marker color for write-access symbol highlights. The color must not be opaque so as not to hide underlying decorations.'), true);
+import { getHighlightDecorationOptions } from 'vs/editor/contrib/wordHighlighter/browser/highlightDecorations';
+
 const ctxHasWordHighlights = new RawContextKey<boolean>('hasWordHighlights', false);
 
 export function getOccurrencesAtPosition(registry: LanguageFeatureRegistry<DocumentHighlightProvider>, model: ITextModel, position: Position, token: CancellationToken): Promise<DocumentHighlight[] | null | undefined> {
@@ -448,7 +438,7 @@ class WordHighlighter {
 			if (info.range) {
 				decorations.push({
 					range: info.range,
-					options: WordHighlighter._getDecorationOptions(info.kind)
+					options: getHighlightDecorationOptions(info.kind)
 				});
 			}
 		}
@@ -457,58 +447,6 @@ class WordHighlighter {
 		this._hasWordHighlights.set(this.hasDecorations());
 	}
 
-	private static _getDecorationOptions(kind: DocumentHighlightKind | undefined): ModelDecorationOptions {
-		if (kind === DocumentHighlightKind.Write) {
-			return this._WRITE_OPTIONS;
-		} else if (kind === DocumentHighlightKind.Text) {
-			return this._TEXT_OPTIONS;
-		} else {
-			return this._REGULAR_OPTIONS;
-		}
-	}
-
-	private static readonly _WRITE_OPTIONS = ModelDecorationOptions.register({
-		description: 'word-highlight-strong',
-		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-		className: 'wordHighlightStrong',
-		overviewRuler: {
-			color: themeColorFromId(overviewRulerWordHighlightStrongForeground),
-			position: OverviewRulerLane.Center
-		},
-		minimap: {
-			color: themeColorFromId(minimapSelectionOccurrenceHighlight),
-			position: MinimapPosition.Inline
-		},
-	});
-
-	private static readonly _TEXT_OPTIONS = ModelDecorationOptions.register({
-		description: 'selection-highlight',
-		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-		className: 'selectionHighlight',
-		overviewRuler: {
-			color: themeColorFromId(overviewRulerSelectionHighlightForeground),
-			position: OverviewRulerLane.Center
-		},
-		minimap: {
-			color: themeColorFromId(minimapSelectionOccurrenceHighlight),
-			position: MinimapPosition.Inline
-		},
-	});
-
-	private static readonly _REGULAR_OPTIONS = ModelDecorationOptions.register({
-		description: 'word-highlight',
-		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-		className: 'wordHighlight',
-		overviewRuler: {
-			color: themeColorFromId(overviewRulerWordHighlightForeground),
-			position: OverviewRulerLane.Center
-		},
-		minimap: {
-			color: themeColorFromId(minimapSelectionOccurrenceHighlight),
-			position: MinimapPosition.Inline
-		},
-	});
-
 	public dispose(): void {
 		this._stopAll();
 		this.toUnhook.dispose();
@@ -658,25 +596,3 @@ registerEditorContribution(WordHighlighterContribution.ID, WordHighlighterContri
 registerEditorAction(NextWordHighlightAction);
 registerEditorAction(PrevWordHighlightAction);
 registerEditorAction(TriggerWordHighlightAction);
-
-registerThemingParticipant((theme, collector) => {
-	const selectionHighlight = theme.getColor(editorSelectionHighlight);
-	if (selectionHighlight) {
-		collector.addRule(`.monaco-editor .selectionHighlight { background-color: ${selectionHighlight.transparent(0.5)}; }`);
-	}
-
-	const selectionHighlightBorder = theme.getColor(editorSelectionHighlightBorder);
-	if (selectionHighlightBorder) {
-		collector.addRule(`.monaco-editor .selectionHighlight { border: 1px ${isHighContrast(theme.type) ? 'dotted' : 'solid'} ${selectionHighlightBorder}; box-sizing: border-box; }`);
-	}
-
-	const wordHighlightBorder = theme.getColor(editorWordHighlightBorder);
-	if (wordHighlightBorder) {
-		collector.addRule(`.monaco-editor .wordHighlight { border: 1px ${isHighContrast(theme.type) ? 'dashed' : 'solid'} ${wordHighlightBorder}; box-sizing: border-box; }`);
-	}
-
-	const wordHighlightStrongBorder = theme.getColor(editorWordHighlightStrongBorder);
-	if (wordHighlightStrongBorder) {
-		collector.addRule(`.monaco-editor .wordHighlightStrong { border: 1px ${isHighContrast(theme.type) ? 'dashed' : 'solid'} ${wordHighlightStrongBorder}; box-sizing: border-box; }`);
-	}
-});
diff --git a/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.ts b/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.ts
index 6f863ad803d238..cf0ab63f80776b 100644
--- a/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.ts
+++ b/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.ts
@@ -417,22 +417,16 @@ export abstract class ZoneWidget implements IHorizontalSashLayoutProvider {
 
 		const model = this.editor.getModel();
 		if (model) {
-			const revealLine = where.endLineNumber + 1;
-			if (revealLine <= model.getLineCount()) {
-				// reveal line below the zone widget
-				this.revealLine(revealLine, false);
-			} else {
-				// reveal last line atop
-				this.revealLine(model.getLineCount(), true);
-			}
+			const range = model.validateRange(new Range(where.startLineNumber, 1, where.endLineNumber + 1, 1));
+			this.revealRange(range, range.endLineNumber === model.getLineCount());
 		}
 	}
 
-	protected revealLine(lineNumber: number, isLastLine: boolean) {
+	protected revealRange(range: Range, isLastLine: boolean) {
 		if (isLastLine) {
-			this.editor.revealLineInCenter(lineNumber, ScrollType.Smooth);
+			this.editor.revealLineNearTop(range.endLineNumber, ScrollType.Smooth);
 		} else {
-			this.editor.revealLine(lineNumber, ScrollType.Smooth);
+			this.editor.revealRange(range, ScrollType.Smooth);
 		}
 	}
 
diff --git a/src/vs/editor/standalone/browser/inspectTokens/inspectTokens.css b/src/vs/editor/standalone/browser/inspectTokens/inspectTokens.css
index 3b79226e2f5b60..8089b509bd0f8f 100644
--- a/src/vs/editor/standalone/browser/inspectTokens/inspectTokens.css
+++ b/src/vs/editor/standalone/browser/inspectTokens/inspectTokens.css
@@ -10,6 +10,10 @@
 	padding: 10px;
 	color: var(--vscode-editorHoverWidget-foreground);
 	background-color: var(--vscode-editorHoverWidget-background);
+	border: 1px solid var(--vscode-editorHoverWidget-border);
+}
+.monaco-editor.hc-black .tokens-inspect-widget, .monaco-editor.hc-light .tokens-inspect-widget {
+	border-width: 2px;
 }
 
 .monaco-editor .tokens-inspect-widget .tokens-inspect-separator {
diff --git a/src/vs/editor/standalone/browser/inspectTokens/inspectTokens.ts b/src/vs/editor/standalone/browser/inspectTokens/inspectTokens.ts
index 65557a70065413..da8a7c353340a4 100644
--- a/src/vs/editor/standalone/browser/inspectTokens/inspectTokens.ts
+++ b/src/vs/editor/standalone/browser/inspectTokens/inspectTokens.ts
@@ -19,10 +19,7 @@ import { FontStyle, StandardTokenType, TokenMetadata } from 'vs/editor/common/en
 import { NullState, nullTokenize, nullTokenizeEncoded } from 'vs/editor/common/languages/nullTokenize';
 import { ILanguageService } from 'vs/editor/common/languages/language';
 import { IStandaloneThemeService } from 'vs/editor/standalone/common/standaloneTheme';
-import { editorHoverBorder } from 'vs/platform/theme/common/colorRegistry';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { InspectTokensNLS } from 'vs/editor/common/standaloneStrings';
-import { isHighContrast } from 'vs/platform/theme/common/theme';
 
 
 class InspectTokensController extends Disposable implements IEditorContribution {
@@ -331,11 +328,3 @@ class InspectTokensWidget extends Disposable implements IContentWidget {
 
 registerEditorContribution(InspectTokensController.ID, InspectTokensController, EditorContributionInstantiation.Lazy);
 registerEditorAction(InspectTokens);
-
-registerThemingParticipant((theme, collector) => {
-	const border = theme.getColor(editorHoverBorder);
-	if (border) {
-		const borderWidth = isHighContrast(theme.type) ? 2 : 1;
-		collector.addRule(`.monaco-editor .tokens-inspect-widget { border: ${borderWidth}px solid ${border}; }`);
-	}
-});
diff --git a/src/vs/editor/standalone/browser/quickAccess/standaloneGotoSymbolQuickAccess.ts b/src/vs/editor/standalone/browser/quickAccess/standaloneGotoSymbolQuickAccess.ts
index 0c1bce46968c5a..d7bf0d94002747 100644
--- a/src/vs/editor/standalone/browser/quickAccess/standaloneGotoSymbolQuickAccess.ts
+++ b/src/vs/editor/standalone/browser/quickAccess/standaloneGotoSymbolQuickAccess.ts
@@ -17,7 +17,7 @@ import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
+import { IQuickInputService, ItemActivation } from 'vs/platform/quickinput/common/quickInput';
 import { IOutlineModelService } from 'vs/editor/contrib/documentSymbols/browser/outlineModel';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
 
@@ -61,7 +61,7 @@ export class GotoSymbolAction extends EditorAction {
 	}
 
 	run(accessor: ServicesAccessor): void {
-		accessor.get(IQuickInputService).quickAccess.show(AbstractGotoSymbolQuickAccessProvider.PREFIX);
+		accessor.get(IQuickInputService).quickAccess.show(AbstractGotoSymbolQuickAccessProvider.PREFIX, { itemActivation: ItemActivation.NONE });
 	}
 }
 
diff --git a/src/vs/editor/standalone/browser/quickInput/standaloneQuickInputService.ts b/src/vs/editor/standalone/browser/quickInput/standaloneQuickInputService.ts
index 2c20b872287cf0..d6ef9352e38e45 100644
--- a/src/vs/editor/standalone/browser/quickInput/standaloneQuickInputService.ts
+++ b/src/vs/editor/standalone/browser/quickInput/standaloneQuickInputService.ts
@@ -5,7 +5,7 @@
 
 import 'vs/css!./standaloneQuickInput';
 import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPositionPreference } from 'vs/editor/browser/editorBrowser';
-import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
+import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IQuickInputService, IQuickInputButton, IQuickPickItem, IQuickPick, IInputBox, IQuickNavigateConfiguration, IPickOptions, QuickPickInput, IInputOptions } from 'vs/platform/quickinput/common/quickInput';
@@ -184,4 +184,4 @@ export class QuickInputEditorWidget implements IOverlayWidget {
 	}
 }
 
-registerEditorContribution(QuickInputEditorContribution.ID, QuickInputEditorContribution);
+registerEditorContribution(QuickInputEditorContribution.ID, QuickInputEditorContribution, EditorContributionInstantiation.Lazy);
diff --git a/src/vs/editor/standalone/browser/standaloneCodeEditor.ts b/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
index 9f15f355956cb6..dfa8aa29f3f946 100644
--- a/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
+++ b/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
@@ -132,7 +132,7 @@ export interface IGlobalEditorOptions {
 	 */
 	'semanticHighlighting.enabled'?: true | false | 'configuredByTheme';
 	/**
-	 * Keep peek editors open even when double clicking their content or when hitting `Escape`.
+	 * Keep peek editors open even when double-clicking their content or when hitting `Escape`.
 	 * Defaults to false.
 	 */
 	stablePeek?: boolean;
diff --git a/src/vs/editor/standalone/browser/standaloneServices.ts b/src/vs/editor/standalone/browser/standaloneServices.ts
index e329404ef1d1a1..b28cfcfd0632c3 100644
--- a/src/vs/editor/standalone/browser/standaloneServices.ts
+++ b/src/vs/editor/standalone/browser/standaloneServices.ts
@@ -39,7 +39,7 @@ import { KeybindingResolver } from 'vs/platform/keybinding/common/keybindingReso
 import { IKeybindingItem, KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
 import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
-import { ILabelService, ResourceLabelFormatter, IFormatterChangeEvent } from 'vs/platform/label/common/label';
+import { ILabelService, ResourceLabelFormatter, IFormatterChangeEvent, Verbosity } from 'vs/platform/label/common/label';
 import { INotification, INotificationHandle, INotificationService, IPromptChoice, IPromptOptions, NoOpNotification, IStatusMessageOptions } from 'vs/platform/notification/common/notification';
 import { IProgressRunner, IEditorProgressService, IProgressService, IProgress, IProgressCompositeOptions, IProgressDialogOptions, IProgressNotificationOptions, IProgressOptions, IProgressStep, IProgressWindowOptions } from 'vs/platform/progress/common/progress';
 import { ITelemetryInfo, ITelemetryService, TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
@@ -90,7 +90,6 @@ import 'vs/editor/common/services/languageFeaturesService';
 import { DefaultConfigurationModel } from 'vs/platform/configuration/common/configurations';
 import { WorkspaceEdit } from 'vs/editor/common/languages';
 import { AudioCue, IAudioCueService, Sound } from 'vs/platform/audioCues/browser/audioCueService';
-import { constObservable, IObservable } from 'vs/base/common/observable';
 
 class SimpleModel implements IResolvedTextEditorModel {
 
@@ -871,7 +870,7 @@ class StandaloneUriLabelService implements ILabelService {
 		return basename(resource);
 	}
 
-	public getWorkspaceLabel(workspace: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI | IWorkspace, options?: { verbose: boolean }): string {
+	public getWorkspaceLabel(workspace: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI | IWorkspace, options?: { verbose: Verbosity }): string {
 		return '';
 	}
 
@@ -997,8 +996,12 @@ class StandaloneAudioService implements IAudioCueService {
 	async playAudioCues(cues: AudioCue[]): Promise<void> {
 	}
 
-	isEnabled(cue: AudioCue): IObservable<boolean, void> {
-		return constObservable(false);
+	isEnabled(cue: AudioCue): boolean {
+		return false;
+	}
+
+	onEnabledChanged(cue: AudioCue): Event<void> {
+		return Event.None;
 	}
 
 	async playSound(cue: Sound, allowManyInParallel?: boolean | undefined): Promise<void> {
diff --git a/src/vs/editor/standalone/common/monarch/monarchLexer.ts b/src/vs/editor/standalone/common/monarch/monarchLexer.ts
index 22a68f8bd58855..e434e40917f45e 100644
--- a/src/vs/editor/standalone/common/monarch/monarchLexer.ts
+++ b/src/vs/editor/standalone/common/monarch/monarchLexer.ts
@@ -16,7 +16,7 @@ import { ILanguageService } from 'vs/editor/common/languages/language';
 import * as monarchCommon from 'vs/editor/standalone/common/monarch/monarchCommon';
 import { IStandaloneThemeService } from 'vs/editor/standalone/common/standaloneTheme';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { LanguageId } from 'vs/editor/common/encodedTokenAttributes';
+import { LanguageId, MetadataConsts } from 'vs/editor/common/encodedTokenAttributes';
 
 const CACHE_STACK_DEPTH = 5;
 
@@ -315,7 +315,7 @@ class MonarchModernTokensCollector implements IMonarchTokensCollector {
 	}
 
 	public emit(startOffset: number, type: string): void {
-		const metadata = this._theme.match(this._currentLanguageId, type);
+		const metadata = this._theme.match(this._currentLanguageId, type) | MetadataConsts.BALANCED_BRACKETS_MASK;
 		if (this._lastTokenMetadata === metadata) {
 			return;
 		}
diff --git a/src/vs/editor/standalone/test/browser/standaloneServices.test.ts b/src/vs/editor/standalone/test/browser/standaloneServices.test.ts
index 7ea6d7884a053b..ce37510a9bf876 100644
--- a/src/vs/editor/standalone/test/browser/standaloneServices.test.ts
+++ b/src/vs/editor/standalone/test/browser/standaloneServices.test.ts
@@ -46,6 +46,7 @@ suite('StandaloneKeybindingService', () => {
 			shiftKey: false,
 			altKey: false,
 			metaKey: false,
+			altGraphKey: false,
 			keyCode: KeyCode.F9,
 			code: null!
 		});
diff --git a/src/vs/editor/test/browser/commands/sideEditing.test.ts b/src/vs/editor/test/browser/commands/sideEditing.test.ts
index f10012b474d2fb..391fad09dcf66c 100644
--- a/src/vs/editor/test/browser/commands/sideEditing.test.ts
+++ b/src/vs/editor/test/browser/commands/sideEditing.test.ts
@@ -46,7 +46,7 @@ suite('Editor Side Editing - collapsed selection', () => {
 				'third line',
 				'fourth'
 			],
-			[new Selection(1, 1, 1, 11)]
+			[new Selection(1, 11, 1, 11)]
 		);
 	});
 
@@ -233,7 +233,7 @@ suite('SideEditing', () => {
 					new Range(1, 4, 1, 4),
 					new Range(1, 4, 1, 4), 'xx',
 					[
-						[new Selection(1, 4, 1, 6), new Selection(1, 4, 1, 6)],
+						[new Selection(1, 6, 1, 6), new Selection(1, 6, 1, 6)],
 						[new Selection(1, 6, 1, 6), new Selection(1, 6, 1, 6)],
 					]
 				);
@@ -704,7 +704,7 @@ suite('SideEditing', () => {
 					new Range(1, 4, 1, 4),
 					new Range(1, 2, 1, 4), 'cccc',
 					[
-						[new Selection(1, 4, 1, 6), new Selection(1, 4, 1, 6)],
+						[new Selection(1, 6, 1, 6), new Selection(1, 6, 1, 6)],
 						[new Selection(1, 6, 1, 6), new Selection(1, 6, 1, 6)],
 					]
 				);
diff --git a/src/vs/editor/test/browser/config/editorLayoutProvider.test.ts b/src/vs/editor/test/browser/config/editorLayoutProvider.test.ts
index f2c6a1b44b6b2e..b8c1d0d459276f 100644
--- a/src/vs/editor/test/browser/config/editorLayoutProvider.test.ts
+++ b/src/vs/editor/test/browser/config/editorLayoutProvider.test.ts
@@ -45,6 +45,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => {
 		options._write(EditorOption.lineNumbersMinChars, input.lineNumbersMinChars);
 		options._write(EditorOption.lineDecorationsWidth, input.lineDecorationsWidth);
 		options._write(EditorOption.folding, false);
+		options._write(EditorOption.padding, { top: 0, bottom: 0 });
 		const minimapOptions: EditorMinimapOptions = {
 			enabled: input.minimap,
 			autohide: false,
diff --git a/src/vs/editor/test/browser/controller/cursor.test.ts b/src/vs/editor/test/browser/controller/cursor.test.ts
index 3615f378627a65..f9894dde21db5e 100644
--- a/src/vs/editor/test/browser/controller/cursor.test.ts
+++ b/src/vs/editor/test/browser/controller/cursor.test.ts
@@ -1791,7 +1791,7 @@ suite('Editor Controller', () => {
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
 			assert.strictEqual(model.getLineContent(1), 'Hello world ');
-			assertCursor(viewModel, new Selection(1, 12, 1, 13));
+			assertCursor(viewModel, new Selection(1, 13, 1, 13));
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
 			assert.strictEqual(model.getLineContent(1), 'Hello world');
@@ -4997,13 +4997,13 @@ suite('Editor Controller', () => {
 
 			const autoClosePositions = [
 				'var| a| |=| [|]|;|',
-				'var| b| |=| `asd`|;|',
-				'var| c| |=| \'asd\'|;|',
-				'var| d| |=| "asd"|;|',
+				'var| b| |=| |`asd|`|;|',
+				'var| c| |=| |\'asd|\'|;|',
+				'var| d| |=| |"asd|"|;|',
 				'var| e| |=| /*3*/|	3|;|',
 				'var| f| |=| /**| 3| */3|;|',
 				'var| g| |=| (3+5|)|;|',
-				'var| h| |=| {| a|:| \'value\'| |}|;|',
+				'var| h| |=| {| a|:| |\'value|\'| |}|;|',
 			];
 			for (let i = 0, len = autoClosePositions.length; i < len; i++) {
 				const lineNumber = i + 1;
@@ -5713,6 +5713,9 @@ suite('Editor Controller', () => {
 			text: [
 				'foo\'hello\''
 			],
+			editorOpts: {
+				autoClosingBrackets: 'beforeWhitespace'
+			},
 			languageId: languageId
 		}, (editor, model, viewModel) => {
 			assertType(editor, model, viewModel, 1, 4, '(', '(', `does not auto close @ (1, 4)`);
@@ -6108,6 +6111,70 @@ suite('Editor Controller', () => {
 			assertCursor(viewModel, new Selection(3, 7, 4, 7));
 		});
 	});
+
+	test('issue #112039: shift-continuing a double/triple-click and drag selection does not remember its starting mode', () => {
+		const model = createTextModel(
+			[
+				'just some text',
+				'and another line',
+				'and another one',
+			].join('\n')
+		);
+
+		withTestCodeEditor(model, {}, (editor, viewModel) => {
+			CoreNavigationCommands.WordSelect.runEditorCommand(null, editor, {
+				position: new Position(2, 6)
+			});
+			CoreNavigationCommands.MoveToSelect.runEditorCommand(null, editor, {
+				position: new Position(1, 8),
+			});
+			assertCursor(viewModel, new Selection(2, 12, 1, 6));
+		});
+	});
+
+	test('issue #158236: Shift click selection does not work on line number indicator', () => {
+		const model = createTextModel(
+			[
+				'just some text',
+				'and another line',
+				'and another one',
+			].join('\n')
+		);
+
+		withTestCodeEditor(model, {}, (editor, viewModel) => {
+			CoreNavigationCommands.MoveTo.runEditorCommand(null, editor, {
+				position: new Position(3, 5)
+			});
+			CoreNavigationCommands.LineSelectDrag.runEditorCommand(null, editor, {
+				position: new Position(2, 1)
+			});
+			assertCursor(viewModel, new Selection(3, 5, 2, 1));
+		});
+	});
+
+	test('issue #111513: Text gets automatically selected when typing at the same location in another editor', () => {
+		const model = createTextModel(
+			[
+				'just',
+				'',
+				'some text',
+			].join('\n')
+		);
+
+		withTestCodeEditor(model, {}, (editor1, viewModel1) => {
+			editor1.setSelections([
+				new Selection(2, 1, 2, 1)
+			]);
+			withTestCodeEditor(model, {}, (editor2, viewModel2) => {
+				editor2.setSelections([
+					new Selection(2, 1, 2, 1)
+				]);
+				viewModel2.type('e', 'keyboard');
+				assertCursor(viewModel2, new Position(2, 2));
+				assertCursor(viewModel1, new Position(2, 2));
+			});
+		});
+	});
 });
 
 suite('Undo stops', () => {
diff --git a/src/vs/editor/test/browser/controller/textAreaInput.test.ts b/src/vs/editor/test/browser/controller/textAreaInput.test.ts
index 36b10ab4e7a40d..d07d12f085f39a 100644
--- a/src/vs/editor/test/browser/controller/textAreaInput.test.ts
+++ b/src/vs/editor/test/browser/controller/textAreaInput.test.ts
@@ -127,6 +127,7 @@ suite('TextAreaInput', () => {
 						metaKey: event.metaKey,
 						repeat: event.repeat,
 						shiftKey: event.shiftKey,
+						getModifierState: (keyArg: string) => false
 					};
 					if (event.type === 'keydown') {
 						this._onKeyDown.fire(mockEvent);
diff --git a/src/vs/editor/test/common/diff/diffComputer.test.ts b/src/vs/editor/test/common/diff/diffComputer.test.ts
index 67ea1a550aaf5b..a8eb52b07c18ed 100644
--- a/src/vs/editor/test/common/diff/diffComputer.test.ts
+++ b/src/vs/editor/test/common/diff/diffComputer.test.ts
@@ -1064,4 +1064,25 @@ suite('Editor Diff - DiffComputer', () => {
 		];
 		assertDiff(original, modified, expected, false, false, false);
 	});
+
+	test('issue #169552: Assertion error when having both leading and trailing whitespace diffs', () => {
+		const original = [
+			'if True:',
+			'    print(2)',
+		];
+		const modified = [
+			'if True:',
+			'\tprint(2) ',
+		];
+		const expected = [
+			createLineChange(
+				2, 2, 2, 2,
+				[
+					createCharChange(2, 1, 2, 5, 2, 1, 2, 2),
+					createCharChange(2, 13, 2, 13, 2, 10, 2, 11),
+				]
+			),
+		];
+		assertDiff(original, modified, expected, true, false, false);
+	});
 });
diff --git a/src/vs/editor/test/common/model/textModel.test.ts b/src/vs/editor/test/common/model/textModel.test.ts
index 225cea65b17182..e060a9b4466b9f 100644
--- a/src/vs/editor/test/common/model/textModel.test.ts
+++ b/src/vs/editor/test/common/model/textModel.test.ts
@@ -1046,6 +1046,23 @@ suite('Editor Model - TextModel', () => {
 		assert.strictEqual(m.getValueInRange(new Range(NaN, NaN, NaN, NaN)), '');
 		m.dispose();
 	});
+
+	test('issue #168836: updating tabSize should also update indentSize when indentSize is set to "tabSize"', () => {
+		const m = createTextModel('some text', null, {
+			tabSize: 2,
+			indentSize: 'tabSize'
+		});
+		assert.strictEqual(m.getOptions().tabSize, 2);
+		assert.strictEqual(m.getOptions().indentSize, 2);
+		assert.strictEqual(m.getOptions().originalIndentSize, 'tabSize');
+		m.updateOptions({
+			tabSize: 4
+		});
+		assert.strictEqual(m.getOptions().tabSize, 4);
+		assert.strictEqual(m.getOptions().indentSize, 4);
+		assert.strictEqual(m.getOptions().originalIndentSize, 'tabSize');
+		m.dispose();
+	});
 });
 
 suite('TextModel.mightContainRTL', () => {
diff --git a/src/vs/editor/test/common/model/tokensStore.test.ts b/src/vs/editor/test/common/model/tokensStore.test.ts
index 25c141d009b0fc..417ebdecc370bf 100644
--- a/src/vs/editor/test/common/model/tokensStore.test.ts
+++ b/src/vs/editor/test/common/model/tokensStore.test.ts
@@ -19,7 +19,7 @@ import { ILanguageConfigurationService, LanguageConfigurationService } from 'vs/
 
 suite('TokensStore', () => {
 
-	const SEMANTIC_COLOR: ColorId = 5;
+	const SEMANTIC_COLOR = 5 as ColorId;
 
 	function parseTokensState(state: string[]): { text: string; tokens: SparseMultilineTokens } {
 		const text: string[] = [];
diff --git a/src/vs/editor/test/common/modes/linkComputer.test.ts b/src/vs/editor/test/common/modes/linkComputer.test.ts
index 4ddf17ba95af19..0b6e6bb7cf4a95 100644
--- a/src/vs/editor/test/common/modes/linkComputer.test.ts
+++ b/src/vs/editor/test/common/modes/linkComputer.test.ts
@@ -26,38 +26,29 @@ function myComputeLinks(lines: string[]): ILink[] {
 	return computeLinks(target);
 }
 
-function assertLink(text: string, extractedLink: string): void {
-	let startColumn = 0,
-		endColumn = 0,
-		chr: string,
-		i = 0;
-
-	for (i = 0; i < extractedLink.length; i++) {
-		chr = extractedLink.charAt(i);
-		if (chr !== ' ' && chr !== '\t') {
-			startColumn = i + 1;
-			break;
+function extractLinks(text: string): string {
+	const keep: boolean[] = [];
+	const links = myComputeLinks([text]);
+	for (const link of links) {
+		const startChar = link.range.startColumn - 1;
+		const endChar = link.range.endColumn - 1;
+		for (let char = startChar; char < endChar; char++) {
+			keep[char] = true;
 		}
 	}
-
-	for (i = extractedLink.length - 1; i >= 0; i--) {
-		chr = extractedLink.charAt(i);
-		if (chr !== ' ' && chr !== '\t') {
-			endColumn = i + 2;
-			break;
+	const result: string[] = [];
+	for (let i = 0; i < text.length; i++) {
+		if (keep[i]) {
+			result.push(text.charAt(i));
+		} else {
+			result.push(' ');
 		}
 	}
+	return result.join('');
+}
 
-	const r = myComputeLinks([text]);
-	assert.deepStrictEqual(r, [{
-		range: {
-			startLineNumber: 1,
-			startColumn: startColumn,
-			endLineNumber: 1,
-			endColumn: endColumn
-		},
-		url: extractedLink.substring(startColumn - 1, endColumn - 1)
-	}]);
+function assertLink(text: string, expectedLinks: string): void {
+	assert.deepStrictEqual(extractLinks(text), expectedLinks);
 }
 
 suite('Editor Modes - Link Computer', () => {
@@ -106,19 +97,19 @@ suite('Editor Modes - Link Computer', () => {
 
 		assertLink(
 			'(see http://foo.bar)',
-			'     http://foo.bar  '
+			'     http://foo.bar '
 		);
 		assertLink(
 			'[see http://foo.bar]',
-			'     http://foo.bar  '
+			'     http://foo.bar '
 		);
 		assertLink(
 			'{see http://foo.bar}',
-			'     http://foo.bar  '
+			'     http://foo.bar '
 		);
 		assertLink(
 			'<see http://foo.bar>',
-			'     http://foo.bar  '
+			'     http://foo.bar '
 		);
 		assertLink(
 			'<url>http://mylink.com</url>',
@@ -199,7 +190,7 @@ suite('Editor Modes - Link Computer', () => {
 	test('issue #62278: "Ctrl + click to follow link" for IPv6 URLs', () => {
 		assertLink(
 			'let x = "http://[::1]:5000/connect/token"',
-			'         http://[::1]:5000/connect/token  '
+			'         http://[::1]:5000/connect/token '
 		);
 	});
 
@@ -273,4 +264,15 @@ suite('Editor Modes - Link Computer', () => {
 			`                                   https://github.com/jeff-hykin/better-c-syntax/blob/master/autogenerated/c.tmLanguage.json  `,
 		);
 	});
+
+	test('issue #119696: Links shouldn\'t include commas', () => {
+		assertLink(
+			`https://apod.nasa.gov/apod/ap170720.html,IC 1396: Emission Nebula in Cepheus,https://apod.nasa.gov/apod/image/1707/MOSAIC_IC1396_HaSHO_blanco1024.jpg,https://apod.nasa.gov/apod/image/1707/MOSAIC_IC1396_HaSHO_blanco.jpg`,
+			`https://apod.nasa.gov/apod/ap170720.html                                     https://apod.nasa.gov/apod/image/1707/MOSAIC_IC1396_HaSHO_blanco1024.jpg https://apod.nasa.gov/apod/image/1707/MOSAIC_IC1396_HaSHO_blanco.jpg`
+		);
+		assertLink(
+			`https://apod.nasa.gov/apod/ap180402.html,"Moons, Rings, Shadows, Clouds: Saturn (Cassini)",https://apod.nasa.gov/apod/image/1804/SaturnRingsMoons_Cassini_967.jpg,https://apod.nasa.gov/apod/image/1804/SaturnRingsMoons_Cassini_967.jpg`,
+			`https://apod.nasa.gov/apod/ap180402.html                                                   https://apod.nasa.gov/apod/image/1804/SaturnRingsMoons_Cassini_967.jpg https://apod.nasa.gov/apod/image/1804/SaturnRingsMoons_Cassini_967.jpg`,
+		);
+	});
 });
diff --git a/src/vs/editor/test/common/modes/textToHtmlTokenizer.test.ts b/src/vs/editor/test/common/modes/textToHtmlTokenizer.test.ts
index dc6f59461d20ee..391a54710f65d2 100644
--- a/src/vs/editor/test/common/modes/textToHtmlTokenizer.test.ts
+++ b/src/vs/editor/test/common/modes/textToHtmlTokenizer.test.ts
@@ -305,9 +305,9 @@ class Mode extends Disposable {
 			tokenize: undefined!,
 			tokenizeEncoded: (line: string, hasEOL: boolean, state: IState): EncodedTokenizationResult => {
 				const tokensArr: number[] = [];
-				let prevColor: ColorId = -1;
+				let prevColor = -1 as ColorId;
 				for (let i = 0; i < line.length; i++) {
-					const colorId: ColorId = line.charAt(i) === '.' ? 7 : 9;
+					const colorId = (line.charAt(i) === '.' ? 7 : 9) as ColorId;
 					if (prevColor !== colorId) {
 						tokensArr.push(i);
 						tokensArr.push((
diff --git a/src/vs/editor/test/common/services/unicodeTextModelHighlighter.test.ts b/src/vs/editor/test/common/services/unicodeTextModelHighlighter.test.ts
new file mode 100644
index 00000000000000..4c4fa68a557703
--- /dev/null
+++ b/src/vs/editor/test/common/services/unicodeTextModelHighlighter.test.ts
@@ -0,0 +1,53 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert = require('assert');
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { Range } from 'vs/editor/common/core/range';
+import { UnicodeHighlighterOptions, UnicodeTextModelHighlighter } from 'vs/editor/common/services/unicodeTextModelHighlighter';
+import { createTextModel } from 'vs/editor/test/common/testTextModel';
+
+suite('UnicodeTextModelHighlighter', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	function t(text: string, options: UnicodeHighlighterOptions): unknown {
+		const m = createTextModel(text);
+		const r = UnicodeTextModelHighlighter.computeUnicodeHighlights(m, options);
+		m.dispose();
+
+		return {
+			...r,
+			ranges: r.ranges.map(r => Range.lift(r).toString())
+		};
+	}
+
+	test('computeUnicodeHighlights (#168068)', () => {
+		assert.deepStrictEqual(
+			t(`
+	For å gi et eksempel
+`, {
+				allowedCodePoints: [],
+				allowedLocales: [],
+				ambiguousCharacters: true,
+				invisibleCharacters: true,
+				includeComments: false,
+				includeStrings: false,
+				nonBasicASCII: false
+			}),
+			{
+				ambiguousCharacterCount: 0,
+				hasMore: false,
+				invisibleCharacterCount: 4,
+				nonBasicAsciiCharacterCount: 0,
+				ranges: [
+					'[2,5 -> 2,6]',
+					'[2,7 -> 2,8]',
+					'[2,10 -> 2,11]',
+					'[2,13 -> 2,14]'
+				]
+			}
+		);
+	});
+});
diff --git a/src/vs/editor/test/common/testTextModel.ts b/src/vs/editor/test/common/testTextModel.ts
index b445b6452ed553..f513fa490ca7d4 100644
--- a/src/vs/editor/test/common/testTextModel.ts
+++ b/src/vs/editor/test/common/testTextModel.ts
@@ -47,7 +47,7 @@ export function withEditorModel(text: string[], callback: (model: TextModel) =>
 
 export interface IRelaxedTextModelCreationOptions {
 	tabSize?: number;
-	indentSize?: number;
+	indentSize?: number | 'tabSize';
 	insertSpaces?: boolean;
 	detectIndentation?: boolean;
 	trimAutoWhitespace?: boolean;
diff --git a/src/vs/editor/test/node/diffing/diffing.test.ts b/src/vs/editor/test/node/diffing/diffing.test.ts
index 216fa03a13136d..eafdd623421aaf 100644
--- a/src/vs/editor/test/node/diffing/diffing.test.ts
+++ b/src/vs/editor/test/node/diffing/diffing.test.ts
@@ -47,35 +47,45 @@ suite('diff fixtures', () => {
 		const expectedFilePath = join(folderPath, `${diffingAlgoName}.expected.diff.json`);
 		const invalidFilePath = join(folderPath, `${diffingAlgoName}.invalid.diff.json`);
 
-		const expectedFileContentFromActual = JSON.stringify(actualDiffingResult, null, '\t');
-
-		const invalidExists = existsSync(invalidFilePath);
+		const actualJsonStr = JSON.stringify(actualDiffingResult, null, '\t');
 
 		if (!existsSync(expectedFilePath)) {
-			writeFileSync(expectedFilePath, expectedFileContentFromActual);
+			// New test, create expected file
+			writeFileSync(expectedFilePath, actualJsonStr);
+			// Create invalid file so that this test fails on a re-run
 			writeFileSync(invalidFilePath, '');
 			throw new Error('No expected file! Expected and invalid files were written. Delete the invalid file to make the test pass.');
-		} else {
-			const expectedFileContent = readFileSync(invalidExists ? invalidFilePath : expectedFilePath, 'utf8');
-			if (invalidExists && expectedFileContent === '') {
-				throw new Error('Delete the invalid file to make the test pass.');
+		} if (existsSync(invalidFilePath)) {
+			const invalidJsonStr = readFileSync(invalidFilePath, 'utf8');
+			if (invalidJsonStr === '') {
+				// Update expected file
+				writeFileSync(expectedFilePath, actualJsonStr);
+				throw new Error(`Delete the invalid ${invalidFilePath} file to make the test pass.`);
+			} else {
+				const expectedFileDiffResult: DiffingResult = JSON.parse(invalidJsonStr);
+				try {
+					assert.deepStrictEqual(actualDiffingResult, expectedFileDiffResult);
+				} catch (e) {
+					writeFileSync(expectedFilePath, actualJsonStr);
+					throw e;
+				}
+				// Test succeeded with the invalid file, restore expected file from invalid
+				writeFileSync(expectedFilePath, invalidJsonStr);
+				rmSync(invalidFilePath);
 			}
-			const expectedFileDiffResult: DiffingResult = JSON.parse(expectedFileContent);
-
+		} else {
+			const expectedJsonStr = readFileSync(expectedFilePath, 'utf8');
+			const expectedFileDiffResult: DiffingResult = JSON.parse(expectedJsonStr);
 			try {
 				assert.deepStrictEqual(actualDiffingResult, expectedFileDiffResult);
 			} catch (e) {
-				if (!invalidExists) {
-					writeFileSync(invalidFilePath, expectedFileContent);
-				}
-				writeFileSync(expectedFilePath, expectedFileContentFromActual);
+				// Backup expected file
+				writeFileSync(invalidFilePath, expectedJsonStr);
+				// Update expected file
+				writeFileSync(expectedFilePath, actualJsonStr);
 				throw e;
 			}
 		}
-
-		if (invalidExists) {
-			rmSync(invalidFilePath);
-		}
 	}
 
 	for (const folder of folders) {
@@ -85,10 +95,6 @@ suite('diff fixtures', () => {
 			});
 		}
 	}
-
-	test(`debug`, () => {
-		runTest('penalize-fragmentation', 'experimental');
-	});
 });
 
 interface DiffingResult {
diff --git a/src/vs/editor/test/node/diffing/fixtures/method-splitting/experimental.expected.diff.json b/src/vs/editor/test/node/diffing/fixtures/method-splitting/experimental.expected.diff.json
index 170a04318c6168..f79a1b00f3a133 100644
--- a/src/vs/editor/test/node/diffing/fixtures/method-splitting/experimental.expected.diff.json
+++ b/src/vs/editor/test/node/diffing/fixtures/method-splitting/experimental.expected.diff.json
@@ -7,72 +7,16 @@
 			"modifiedRange": "[6,8)",
 			"innerChanges": [
 				{
-					"originalRange": "[6,3 -> 6,6]",
-					"modifiedRange": "[6,3 -> 6,4]"
-				},
-				{
-					"originalRange": "[6,7 -> 6,8]",
-					"modifiedRange": "[6,5 -> 6,9]"
-				},
-				{
-					"originalRange": "[6,9 -> 6,9]",
-					"modifiedRange": "[6,10 -> 6,11]"
+					"originalRange": "[6,3 -> 6,9]",
+					"modifiedRange": "[6,3 -> 6,11]"
 				},
 				{
 					"originalRange": "[6,12 -> 6,18]",
 					"modifiedRange": "[6,14 -> 6,14]"
 				},
 				{
-					"originalRange": "[6,29 -> 6,32]",
-					"modifiedRange": "[6,25 -> 6,26]"
-				},
-				{
-					"originalRange": "[6,33 -> 6,34]",
-					"modifiedRange": "[6,27 -> 6,27]"
-				},
-				{
-					"originalRange": "[6,35 -> 6,35]",
-					"modifiedRange": "[6,28 -> 6,37]"
-				},
-				{
-					"originalRange": "[6,36 -> 6,37]",
-					"modifiedRange": "[6,38 -> 6,39]"
-				},
-				{
-					"originalRange": "[6,38 -> 6,38]",
-					"modifiedRange": "[6,40 -> 6,48]"
-				},
-				{
-					"originalRange": "[6,39 -> 6,39]",
-					"modifiedRange": "[6,49 -> 6,50]"
-				},
-				{
-					"originalRange": "[6,40 -> 6,42]",
-					"modifiedRange": "[6,51 -> 6,68]"
-				},
-				{
-					"originalRange": "[6,43 -> 6,44]",
-					"modifiedRange": "[6,69 -> 6,72]"
-				},
-				{
-					"originalRange": "[6,45 -> 6,45]",
-					"modifiedRange": "[6,73 -> 6,75]"
-				},
-				{
-					"originalRange": "[6,46 -> 6,46]",
-					"modifiedRange": "[6,76 -> 6,82]"
-				},
-				{
-					"originalRange": "[6,48 -> 6,51]",
-					"modifiedRange": "[6,84 -> 6,84]"
-				},
-				{
-					"originalRange": "[6,52 -> 6,52]",
-					"modifiedRange": "[6,85 -> 6,88]"
-				},
-				{
-					"originalRange": "[6,53 -> 6,54]",
-					"modifiedRange": "[6,89 -> 6,91]"
+					"originalRange": "[6,29 -> 6,54]",
+					"modifiedRange": "[6,25 -> 6,91]"
 				},
 				{
 					"originalRange": "[6,58 -> 6,63]",
@@ -83,176 +27,28 @@
 					"modifiedRange": "[6,105 -> 6,118]"
 				},
 				{
-					"originalRange": "[7,9 -> 7,13]",
-					"modifiedRange": "[7,9 -> 7,12]"
-				},
-				{
-					"originalRange": "[7,14 -> 7,18]",
-					"modifiedRange": "[7,13 -> 7,15]"
-				},
-				{
-					"originalRange": "[7,19 -> 7,22]",
-					"modifiedRange": "[7,16 -> 7,19]"
-				},
-				{
-					"originalRange": "[7,23 -> 7,28]",
-					"modifiedRange": "[7,20 -> 7,21]"
-				},
-				{
-					"originalRange": "[7,29 -> 7,29]",
-					"modifiedRange": "[7,22 -> 7,23]"
-				},
-				{
-					"originalRange": "[7,30 -> 7,38]",
-					"modifiedRange": "[7,24 -> 7,27]"
-				},
-				{
-					"originalRange": "[7,64 -> 7,66]",
-					"modifiedRange": "[7,53 -> 7,54]"
-				},
-				{
-					"originalRange": "[7,67 -> 7,69]",
-					"modifiedRange": "[7,55 -> 7,60]"
-				},
-				{
-					"originalRange": "[7,70 -> 7,70]",
-					"modifiedRange": "[7,61 -> 7,62]"
-				},
-				{
-					"originalRange": "[7,71 -> 7,74]",
-					"modifiedRange": "[7,63 -> 7,65]"
-				},
-				{
-					"originalRange": "[7,75 -> 7,80]",
-					"modifiedRange": "[7,66 -> 7,68]"
-				},
-				{
-					"originalRange": "[7,81 -> 7,81]",
-					"modifiedRange": "[7,69 -> 7,71]"
-				},
-				{
-					"originalRange": "[7,82 -> 7,83]",
-					"modifiedRange": "[7,72 -> 7,73]"
-				},
-				{
-					"originalRange": "[7,84 -> 7,85]",
-					"modifiedRange": "[7,74 -> 7,74]"
-				},
-				{
-					"originalRange": "[7,86 -> 7,91]",
-					"modifiedRange": "[7,75 -> 7,78]"
-				},
-				{
-					"originalRange": "[7,92 -> 7,97]",
-					"modifiedRange": "[7,79 -> 7,82]"
-				},
-				{
-					"originalRange": "[7,98 -> 7,98]",
-					"modifiedRange": "[7,83 -> 7,84]"
-				},
-				{
-					"originalRange": "[7,99 -> 7,105]",
-					"modifiedRange": "[7,85 -> 7,85]"
-				},
-				{
-					"originalRange": "[7,112 -> 7,116]",
-					"modifiedRange": "[7,92 -> 7,92]"
-				},
-				{
-					"originalRange": "[7,117 -> 7,119]",
-					"modifiedRange": "[7,93 -> 7,96]"
-				},
-				{
-					"originalRange": "[7,120 -> 7,120]",
-					"modifiedRange": "[7,97 -> 7,104]"
-				},
-				{
-					"originalRange": "[7,121 -> 7,124]",
-					"modifiedRange": "[7,105 -> 7,105]"
-				},
-				{
-					"originalRange": "[7,125 -> 7,130]",
-					"modifiedRange": "[7,106 -> 7,106]"
-				},
-				{
-					"originalRange": "[7,131 -> 7,132]",
-					"modifiedRange": "[7,107 -> 7,108]"
-				},
-				{
-					"originalRange": "[7,133 -> 7,133]",
-					"modifiedRange": "[7,109 -> 7,111]"
-				},
-				{
-					"originalRange": "[7,134 -> 7,137]",
-					"modifiedRange": "[7,112 -> 7,115]"
-				},
-				{
-					"originalRange": "[7,138 -> 7,138]",
-					"modifiedRange": "[7,116 -> 7,117]"
-				},
-				{
-					"originalRange": "[7,139 -> 7,139]",
-					"modifiedRange": "[7,118 -> 7,119]"
-				},
-				{
-					"originalRange": "[7,140 -> 7,141]",
-					"modifiedRange": "[7,120 -> 7,123]"
-				},
-				{
-					"originalRange": "[7,142 -> 7,144]",
-					"modifiedRange": "[7,124 -> 7,126]"
-				},
-				{
-					"originalRange": "[7,145 -> 7,148]",
-					"modifiedRange": "[7,127 -> 7,127]"
-				},
-				{
-					"originalRange": "[7,149 -> 7,149]",
-					"modifiedRange": "[7,128 -> 7,129]"
-				},
-				{
-					"originalRange": "[7,150 -> 8,5]",
-					"modifiedRange": "[7,130 -> 7,130]"
-				},
-				{
-					"originalRange": "[8,6 -> 8,11]",
-					"modifiedRange": "[7,131 -> 7,131]"
-				},
-				{
-					"originalRange": "[8,15 -> 8,21]",
-					"modifiedRange": "[7,135 -> 7,135]"
-				},
-				{
-					"originalRange": "[8,23 -> 8,23]",
-					"modifiedRange": "[7,137 -> 7,142]"
-				},
-				{
-					"originalRange": "[8,29 -> 8,44]",
-					"modifiedRange": "[7,148 -> 7,148]"
-				},
-				{
-					"originalRange": "[8,45 -> 8,45]",
-					"modifiedRange": "[7,149 -> 7,152]"
+					"originalRange": "[7,9 -> 7,38]",
+					"modifiedRange": "[7,9 -> 7,27]"
 				},
 				{
-					"originalRange": "[8,46 -> 8,46]",
-					"modifiedRange": "[7,153 -> 7,160]"
+					"originalRange": "[7,64 -> 7,105]",
+					"modifiedRange": "[7,53 -> 7,85]"
 				},
 				{
-					"originalRange": "[8,48 -> 8,48]",
-					"modifiedRange": "[7,162 -> 7,164]"
+					"originalRange": "[7,112 -> 8,11]",
+					"modifiedRange": "[7,92 -> 7,131]"
 				},
 				{
-					"originalRange": "[8,50 -> 8,51]",
-					"modifiedRange": "[7,166 -> 7,170]"
+					"originalRange": "[8,15 -> 8,23]",
+					"modifiedRange": "[7,135 -> 7,142]"
 				},
 				{
-					"originalRange": "[8,62 -> 8,65]",
-					"modifiedRange": "[7,181 -> 7,182]"
+					"originalRange": "[8,29 -> 8,51]",
+					"modifiedRange": "[7,148 -> 7,170]"
 				},
 				{
-					"originalRange": "[9,1 -> 10,1]",
-					"modifiedRange": "[8,1 -> 8,1]"
+					"originalRange": "[8,62 -> 10,1]",
+					"modifiedRange": "[7,181 -> 8,1]"
 				}
 			]
 		},
diff --git a/src/vs/editor/test/node/diffing/fixtures/minimal-diff-character/experimental.expected.diff.json b/src/vs/editor/test/node/diffing/fixtures/minimal-diff-character/experimental.expected.diff.json
index a0aea479fa4242..430db713be3abc 100644
--- a/src/vs/editor/test/node/diffing/fixtures/minimal-diff-character/experimental.expected.diff.json
+++ b/src/vs/editor/test/node/diffing/fixtures/minimal-diff-character/experimental.expected.diff.json
@@ -17,12 +17,8 @@
 			"modifiedRange": "[5,6)",
 			"innerChanges": [
 				{
-					"originalRange": "[5,2 -> 5,2]",
-					"modifiedRange": "[5,2 -> 5,56]"
-				},
-				{
-					"originalRange": "[5,4 -> 5,4]",
-					"modifiedRange": "[5,58 -> 5,61]"
+					"originalRange": "[5,2 -> 5,4]",
+					"modifiedRange": "[5,2 -> 5,61]"
 				}
 			]
 		}
diff --git a/src/vs/editor/test/node/diffing/fixtures/penalize-fragmentation/experimental.expected.diff.json b/src/vs/editor/test/node/diffing/fixtures/penalize-fragmentation/experimental.expected.diff.json
index 5d48723b5c5621..c0ce019463b271 100644
--- a/src/vs/editor/test/node/diffing/fixtures/penalize-fragmentation/experimental.expected.diff.json
+++ b/src/vs/editor/test/node/diffing/fixtures/penalize-fragmentation/experimental.expected.diff.json
@@ -7,40 +7,12 @@
 			"modifiedRange": "[1,3)",
 			"innerChanges": [
 				{
-					"originalRange": "[1,11 -> 1,14]",
-					"modifiedRange": "[1,11 -> 1,17]"
+					"originalRange": "[1,1 -> 1,1]",
+					"modifiedRange": "[1,1 -> 2,1]"
 				},
 				{
-					"originalRange": "[1,15 -> 1,20]",
-					"modifiedRange": "[1,18 -> 1,19]"
-				},
-				{
-					"originalRange": "[1,24 -> 1,25]",
-					"modifiedRange": "[1,23 -> 1,25]"
-				},
-				{
-					"originalRange": "[1,26 -> 1,27]",
-					"modifiedRange": "[1,26 -> 1,32]"
-				},
-				{
-					"originalRange": "[1,28 -> 1,31]",
-					"modifiedRange": "[1,33 -> 1,33]"
-				},
-				{
-					"originalRange": "[1,35 -> 1,36]",
-					"modifiedRange": "[1,37 -> 1,50]"
-				},
-				{
-					"originalRange": "[1,37 -> 1,38]",
-					"modifiedRange": "[1,51 -> 1,72]"
-				},
-				{
-					"originalRange": "[1,39 -> 1,40]",
-					"modifiedRange": "[1,73 -> 2,6]"
-				},
-				{
-					"originalRange": "[1,42 -> 1,42]",
-					"modifiedRange": "[2,8 -> 2,18]"
+					"originalRange": "[1,17 -> 1,41]",
+					"modifiedRange": "[2,17 -> 2,17]"
 				},
 				{
 					"originalRange": "[1,72 -> 1,73]",
diff --git a/src/vs/editor/test/node/diffing/fixtures/random-match-1/1.tst b/src/vs/editor/test/node/diffing/fixtures/random-match-1/1.tst
new file mode 100644
index 00000000000000..27318eeb81d9b3
--- /dev/null
+++ b/src/vs/editor/test/node/diffing/fixtures/random-match-1/1.tst
@@ -0,0 +1 @@
+const sourceActions = notebookKernelService.getSourceActions(notebook, editor.scopedContextKeyService);
diff --git a/src/vs/editor/test/node/diffing/fixtures/random-match-1/2.tst b/src/vs/editor/test/node/diffing/fixtures/random-match-1/2.tst
new file mode 100644
index 00000000000000..fb41c27499f953
--- /dev/null
+++ b/src/vs/editor/test/node/diffing/fixtures/random-match-1/2.tst
@@ -0,0 +1 @@
+const sourceActions = notebookKernelService.getSourceActions(notebookTextModel, scopedContextKeyService);
diff --git a/src/vs/editor/test/node/diffing/fixtures/random-match-1/experimental.expected.diff.json b/src/vs/editor/test/node/diffing/fixtures/random-match-1/experimental.expected.diff.json
new file mode 100644
index 00000000000000..753a7c75cbc295
--- /dev/null
+++ b/src/vs/editor/test/node/diffing/fixtures/random-match-1/experimental.expected.diff.json
@@ -0,0 +1,16 @@
+{
+	"originalFileName": "./1.tst",
+	"modifiedFileName": "./2.tst",
+	"diffs": [
+		{
+			"originalRange": "[1,2)",
+			"modifiedRange": "[1,2)",
+			"innerChanges": [
+				{
+					"originalRange": "[1,70 -> 1,79]",
+					"modifiedRange": "[1,70 -> 1,81]"
+				}
+			]
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/vs/editor/test/node/diffing/fixtures/random-match-1/smart.expected.diff.json b/src/vs/editor/test/node/diffing/fixtures/random-match-1/smart.expected.diff.json
new file mode 100644
index 00000000000000..753a7c75cbc295
--- /dev/null
+++ b/src/vs/editor/test/node/diffing/fixtures/random-match-1/smart.expected.diff.json
@@ -0,0 +1,16 @@
+{
+	"originalFileName": "./1.tst",
+	"modifiedFileName": "./2.tst",
+	"diffs": [
+		{
+			"originalRange": "[1,2)",
+			"modifiedRange": "[1,2)",
+			"innerChanges": [
+				{
+					"originalRange": "[1,70 -> 1,79]",
+					"modifiedRange": "[1,70 -> 1,81]"
+				}
+			]
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/vs/editor/test/node/diffing/fixtures/random-match-2/1.tst b/src/vs/editor/test/node/diffing/fixtures/random-match-2/1.tst
new file mode 100644
index 00000000000000..2e78ff135e7bfc
--- /dev/null
+++ b/src/vs/editor/test/node/diffing/fixtures/random-match-2/1.tst
@@ -0,0 +1,7 @@
+if (!all.length && !sourceActions.length) {
+	const activeNotebookModel = getNotebookEditorFromEditorPane(editorService.activeEditorPane)?.textModel;
+	if (activeNotebookModel) {
+		const language = this.getSuggestedLanguage(activeNotebookModel);
+		suggestedExtension = language ? this.getSuggestedKernelFromLanguage(activeNotebookModel.viewType, language) : undefined;
+	}
+	if (suggestedExtension) {
diff --git a/src/vs/editor/test/node/diffing/fixtures/random-match-2/2.tst b/src/vs/editor/test/node/diffing/fixtures/random-match-2/2.tst
new file mode 100644
index 00000000000000..5a079679cf22ba
--- /dev/null
+++ b/src/vs/editor/test/node/diffing/fixtures/random-match-2/2.tst
@@ -0,0 +1,4 @@
+if (!all.length && !sourceActions.length) {
+	const language = this.getSuggestedLanguage(notebookTextModel);
+	suggestedExtension = language ? this.getSuggestedKernelFromLanguage(notebookTextModel.viewType, language) : undefined;
+	if (suggestedExtension) {
diff --git a/src/vs/editor/test/node/diffing/fixtures/random-match-2/experimental.expected.diff.json b/src/vs/editor/test/node/diffing/fixtures/random-match-2/experimental.expected.diff.json
new file mode 100644
index 00000000000000..6b84b4c6209f2b
--- /dev/null
+++ b/src/vs/editor/test/node/diffing/fixtures/random-match-2/experimental.expected.diff.json
@@ -0,0 +1,40 @@
+{
+	"originalFileName": "./1.tst",
+	"modifiedFileName": "./2.tst",
+	"diffs": [
+		{
+			"originalRange": "[2,7)",
+			"modifiedRange": "[2,4)",
+			"innerChanges": [
+				{
+					"originalRange": "[2,8 -> 4,11]",
+					"modifiedRange": "[2,8 -> 2,10]"
+				},
+				{
+					"originalRange": "[4,46 -> 4,53]",
+					"modifiedRange": "[2,45 -> 2,46]"
+				},
+				{
+					"originalRange": "[4,60 -> 4,60]",
+					"modifiedRange": "[2,53 -> 2,57]"
+				},
+				{
+					"originalRange": "[5,1 -> 5,2]",
+					"modifiedRange": "[3,1 -> 3,1]"
+				},
+				{
+					"originalRange": "[5,71 -> 5,78]",
+					"modifiedRange": "[3,70 -> 3,71]"
+				},
+				{
+					"originalRange": "[5,85 -> 5,85]",
+					"modifiedRange": "[3,78 -> 3,82]"
+				},
+				{
+					"originalRange": "[6,1 -> 7,1]",
+					"modifiedRange": "[4,1 -> 4,1]"
+				}
+			]
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/vs/editor/test/node/diffing/fixtures/random-match-2/smart.expected.diff.json b/src/vs/editor/test/node/diffing/fixtures/random-match-2/smart.expected.diff.json
new file mode 100644
index 00000000000000..d727a596dd4c42
--- /dev/null
+++ b/src/vs/editor/test/node/diffing/fixtures/random-match-2/smart.expected.diff.json
@@ -0,0 +1,40 @@
+{
+	"originalFileName": "./1.tst",
+	"modifiedFileName": "./2.tst",
+	"diffs": [
+		{
+			"originalRange": "[2,7)",
+			"modifiedRange": "[2,4)",
+			"innerChanges": [
+				{
+					"originalRange": "[2,1 -> 4,2]",
+					"modifiedRange": "[2,1 -> 2,1]"
+				},
+				{
+					"originalRange": "[4,46 -> 4,53]",
+					"modifiedRange": "[2,45 -> 2,46]"
+				},
+				{
+					"originalRange": "[4,60 -> 4,60]",
+					"modifiedRange": "[2,53 -> 2,57]"
+				},
+				{
+					"originalRange": "[5,2 -> 5,3]",
+					"modifiedRange": "[3,2 -> 3,2]"
+				},
+				{
+					"originalRange": "[5,71 -> 5,78]",
+					"modifiedRange": "[3,70 -> 3,71]"
+				},
+				{
+					"originalRange": "[5,85 -> 5,85]",
+					"modifiedRange": "[3,78 -> 3,82]"
+				},
+				{
+					"originalRange": "[5,123 -> 6,3]",
+					"modifiedRange": "[3,120 -> 3,120]"
+				}
+			]
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/vs/editor/test/node/diffing/fixtures/random-match-3/1.tst b/src/vs/editor/test/node/diffing/fixtures/random-match-3/1.tst
new file mode 100644
index 00000000000000..9e71f27c23af47
--- /dev/null
+++ b/src/vs/editor/test/node/diffing/fixtures/random-match-3/1.tst
@@ -0,0 +1 @@
+const { selected, all, suggestions, hidden } = notebookKernelService.getMatchingKernel(notebook);
diff --git a/src/vs/editor/test/node/diffing/fixtures/random-match-3/2.tst b/src/vs/editor/test/node/diffing/fixtures/random-match-3/2.tst
new file mode 100644
index 00000000000000..fed378e62009c3
--- /dev/null
+++ b/src/vs/editor/test/node/diffing/fixtures/random-match-3/2.tst
@@ -0,0 +1,3 @@
+const scopedContextKeyService = editor.scopedContextKeyService;
+const matchResult = notebookKernelService.getMatchingKernel(notebook);
+const { selected, all } = matchResult;
diff --git a/src/vs/editor/test/node/diffing/fixtures/random-match-3/experimental.expected.diff.json b/src/vs/editor/test/node/diffing/fixtures/random-match-3/experimental.expected.diff.json
new file mode 100644
index 00000000000000..5c70300bec81e0
--- /dev/null
+++ b/src/vs/editor/test/node/diffing/fixtures/random-match-3/experimental.expected.diff.json
@@ -0,0 +1,24 @@
+{
+	"originalFileName": "./1.tst",
+	"modifiedFileName": "./2.tst",
+	"diffs": [
+		{
+			"originalRange": "[1,2)",
+			"modifiedRange": "[1,4)",
+			"innerChanges": [
+				{
+					"originalRange": "[1,6 -> 1,32]",
+					"modifiedRange": "[1,6 -> 2,2]"
+				},
+				{
+					"originalRange": "[1,35 -> 1,45]",
+					"modifiedRange": "[2,5 -> 2,18]"
+				},
+				{
+					"originalRange": "[2,1 -> 2,1]",
+					"modifiedRange": "[3,1 -> 4,1]"
+				}
+			]
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/vs/editor/test/node/diffing/fixtures/random-match-3/smart.expected.diff.json b/src/vs/editor/test/node/diffing/fixtures/random-match-3/smart.expected.diff.json
new file mode 100644
index 00000000000000..f5d18c303e1e02
--- /dev/null
+++ b/src/vs/editor/test/node/diffing/fixtures/random-match-3/smart.expected.diff.json
@@ -0,0 +1,24 @@
+{
+	"originalFileName": "./1.tst",
+	"modifiedFileName": "./2.tst",
+	"diffs": [
+		{
+			"originalRange": "[1,2)",
+			"modifiedRange": "[1,4)",
+			"innerChanges": [
+				{
+					"originalRange": "[1,7 -> 1,32]",
+					"modifiedRange": "[1,7 -> 2,2]"
+				},
+				{
+					"originalRange": "[1,35 -> 1,45]",
+					"modifiedRange": "[2,5 -> 2,18]"
+				},
+				{
+					"originalRange": "[1,98 -> 1,98]",
+					"modifiedRange": "[2,71 -> 3,39]"
+				}
+			]
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/vs/editor/test/node/diffing/fixtures/ts-confusing-2/experimental.expected.diff.json b/src/vs/editor/test/node/diffing/fixtures/ts-confusing-2/experimental.expected.diff.json
index ac20b09d1e5991..37bf0534f874df 100644
--- a/src/vs/editor/test/node/diffing/fixtures/ts-confusing-2/experimental.expected.diff.json
+++ b/src/vs/editor/test/node/diffing/fixtures/ts-confusing-2/experimental.expected.diff.json
@@ -17,28 +17,8 @@
 			"modifiedRange": "[4,5)",
 			"innerChanges": [
 				{
-					"originalRange": "[4,69 -> 4,69]",
-					"modifiedRange": "[4,69 -> 4,72]"
-				},
-				{
-					"originalRange": "[4,70 -> 4,71]",
-					"modifiedRange": "[4,73 -> 4,74]"
-				},
-				{
-					"originalRange": "[4,72 -> 4,84]",
-					"modifiedRange": "[4,75 -> 4,75]"
-				},
-				{
-					"originalRange": "[4,85 -> 4,89]",
-					"modifiedRange": "[4,76 -> 4,76]"
-				},
-				{
-					"originalRange": "[4,91 -> 4,95]",
-					"modifiedRange": "[4,78 -> 4,82]"
-				},
-				{
-					"originalRange": "[4,96 -> 4,103]",
-					"modifiedRange": "[4,83 -> 4,88]"
+					"originalRange": "[4,69 -> 4,103]",
+					"modifiedRange": "[4,69 -> 4,88]"
 				},
 				{
 					"originalRange": "[4,109 -> 4,110]",
@@ -55,16 +35,8 @@
 			"modifiedRange": "[11,12)",
 			"innerChanges": [
 				{
-					"originalRange": "[11,61 -> 11,87]",
-					"modifiedRange": "[11,61 -> 11,61]"
-				},
-				{
-					"originalRange": "[11,88 -> 11,89]",
-					"modifiedRange": "[11,62 -> 11,62]"
-				},
-				{
-					"originalRange": "[11,90 -> 11,93]",
-					"modifiedRange": "[11,63 -> 11,63]"
+					"originalRange": "[11,61 -> 11,93]",
+					"modifiedRange": "[11,61 -> 11,63]"
 				},
 				{
 					"originalRange": "[11,97 -> 11,101]",
@@ -77,68 +49,12 @@
 			"modifiedRange": "[14,18)",
 			"innerChanges": [
 				{
-					"originalRange": "[14,120 -> 14,120]",
-					"modifiedRange": "[14,120 -> 14,123]"
-				},
-				{
-					"originalRange": "[14,121 -> 14,123]",
-					"modifiedRange": "[14,124 -> 14,124]"
-				},
-				{
-					"originalRange": "[14,124 -> 14,125]",
-					"modifiedRange": "[14,125 -> 14,133]"
-				},
-				{
-					"originalRange": "[14,126 -> 14,128]",
-					"modifiedRange": "[14,134 -> 14,136]"
-				},
-				{
-					"originalRange": "[14,129 -> 14,129]",
-					"modifiedRange": "[14,137 -> 14,141]"
+					"originalRange": "[14,120 -> 14,154]",
+					"modifiedRange": "[14,120 -> 14,162]"
 				},
 				{
-					"originalRange": "[14,130 -> 14,133]",
-					"modifiedRange": "[14,142 -> 14,144]"
-				},
-				{
-					"originalRange": "[14,135 -> 14,136]",
-					"modifiedRange": "[14,146 -> 14,148]"
-				},
-				{
-					"originalRange": "[14,137 -> 14,143]",
-					"modifiedRange": "[14,149 -> 14,151]"
-				},
-				{
-					"originalRange": "[14,144 -> 14,148]",
-					"modifiedRange": "[14,152 -> 14,152]"
-				},
-				{
-					"originalRange": "[14,149 -> 14,150]",
-					"modifiedRange": "[14,153 -> 14,156]"
-				},
-				{
-					"originalRange": "[14,151 -> 14,154]",
-					"modifiedRange": "[14,157 -> 14,162]"
-				},
-				{
-					"originalRange": "[14,165 -> 14,168]",
-					"modifiedRange": "[14,173 -> 14,174]"
-				},
-				{
-					"originalRange": "[14,169 -> 14,170]",
-					"modifiedRange": "[14,175 -> 14,179]"
-				},
-				{
-					"originalRange": "[14,171 -> 14,171]",
-					"modifiedRange": "[14,180 -> 16,5]"
-				},
-				{
-					"originalRange": "[14,172 -> 14,176]",
-					"modifiedRange": "[16,6 -> 16,17]"
-				},
-				{
-					"originalRange": "[14,177 -> 14,178]",
-					"modifiedRange": "[16,18 -> 16,22]"
+					"originalRange": "[14,165 -> 14,178]",
+					"modifiedRange": "[14,173 -> 16,22]"
 				},
 				{
 					"originalRange": "[14,181 -> 14,181]",
@@ -149,40 +65,8 @@
 					"modifiedRange": "[16,40 -> 16,47]"
 				},
 				{
-					"originalRange": "[14,196 -> 14,198]",
-					"modifiedRange": "[16,51 -> 16,51]"
-				},
-				{
-					"originalRange": "[14,199 -> 14,200]",
-					"modifiedRange": "[16,52 -> 16,58]"
-				},
-				{
-					"originalRange": "[14,201 -> 14,201]",
-					"modifiedRange": "[16,59 -> 16,63]"
-				},
-				{
-					"originalRange": "[14,202 -> 14,202]",
-					"modifiedRange": "[16,64 -> 16,66]"
-				},
-				{
-					"originalRange": "[14,203 -> 14,204]",
-					"modifiedRange": "[16,67 -> 16,70]"
-				},
-				{
-					"originalRange": "[14,205 -> 14,205]",
-					"modifiedRange": "[16,71 -> 16,80]"
-				},
-				{
-					"originalRange": "[14,206 -> 14,207]",
-					"modifiedRange": "[16,81 -> 16,83]"
-				},
-				{
-					"originalRange": "[14,208 -> 14,208]",
-					"modifiedRange": "[16,84 -> 16,118]"
-				},
-				{
-					"originalRange": "[14,210 -> 14,211]",
-					"modifiedRange": "[16,120 -> 17,1]"
+					"originalRange": "[14,196 -> 14,211]",
+					"modifiedRange": "[16,51 -> 17,1]"
 				}
 			]
 		},
@@ -215,164 +99,16 @@
 					"modifiedRange": "[21,74 -> 22,1]"
 				},
 				{
-					"originalRange": "[18,3 -> 18,4]",
-					"modifiedRange": "[23,3 -> 23,6]"
-				},
-				{
-					"originalRange": "[18,5 -> 18,9]",
-					"modifiedRange": "[23,7 -> 23,10]"
-				},
-				{
-					"originalRange": "[18,10 -> 18,15]",
-					"modifiedRange": "[23,11 -> 23,13]"
-				},
-				{
-					"originalRange": "[18,16 -> 18,19]",
-					"modifiedRange": "[23,14 -> 23,16]"
-				},
-				{
-					"originalRange": "[18,20 -> 18,29]",
-					"modifiedRange": "[23,17 -> 23,20]"
-				},
-				{
-					"originalRange": "[18,30 -> 18,31]",
-					"modifiedRange": "[23,21 -> 23,22]"
-				},
-				{
-					"originalRange": "[18,32 -> 18,33]",
-					"modifiedRange": "[23,23 -> 23,23]"
-				},
-				{
-					"originalRange": "[18,34 -> 19,4]",
-					"modifiedRange": "[23,24 -> 23,24]"
-				},
-				{
-					"originalRange": "[19,5 -> 19,7]",
-					"modifiedRange": "[23,25 -> 23,25]"
-				},
-				{
-					"originalRange": "[19,9 -> 19,13]",
-					"modifiedRange": "[23,27 -> 23,27]"
-				},
-				{
-					"originalRange": "[19,14 -> 19,17]",
-					"modifiedRange": "[23,28 -> 23,29]"
-				},
-				{
-					"originalRange": "[19,18 -> 19,26]",
-					"modifiedRange": "[23,30 -> 23,30]"
+					"originalRange": "[18,3 -> 19,26]",
+					"modifiedRange": "[23,3 -> 23,30]"
 				},
 				{
 					"originalRange": "[19,32 -> 19,32]",
 					"modifiedRange": "[23,36 -> 23,56]"
 				},
 				{
-					"originalRange": "[19,35 -> 20,4]",
-					"modifiedRange": "[23,59 -> 23,61]"
-				},
-				{
-					"originalRange": "[20,5 -> 20,6]",
-					"modifiedRange": "[23,62 -> 23,65]"
-				},
-				{
-					"originalRange": "[20,7 -> 20,9]",
-					"modifiedRange": "[23,66 -> 23,66]"
-				},
-				{
-					"originalRange": "[20,10 -> 20,15]",
-					"modifiedRange": "[23,67 -> 23,67]"
-				},
-				{
-					"originalRange": "[20,16 -> 20,17]",
-					"modifiedRange": "[23,68 -> 23,71]"
-				},
-				{
-					"originalRange": "[20,18 -> 20,24]",
-					"modifiedRange": "[23,72 -> 23,72]"
-				},
-				{
-					"originalRange": "[20,25 -> 20,29]",
-					"modifiedRange": "[23,73 -> 23,75]"
-				},
-				{
-					"originalRange": "[20,30 -> 20,32]",
-					"modifiedRange": "[23,76 -> 23,78]"
-				},
-				{
-					"originalRange": "[20,33 -> 20,35]",
-					"modifiedRange": "[23,79 -> 23,83]"
-				},
-				{
-					"originalRange": "[20,36 -> 20,39]",
-					"modifiedRange": "[23,84 -> 23,84]"
-				},
-				{
-					"originalRange": "[20,41 -> 20,44]",
-					"modifiedRange": "[23,86 -> 23,87]"
-				},
-				{
-					"originalRange": "[20,45 -> 20,49]",
-					"modifiedRange": "[23,88 -> 23,89]"
-				},
-				{
-					"originalRange": "[20,50 -> 20,51]",
-					"modifiedRange": "[23,90 -> 23,92]"
-				},
-				{
-					"originalRange": "[20,52 -> 21,6]",
-					"modifiedRange": "[23,93 -> 23,96]"
-				},
-				{
-					"originalRange": "[21,7 -> 21,9]",
-					"modifiedRange": "[23,97 -> 23,97]"
-				},
-				{
-					"originalRange": "[21,10 -> 21,13]",
-					"modifiedRange": "[23,98 -> 23,98]"
-				},
-				{
-					"originalRange": "[21,14 -> 21,25]",
-					"modifiedRange": "[23,99 -> 23,101]"
-				},
-				{
-					"originalRange": "[21,26 -> 22,4]",
-					"modifiedRange": "[23,102 -> 23,102]"
-				},
-				{
-					"originalRange": "[22,5 -> 22,8]",
-					"modifiedRange": "[23,103 -> 23,103]"
-				},
-				{
-					"originalRange": "[22,9 -> 22,15]",
-					"modifiedRange": "[23,104 -> 23,107]"
-				},
-				{
-					"originalRange": "[22,16 -> 22,18]",
-					"modifiedRange": "[23,108 -> 23,110]"
-				},
-				{
-					"originalRange": "[22,19 -> 22,21]",
-					"modifiedRange": "[23,111 -> 23,111]"
-				},
-				{
-					"originalRange": "[22,22 -> 22,26]",
-					"modifiedRange": "[23,112 -> 23,112]"
-				},
-				{
-					"originalRange": "[22,27 -> 22,32]",
-					"modifiedRange": "[23,113 -> 23,113]"
-				},
-				{
-					"originalRange": "[22,33 -> 22,36]",
-					"modifiedRange": "[23,114 -> 23,115]"
-				},
-				{
-					"originalRange": "[22,37 -> 22,41]",
-					"modifiedRange": "[23,116 -> 23,117]"
-				},
-				{
-					"originalRange": "[22,42 -> 23,4]",
-					"modifiedRange": "[23,118 -> 23,120]"
+					"originalRange": "[19,35 -> 23,4]",
+					"modifiedRange": "[23,59 -> 23,120]"
 				}
 			]
 		},
@@ -399,108 +135,20 @@
 					"modifiedRange": "[27,15 -> 27,16]"
 				},
 				{
-					"originalRange": "[29,4 -> 29,7]",
-					"modifiedRange": "[28,4 -> 28,7]"
-				},
-				{
-					"originalRange": "[29,8 -> 29,8]",
-					"modifiedRange": "[28,8 -> 28,18]"
-				},
-				{
-					"originalRange": "[29,9 -> 29,10]",
-					"modifiedRange": "[28,19 -> 28,20]"
-				},
-				{
-					"originalRange": "[29,11 -> 29,11]",
-					"modifiedRange": "[28,21 -> 28,47]"
-				},
-				{
-					"originalRange": "[29,13 -> 29,14]",
-					"modifiedRange": "[28,49 -> 28,71]"
-				},
-				{
-					"originalRange": "[29,15 -> 29,15]",
-					"modifiedRange": "[28,72 -> 28,76]"
-				},
-				{
-					"originalRange": "[29,16 -> 29,16]",
-					"modifiedRange": "[28,77 -> 28,90]"
-				},
-				{
-					"originalRange": "[29,17 -> 29,17]",
-					"modifiedRange": "[28,91 -> 28,94]"
-				},
-				{
-					"originalRange": "[29,18 -> 29,18]",
-					"modifiedRange": "[28,95 -> 28,124]"
-				},
-				{
-					"originalRange": "[29,19 -> 29,19]",
-					"modifiedRange": "[28,125 -> 28,129]"
-				},
-				{
-					"originalRange": "[29,20 -> 29,20]",
-					"modifiedRange": "[28,130 -> 28,134]"
-				},
-				{
-					"originalRange": "[29,21 -> 29,21]",
-					"modifiedRange": "[28,135 -> 28,176]"
-				},
-				{
-					"originalRange": "[29,22 -> 29,22]",
-					"modifiedRange": "[28,177 -> 29,13]"
-				},
-				{
-					"originalRange": "[29,24 -> 29,24]",
-					"modifiedRange": "[29,15 -> 29,36]"
+					"originalRange": "[29,4 -> 29,24]",
+					"modifiedRange": "[28,4 -> 29,36]"
 				},
 				{
 					"originalRange": "[30,4 -> 30,6]",
 					"modifiedRange": "[30,4 -> 30,16]"
 				},
 				{
-					"originalRange": "[30,10 -> 30,10]",
-					"modifiedRange": "[30,20 -> 30,21]"
-				},
-				{
-					"originalRange": "[30,11 -> 30,13]",
-					"modifiedRange": "[30,22 -> 31,23]"
-				},
-				{
-					"originalRange": "[30,14 -> 30,14]",
-					"modifiedRange": "[31,24 -> 33,10]"
-				},
-				{
-					"originalRange": "[30,16 -> 30,17]",
-					"modifiedRange": "[33,12 -> 33,15]"
-				},
-				{
-					"originalRange": "[30,18 -> 30,18]",
-					"modifiedRange": "[33,16 -> 33,19]"
-				},
-				{
-					"originalRange": "[30,19 -> 30,19]",
-					"modifiedRange": "[33,20 -> 33,21]"
-				},
-				{
-					"originalRange": "[30,20 -> 30,22]",
-					"modifiedRange": "[33,22 -> 33,22]"
-				},
-				{
-					"originalRange": "[30,23 -> 30,23]",
-					"modifiedRange": "[33,23 -> 34,6]"
-				},
-				{
-					"originalRange": "[30,24 -> 30,26]",
-					"modifiedRange": "[34,7 -> 34,16]"
-				},
-				{
-					"originalRange": "[30,30 -> 30,30]",
-					"modifiedRange": "[34,20 -> 34,21]"
+					"originalRange": "[30,10 -> 30,26]",
+					"modifiedRange": "[30,20 -> 34,16]"
 				},
 				{
-					"originalRange": "[30,31 -> 30,31]",
-					"modifiedRange": "[34,22 -> 37,9]"
+					"originalRange": "[30,30 -> 30,31]",
+					"modifiedRange": "[34,20 -> 37,9]"
 				}
 			]
 		}
diff --git a/src/vs/editor/test/node/diffing/fixtures/ts-confusing/experimental.expected.diff.json b/src/vs/editor/test/node/diffing/fixtures/ts-confusing/experimental.expected.diff.json
index ecd6a96cfcbeb8..0845c2f7fe075d 100644
--- a/src/vs/editor/test/node/diffing/fixtures/ts-confusing/experimental.expected.diff.json
+++ b/src/vs/editor/test/node/diffing/fixtures/ts-confusing/experimental.expected.diff.json
@@ -17,40 +17,12 @@
 			"modifiedRange": "[10,12)",
 			"innerChanges": [
 				{
-					"originalRange": "[10,11 -> 10,14]",
-					"modifiedRange": "[10,11 -> 10,17]"
+					"originalRange": "[10,1 -> 10,1]",
+					"modifiedRange": "[10,1 -> 11,1]"
 				},
 				{
-					"originalRange": "[10,15 -> 10,20]",
-					"modifiedRange": "[10,18 -> 10,19]"
-				},
-				{
-					"originalRange": "[10,24 -> 10,25]",
-					"modifiedRange": "[10,23 -> 10,25]"
-				},
-				{
-					"originalRange": "[10,26 -> 10,27]",
-					"modifiedRange": "[10,26 -> 10,32]"
-				},
-				{
-					"originalRange": "[10,28 -> 10,31]",
-					"modifiedRange": "[10,33 -> 10,33]"
-				},
-				{
-					"originalRange": "[10,35 -> 10,36]",
-					"modifiedRange": "[10,37 -> 10,50]"
-				},
-				{
-					"originalRange": "[10,37 -> 10,38]",
-					"modifiedRange": "[10,51 -> 10,72]"
-				},
-				{
-					"originalRange": "[10,39 -> 10,40]",
-					"modifiedRange": "[10,73 -> 11,6]"
-				},
-				{
-					"originalRange": "[10,42 -> 10,42]",
-					"modifiedRange": "[11,8 -> 11,18]"
+					"originalRange": "[10,17 -> 10,41]",
+					"modifiedRange": "[11,17 -> 11,17]"
 				},
 				{
 					"originalRange": "[10,72 -> 10,73]",
@@ -63,44 +35,8 @@
 			"modifiedRange": "[19,20)",
 			"innerChanges": [
 				{
-					"originalRange": "[18,50 -> 18,50]",
-					"modifiedRange": "[19,50 -> 19,53]"
-				},
-				{
-					"originalRange": "[18,51 -> 18,52]",
-					"modifiedRange": "[19,54 -> 19,55]"
-				},
-				{
-					"originalRange": "[18,53 -> 18,65]",
-					"modifiedRange": "[19,56 -> 19,56]"
-				},
-				{
-					"originalRange": "[18,66 -> 18,70]",
-					"modifiedRange": "[19,57 -> 19,57]"
-				},
-				{
-					"originalRange": "[18,72 -> 18,73]",
-					"modifiedRange": "[19,59 -> 19,61]"
-				},
-				{
-					"originalRange": "[18,74 -> 18,76]",
-					"modifiedRange": "[19,62 -> 19,65]"
-				},
-				{
-					"originalRange": "[18,77 -> 18,78]",
-					"modifiedRange": "[19,66 -> 19,66]"
-				},
-				{
-					"originalRange": "[18,79 -> 18,85]",
-					"modifiedRange": "[19,67 -> 19,74]"
-				},
-				{
-					"originalRange": "[18,86 -> 18,87]",
-					"modifiedRange": "[19,75 -> 19,81]"
-				},
-				{
-					"originalRange": "[18,88 -> 18,91]",
-					"modifiedRange": "[19,82 -> 19,82]"
+					"originalRange": "[18,50 -> 18,91]",
+					"modifiedRange": "[19,50 -> 19,82]"
 				},
 				{
 					"originalRange": "[18,95 -> 18,107]",
diff --git a/src/vs/editor/test/node/diffing/fixtures/ts-example1/experimental.expected.diff.json b/src/vs/editor/test/node/diffing/fixtures/ts-example1/experimental.expected.diff.json
index efeb5e19806883..d55f8972311377 100644
--- a/src/vs/editor/test/node/diffing/fixtures/ts-example1/experimental.expected.diff.json
+++ b/src/vs/editor/test/node/diffing/fixtures/ts-example1/experimental.expected.diff.json
@@ -25,200 +25,20 @@
 			"modifiedRange": "[17,80)",
 			"innerChanges": [
 				{
-					"originalRange": "[13,10 -> 13,11]",
-					"modifiedRange": "[17,10 -> 17,20]"
+					"originalRange": "[13,10 -> 13,20]",
+					"modifiedRange": "[17,10 -> 21,62]"
 				},
 				{
-					"originalRange": "[13,12 -> 13,12]",
-					"modifiedRange": "[17,21 -> 17,26]"
+					"originalRange": "[13,25 -> 13,41]",
+					"modifiedRange": "[21,67 -> 35,18]"
 				},
 				{
-					"originalRange": "[13,13 -> 13,13]",
-					"modifiedRange": "[17,27 -> 17,61]"
+					"originalRange": "[14,2 -> 14,3]",
+					"modifiedRange": "[36,2 -> 39,3]"
 				},
 				{
-					"originalRange": "[13,14 -> 13,14]",
-					"modifiedRange": "[17,62 -> 19,5]"
-				},
-				{
-					"originalRange": "[13,15 -> 13,15]",
-					"modifiedRange": "[19,6 -> 19,34]"
-				},
-				{
-					"originalRange": "[13,16 -> 13,16]",
-					"modifiedRange": "[19,35 -> 20,8]"
-				},
-				{
-					"originalRange": "[13,17 -> 13,18]",
-					"modifiedRange": "[20,9 -> 21,18]"
-				},
-				{
-					"originalRange": "[13,20 -> 13,20]",
-					"modifiedRange": "[21,20 -> 21,62]"
-				},
-				{
-					"originalRange": "[13,25 -> 13,25]",
-					"modifiedRange": "[21,67 -> 21,74]"
-				},
-				{
-					"originalRange": "[13,26 -> 13,26]",
-					"modifiedRange": "[21,75 -> 26,19]"
-				},
-				{
-					"originalRange": "[13,28 -> 13,29]",
-					"modifiedRange": "[26,21 -> 27,37]"
-				},
-				{
-					"originalRange": "[13,30 -> 13,30]",
-					"modifiedRange": "[27,38 -> 28,12]"
-				},
-				{
-					"originalRange": "[13,31 -> 13,31]",
-					"modifiedRange": "[28,13 -> 29,3]"
-				},
-				{
-					"originalRange": "[13,32 -> 13,32]",
-					"modifiedRange": "[29,4 -> 29,6]"
-				},
-				{
-					"originalRange": "[13,33 -> 13,33]",
-					"modifiedRange": "[29,7 -> 30,6]"
-				},
-				{
-					"originalRange": "[13,35 -> 13,37]",
-					"modifiedRange": "[30,8 -> 31,4]"
-				},
-				{
-					"originalRange": "[13,38 -> 13,38]",
-					"modifiedRange": "[31,5 -> 31,6]"
-				},
-				{
-					"originalRange": "[13,39 -> 13,39]",
-					"modifiedRange": "[31,7 -> 31,10]"
-				},
-				{
-					"originalRange": "[13,40 -> 13,40]",
-					"modifiedRange": "[31,11 -> 34,50]"
-				},
-				{
-					"originalRange": "[13,41 -> 13,41]",
-					"modifiedRange": "[34,51 -> 35,18]"
-				},
-				{
-					"originalRange": "[14,2 -> 14,2]",
-					"modifiedRange": "[36,2 -> 36,7]"
-				},
-				{
-					"originalRange": "[14,3 -> 14,3]",
-					"modifiedRange": "[36,8 -> 39,3]"
-				},
-				{
-					"originalRange": "[14,13 -> 14,14]",
-					"modifiedRange": "[39,13 -> 40,4]"
-				},
-				{
-					"originalRange": "[14,15 -> 14,15]",
-					"modifiedRange": "[40,5 -> 40,16]"
-				},
-				{
-					"originalRange": "[14,16 -> 14,16]",
-					"modifiedRange": "[40,17 -> 42,3]"
-				},
-				{
-					"originalRange": "[14,17 -> 14,17]",
-					"modifiedRange": "[42,4 -> 42,6]"
-				},
-				{
-					"originalRange": "[14,18 -> 14,18]",
-					"modifiedRange": "[42,7 -> 44,12]"
-				},
-				{
-					"originalRange": "[14,19 -> 14,19]",
-					"modifiedRange": "[44,13 -> 48,21]"
-				},
-				{
-					"originalRange": "[14,20 -> 14,20]",
-					"modifiedRange": "[48,22 -> 48,28]"
-				},
-				{
-					"originalRange": "[14,21 -> 14,21]",
-					"modifiedRange": "[48,29 -> 48,30]"
-				},
-				{
-					"originalRange": "[14,22 -> 14,22]",
-					"modifiedRange": "[48,31 -> 48,43]"
-				},
-				{
-					"originalRange": "[14,23 -> 14,24]",
-					"modifiedRange": "[48,44 -> 49,12]"
-				},
-				{
-					"originalRange": "[14,26 -> 14,26]",
-					"modifiedRange": "[49,14 -> 51,20]"
-				},
-				{
-					"originalRange": "[14,27 -> 14,27]",
-					"modifiedRange": "[51,21 -> 51,28]"
-				},
-				{
-					"originalRange": "[14,28 -> 14,28]",
-					"modifiedRange": "[51,29 -> 51,60]"
-				},
-				{
-					"originalRange": "[14,29 -> 14,29]",
-					"modifiedRange": "[51,61 -> 57,21]"
-				},
-				{
-					"originalRange": "[14,30 -> 14,30]",
-					"modifiedRange": "[57,22 -> 58,5]"
-				},
-				{
-					"originalRange": "[14,31 -> 14,31]",
-					"modifiedRange": "[58,6 -> 58,26]"
-				},
-				{
-					"originalRange": "[14,32 -> 14,32]",
-					"modifiedRange": "[58,27 -> 58,28]"
-				},
-				{
-					"originalRange": "[14,33 -> 14,33]",
-					"modifiedRange": "[58,29 -> 62,7]"
-				},
-				{
-					"originalRange": "[14,34 -> 14,34]",
-					"modifiedRange": "[62,8 -> 63,27]"
-				},
-				{
-					"originalRange": "[14,35 -> 14,35]",
-					"modifiedRange": "[63,28 -> 69,4]"
-				},
-				{
-					"originalRange": "[14,36 -> 14,36]",
-					"modifiedRange": "[69,5 -> 69,17]"
-				},
-				{
-					"originalRange": "[14,37 -> 14,37]",
-					"modifiedRange": "[69,18 -> 70,4]"
-				},
-				{
-					"originalRange": "[14,38 -> 14,38]",
-					"modifiedRange": "[70,5 -> 70,11]"
-				},
-				{
-					"originalRange": "[14,39 -> 14,39]",
-					"modifiedRange": "[70,12 -> 75,9]"
-				},
-				{
-					"originalRange": "[14,40 -> 14,40]",
-					"modifiedRange": "[75,10 -> 75,13]"
-				},
-				{
-					"originalRange": "[14,41 -> 14,42]",
-					"modifiedRange": "[75,14 -> 75,48]"
-				},
-				{
-					"originalRange": "[14,43 -> 14,43]",
-					"modifiedRange": "[75,49 -> 79,2]"
+					"originalRange": "[14,13 -> 14,43]",
+					"modifiedRange": "[39,13 -> 79,2]"
 				}
 			]
 		}
diff --git a/src/vs/editor/test/node/diffing/fixtures/ts-example2-ts/experimental.expected.diff.json b/src/vs/editor/test/node/diffing/fixtures/ts-example2-ts/experimental.expected.diff.json
index 12fb2fb68e1066..a6bbd84c36270a 100644
--- a/src/vs/editor/test/node/diffing/fixtures/ts-example2-ts/experimental.expected.diff.json
+++ b/src/vs/editor/test/node/diffing/fixtures/ts-example2-ts/experimental.expected.diff.json
@@ -11,16 +11,12 @@
 					"modifiedRange": "[6,10 -> 6,19]"
 				},
 				{
-					"originalRange": "[6,33 -> 6,33]",
-					"modifiedRange": "[6,41 -> 7,12]"
+					"originalRange": "[6,33 -> 6,34]",
+					"modifiedRange": "[6,41 -> 6,50]"
 				},
 				{
-					"originalRange": "[6,37 -> 6,37]",
-					"modifiedRange": "[7,16 -> 12,39]"
-				},
-				{
-					"originalRange": "[6,46 -> 6,46]",
-					"modifiedRange": "[12,48 -> 16,35]"
+					"originalRange": "[7,1 -> 7,1]",
+					"modifiedRange": "[7,1 -> 17,1]"
 				}
 			]
 		},
diff --git a/src/vs/editor/test/node/diffing/fixtures/ts-fragmented-eager-diffing/experimental.expected.diff.json b/src/vs/editor/test/node/diffing/fixtures/ts-fragmented-eager-diffing/experimental.expected.diff.json
index 63bf0be0819aa7..43782bc601f9a1 100644
--- a/src/vs/editor/test/node/diffing/fixtures/ts-fragmented-eager-diffing/experimental.expected.diff.json
+++ b/src/vs/editor/test/node/diffing/fixtures/ts-fragmented-eager-diffing/experimental.expected.diff.json
@@ -17,12 +17,8 @@
 			"modifiedRange": "[31,32)",
 			"innerChanges": [
 				{
-					"originalRange": "[32,59 -> 32,59]",
-					"modifiedRange": "[31,59 -> 31,60]"
-				},
-				{
-					"originalRange": "[32,60 -> 32,60]",
-					"modifiedRange": "[31,61 -> 31,66]"
+					"originalRange": "[32,59 -> 32,60]",
+					"modifiedRange": "[31,59 -> 31,66]"
 				}
 			]
 		},
@@ -55,12 +51,8 @@
 					"modifiedRange": "[81,1 -> 82,1]"
 				},
 				{
-					"originalRange": "[84,60 -> 84,60]",
-					"modifiedRange": "[82,60 -> 82,61]"
-				},
-				{
-					"originalRange": "[84,61 -> 84,61]",
-					"modifiedRange": "[82,62 -> 82,67]"
+					"originalRange": "[84,60 -> 84,61]",
+					"modifiedRange": "[82,60 -> 82,67]"
 				}
 			]
 		},
@@ -73,12 +65,8 @@
 					"modifiedRange": "[93,1 -> 94,1]"
 				},
 				{
-					"originalRange": "[95,60 -> 95,60]",
-					"modifiedRange": "[94,60 -> 94,61]"
-				},
-				{
-					"originalRange": "[95,61 -> 95,61]",
-					"modifiedRange": "[94,62 -> 94,67]"
+					"originalRange": "[95,60 -> 95,61]",
+					"modifiedRange": "[94,60 -> 94,67]"
 				}
 			]
 		},
@@ -91,12 +79,8 @@
 					"modifiedRange": "[104,1 -> 105,1]"
 				},
 				{
-					"originalRange": "[105,60 -> 105,60]",
-					"modifiedRange": "[105,60 -> 105,61]"
-				},
-				{
-					"originalRange": "[105,61 -> 105,61]",
-					"modifiedRange": "[105,62 -> 105,67]"
+					"originalRange": "[105,60 -> 105,61]",
+					"modifiedRange": "[105,60 -> 105,67]"
 				}
 			]
 		}
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index a5745ab769697c..c7fd43da5c9d28 100644
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -445,6 +445,7 @@ declare namespace monaco {
 		readonly shiftKey: boolean;
 		readonly altKey: boolean;
 		readonly metaKey: boolean;
+		readonly altGraphKey: boolean;
 		readonly keyCode: KeyCode;
 		readonly code: string;
 		equals(keybinding: number): boolean;
@@ -667,11 +668,11 @@ declare namespace monaco {
 		/**
 		 * Test if this range equals other.
 		 */
-		equalsRange(other: IRange | null): boolean;
+		equalsRange(other: IRange | null | undefined): boolean;
 		/**
 		 * Test if range `a` equals `b`.
 		 */
-		static equalsRange(a: IRange | null, b: IRange | null): boolean;
+		static equalsRange(a: IRange | null | undefined, b: IRange | null | undefined): boolean;
 		/**
 		 * Return the end position (which will be after or equal to the start position)
 		 */
@@ -704,14 +705,22 @@ declare namespace monaco {
 		 * Create a new empty range using this range's start position.
 		 */
 		collapseToStart(): Range;
-		/**
-		 * Moves the range by the given amount of lines.
-		 */
-		delta(lineCount: number): Range;
 		/**
 		 * Create a new empty range using this range's start position.
 		 */
 		static collapseToStart(range: IRange): Range;
+		/**
+		 * Create a new empty range using this range's end position.
+		 */
+		collapseToEnd(): Range;
+		/**
+		 * Create a new empty range using this range's end position.
+		 */
+		static collapseToEnd(range: IRange): Range;
+		/**
+		 * Moves the range by the given amount of lines.
+		 */
+		delta(lineCount: number): Range;
 		static fromPositions(start: IPosition, end?: IPosition): Range;
 		/**
 		 * Create a `Range` from an `IRange`.
@@ -1247,7 +1256,7 @@ declare namespace monaco.editor {
 		 */
 		'semanticHighlighting.enabled'?: true | false | 'configuredByTheme';
 		/**
-		 * Keep peek editors open even when double clicking their content or when hitting `Escape`.
+		 * Keep peek editors open even when double-clicking their content or when hitting `Escape`.
 		 * Defaults to false.
 		 */
 		stablePeek?: boolean;
@@ -1769,6 +1778,7 @@ declare namespace monaco.editor {
 		readonly defaultEOL: DefaultEndOfLine;
 		readonly trimAutoWhitespace: boolean;
 		readonly bracketPairColorizationOptions: BracketPairColorizationOptions;
+		get originalIndentSize(): number | 'tabSize';
 	}
 
 	export interface BracketPairColorizationOptions {
@@ -1778,7 +1788,7 @@ declare namespace monaco.editor {
 
 	export interface ITextModelUpdateOptions {
 		tabSize?: number;
-		indentSize?: number;
+		indentSize?: number | 'tabSize';
 		insertSpaces?: boolean;
 		trimAutoWhitespace?: boolean;
 		bracketColorizationOptions?: BracketPairColorizationOptions;
@@ -3058,9 +3068,9 @@ declare namespace monaco.editor {
 		cursorSurroundingLinesStyle?: 'default' | 'all';
 		/**
 		 * Render last line number when the file ends with a newline.
-		 * Defaults to true.
+		 * Defaults to 'on' for Windows and macOS and 'dimmed' for Linux.
 		*/
-		renderFinalNewline?: boolean;
+		renderFinalNewline?: 'on' | 'off' | 'dimmed';
 		/**
 		 * Remove unusual line terminators like LINE SEPARATOR (LS), PARAGRAPH SEPARATOR (PS).
 		 * Defaults to 'prompt'.
@@ -3175,9 +3185,9 @@ declare namespace monaco.editor {
 		mouseStyle?: 'text' | 'default' | 'copy';
 		/**
 		 * Enable smooth caret animation.
-		 * Defaults to false.
+		 * Defaults to 'off'.
 		 */
-		cursorSmoothCaretAnimation?: boolean;
+		cursorSmoothCaretAnimation?: 'off' | 'explicit' | 'on';
 		/**
 		 * Control the cursor style, either 'block' or 'line'.
 		 * Defaults to 'line'.
@@ -3302,6 +3312,10 @@ declare namespace monaco.editor {
 		 * Enable inline color decorators and color picker rendering.
 		 */
 		colorDecorators?: boolean;
+		/**
+		 * Controls the max number of color decorators that can be rendered in an editor at once.
+		 */
+		colorDecoratorsLimit?: number;
 		/**
 		 * Control the behaviour of comments in the editor.
 		 */
@@ -3554,6 +3568,11 @@ declare namespace monaco.editor {
 		 * Defaults to 'always'.
 		 */
 		matchBrackets?: 'never' | 'near' | 'always';
+		/**
+		 * Enable experimental whitespace rendering.
+		 * Defaults to 'svg'.
+		 */
+		experimentalWhitespaceRendering?: 'svg' | 'font' | 'off';
 		/**
 		 * Enable rendering of whitespace.
 		 * Defaults to 'selection'.
@@ -3581,7 +3600,7 @@ declare namespace monaco.editor {
 		/**
 		 * The font family
 		 */
-		fontFamily?: string | string[];
+		fontFamily?: string;
 		/**
 		 * The font weight
 		 */
@@ -3840,7 +3859,7 @@ declare namespace monaco.editor {
 		autoFindInSelection?: 'never' | 'always' | 'multiline';
 		addExtraSpaceOnTop?: boolean;
 		/**
-		 * Controls whether the search automatically restarts from the beginning (or the end) when no further matches can be found
+		 * Controls whether the search result and diff result automatically restarts from the beginning (or the end) when no further matches can be found
 		 */
 		loop?: boolean;
 	}
@@ -4576,126 +4595,128 @@ declare namespace monaco.editor {
 		codeLensFontFamily = 15,
 		codeLensFontSize = 16,
 		colorDecorators = 17,
-		columnSelection = 18,
-		comments = 19,
-		contextmenu = 20,
-		copyWithSyntaxHighlighting = 21,
-		cursorBlinking = 22,
-		cursorSmoothCaretAnimation = 23,
-		cursorStyle = 24,
-		cursorSurroundingLines = 25,
-		cursorSurroundingLinesStyle = 26,
-		cursorWidth = 27,
-		disableLayerHinting = 28,
-		disableMonospaceOptimizations = 29,
-		domReadOnly = 30,
-		dragAndDrop = 31,
-		dropIntoEditor = 32,
-		emptySelectionClipboard = 33,
-		extraEditorClassName = 34,
-		fastScrollSensitivity = 35,
-		find = 36,
-		fixedOverflowWidgets = 37,
-		folding = 38,
-		foldingStrategy = 39,
-		foldingHighlight = 40,
-		foldingImportsByDefault = 41,
-		foldingMaximumRegions = 42,
-		unfoldOnClickAfterEndOfLine = 43,
-		fontFamily = 44,
-		fontInfo = 45,
-		fontLigatures = 46,
-		fontSize = 47,
-		fontWeight = 48,
-		fontVariations = 49,
-		formatOnPaste = 50,
-		formatOnType = 51,
-		glyphMargin = 52,
-		gotoLocation = 53,
-		hideCursorInOverviewRuler = 54,
-		hover = 55,
-		inDiffEditor = 56,
-		inlineSuggest = 57,
-		letterSpacing = 58,
-		lightbulb = 59,
-		lineDecorationsWidth = 60,
-		lineHeight = 61,
-		lineNumbers = 62,
-		lineNumbersMinChars = 63,
-		linkedEditing = 64,
-		links = 65,
-		matchBrackets = 66,
-		minimap = 67,
-		mouseStyle = 68,
-		mouseWheelScrollSensitivity = 69,
-		mouseWheelZoom = 70,
-		multiCursorMergeOverlapping = 71,
-		multiCursorModifier = 72,
-		multiCursorPaste = 73,
-		multiCursorLimit = 74,
-		occurrencesHighlight = 75,
-		overviewRulerBorder = 76,
-		overviewRulerLanes = 77,
-		padding = 78,
-		parameterHints = 79,
-		peekWidgetDefaultFocus = 80,
-		definitionLinkOpensInPeek = 81,
-		quickSuggestions = 82,
-		quickSuggestionsDelay = 83,
-		readOnly = 84,
-		renameOnType = 85,
-		renderControlCharacters = 86,
-		renderFinalNewline = 87,
-		renderLineHighlight = 88,
-		renderLineHighlightOnlyWhenFocus = 89,
-		renderValidationDecorations = 90,
-		renderWhitespace = 91,
-		revealHorizontalRightPadding = 92,
-		roundedSelection = 93,
-		rulers = 94,
-		scrollbar = 95,
-		scrollBeyondLastColumn = 96,
-		scrollBeyondLastLine = 97,
-		scrollPredominantAxis = 98,
-		selectionClipboard = 99,
-		selectionHighlight = 100,
-		selectOnLineNumbers = 101,
-		showFoldingControls = 102,
-		showUnused = 103,
-		snippetSuggestions = 104,
-		smartSelect = 105,
-		smoothScrolling = 106,
-		stickyScroll = 107,
-		stickyTabStops = 108,
-		stopRenderingLineAfter = 109,
-		suggest = 110,
-		suggestFontSize = 111,
-		suggestLineHeight = 112,
-		suggestOnTriggerCharacters = 113,
-		suggestSelection = 114,
-		tabCompletion = 115,
-		tabIndex = 116,
-		unicodeHighlighting = 117,
-		unusualLineTerminators = 118,
-		useShadowDOM = 119,
-		useTabStops = 120,
-		wordBreak = 121,
-		wordSeparators = 122,
-		wordWrap = 123,
-		wordWrapBreakAfterCharacters = 124,
-		wordWrapBreakBeforeCharacters = 125,
-		wordWrapColumn = 126,
-		wordWrapOverride1 = 127,
-		wordWrapOverride2 = 128,
-		wrappingIndent = 129,
-		wrappingStrategy = 130,
-		showDeprecated = 131,
-		inlayHints = 132,
-		editorClassName = 133,
-		pixelRatio = 134,
-		tabFocusMode = 135,
-		layoutInfo = 136,
-		wrappingInfo = 137
+		colorDecoratorsLimit = 18,
+		columnSelection = 19,
+		comments = 20,
+		contextmenu = 21,
+		copyWithSyntaxHighlighting = 22,
+		cursorBlinking = 23,
+		cursorSmoothCaretAnimation = 24,
+		cursorStyle = 25,
+		cursorSurroundingLines = 26,
+		cursorSurroundingLinesStyle = 27,
+		cursorWidth = 28,
+		disableLayerHinting = 29,
+		disableMonospaceOptimizations = 30,
+		domReadOnly = 31,
+		dragAndDrop = 32,
+		dropIntoEditor = 33,
+		emptySelectionClipboard = 34,
+		experimentalWhitespaceRendering = 35,
+		extraEditorClassName = 36,
+		fastScrollSensitivity = 37,
+		find = 38,
+		fixedOverflowWidgets = 39,
+		folding = 40,
+		foldingStrategy = 41,
+		foldingHighlight = 42,
+		foldingImportsByDefault = 43,
+		foldingMaximumRegions = 44,
+		unfoldOnClickAfterEndOfLine = 45,
+		fontFamily = 46,
+		fontInfo = 47,
+		fontLigatures = 48,
+		fontSize = 49,
+		fontWeight = 50,
+		fontVariations = 51,
+		formatOnPaste = 52,
+		formatOnType = 53,
+		glyphMargin = 54,
+		gotoLocation = 55,
+		hideCursorInOverviewRuler = 56,
+		hover = 57,
+		inDiffEditor = 58,
+		inlineSuggest = 59,
+		letterSpacing = 60,
+		lightbulb = 61,
+		lineDecorationsWidth = 62,
+		lineHeight = 63,
+		lineNumbers = 64,
+		lineNumbersMinChars = 65,
+		linkedEditing = 66,
+		links = 67,
+		matchBrackets = 68,
+		minimap = 69,
+		mouseStyle = 70,
+		mouseWheelScrollSensitivity = 71,
+		mouseWheelZoom = 72,
+		multiCursorMergeOverlapping = 73,
+		multiCursorModifier = 74,
+		multiCursorPaste = 75,
+		multiCursorLimit = 76,
+		occurrencesHighlight = 77,
+		overviewRulerBorder = 78,
+		overviewRulerLanes = 79,
+		padding = 80,
+		parameterHints = 81,
+		peekWidgetDefaultFocus = 82,
+		definitionLinkOpensInPeek = 83,
+		quickSuggestions = 84,
+		quickSuggestionsDelay = 85,
+		readOnly = 86,
+		renameOnType = 87,
+		renderControlCharacters = 88,
+		renderFinalNewline = 89,
+		renderLineHighlight = 90,
+		renderLineHighlightOnlyWhenFocus = 91,
+		renderValidationDecorations = 92,
+		renderWhitespace = 93,
+		revealHorizontalRightPadding = 94,
+		roundedSelection = 95,
+		rulers = 96,
+		scrollbar = 97,
+		scrollBeyondLastColumn = 98,
+		scrollBeyondLastLine = 99,
+		scrollPredominantAxis = 100,
+		selectionClipboard = 101,
+		selectionHighlight = 102,
+		selectOnLineNumbers = 103,
+		showFoldingControls = 104,
+		showUnused = 105,
+		snippetSuggestions = 106,
+		smartSelect = 107,
+		smoothScrolling = 108,
+		stickyScroll = 109,
+		stickyTabStops = 110,
+		stopRenderingLineAfter = 111,
+		suggest = 112,
+		suggestFontSize = 113,
+		suggestLineHeight = 114,
+		suggestOnTriggerCharacters = 115,
+		suggestSelection = 116,
+		tabCompletion = 117,
+		tabIndex = 118,
+		unicodeHighlighting = 119,
+		unusualLineTerminators = 120,
+		useShadowDOM = 121,
+		useTabStops = 122,
+		wordBreak = 123,
+		wordSeparators = 124,
+		wordWrap = 125,
+		wordWrapBreakAfterCharacters = 126,
+		wordWrapBreakBeforeCharacters = 127,
+		wordWrapColumn = 128,
+		wordWrapOverride1 = 129,
+		wordWrapOverride2 = 130,
+		wrappingIndent = 131,
+		wrappingStrategy = 132,
+		showDeprecated = 133,
+		inlayHints = 134,
+		editorClassName = 135,
+		pixelRatio = 136,
+		tabFocusMode = 137,
+		layoutInfo = 138,
+		wrappingInfo = 139
 	}
 
 	export const EditorOptions: {
@@ -4718,12 +4739,13 @@ declare namespace monaco.editor {
 		codeLensFontFamily: IEditorOption<EditorOption.codeLensFontFamily, string>;
 		codeLensFontSize: IEditorOption<EditorOption.codeLensFontSize, number>;
 		colorDecorators: IEditorOption<EditorOption.colorDecorators, boolean>;
+		colorDecoratorsLimit: IEditorOption<EditorOption.colorDecoratorsLimit, number>;
 		columnSelection: IEditorOption<EditorOption.columnSelection, boolean>;
 		comments: IEditorOption<EditorOption.comments, Readonly<Required<IEditorCommentsOptions>>>;
 		contextmenu: IEditorOption<EditorOption.contextmenu, boolean>;
 		copyWithSyntaxHighlighting: IEditorOption<EditorOption.copyWithSyntaxHighlighting, boolean>;
 		cursorBlinking: IEditorOption<EditorOption.cursorBlinking, TextEditorCursorBlinkingStyle>;
-		cursorSmoothCaretAnimation: IEditorOption<EditorOption.cursorSmoothCaretAnimation, boolean>;
+		cursorSmoothCaretAnimation: IEditorOption<EditorOption.cursorSmoothCaretAnimation, 'on' | 'off' | 'explicit'>;
 		cursorStyle: IEditorOption<EditorOption.cursorStyle, TextEditorCursorStyle>;
 		cursorSurroundingLines: IEditorOption<EditorOption.cursorSurroundingLines, number>;
 		cursorSurroundingLinesStyle: IEditorOption<EditorOption.cursorSurroundingLinesStyle, 'default' | 'all'>;
@@ -4735,6 +4757,7 @@ declare namespace monaco.editor {
 		emptySelectionClipboard: IEditorOption<EditorOption.emptySelectionClipboard, boolean>;
 		dropIntoEditor: IEditorOption<EditorOption.dropIntoEditor, Readonly<Required<IDropIntoEditorOptions>>>;
 		stickyScroll: IEditorOption<EditorOption.stickyScroll, Readonly<Required<IEditorStickyScrollOptions>>>;
+		experimentalWhitespaceRendering: IEditorOption<EditorOption.experimentalWhitespaceRendering, 'off' | 'svg' | 'font'>;
 		extraEditorClassName: IEditorOption<EditorOption.extraEditorClassName, string>;
 		fastScrollSensitivity: IEditorOption<EditorOption.fastScrollSensitivity, number>;
 		find: IEditorOption<EditorOption.find, Readonly<Required<IEditorFindOptions>>>;
@@ -4787,7 +4810,7 @@ declare namespace monaco.editor {
 		readOnly: IEditorOption<EditorOption.readOnly, boolean>;
 		renameOnType: IEditorOption<EditorOption.renameOnType, boolean>;
 		renderControlCharacters: IEditorOption<EditorOption.renderControlCharacters, boolean>;
-		renderFinalNewline: IEditorOption<EditorOption.renderFinalNewline, boolean>;
+		renderFinalNewline: IEditorOption<EditorOption.renderFinalNewline, 'on' | 'off' | 'dimmed'>;
 		renderLineHighlight: IEditorOption<EditorOption.renderLineHighlight, 'all' | 'line' | 'none' | 'gutter'>;
 		renderLineHighlightOnlyWhenFocus: IEditorOption<EditorOption.renderLineHighlightOnlyWhenFocus, boolean>;
 		renderValidationDecorations: IEditorOption<EditorOption.renderValidationDecorations, 'on' | 'off' | 'editable'>;
@@ -6463,6 +6486,7 @@ declare namespace monaco.languages {
 	}
 
 	export enum CompletionItemInsertTextRule {
+		None = 0,
 		/**
 		 * Adjust whitespace/indentation of multiline insert texts to
 		 * match the current line indentation.
diff --git a/src/vs/platform/actionWidget/browser/actionList.ts b/src/vs/platform/actionWidget/browser/actionList.ts
index 4ea1fce8210050..514f7d09aac9be 100644
--- a/src/vs/platform/actionWidget/browser/actionList.ts
+++ b/src/vs/platform/actionWidget/browser/actionList.ts
@@ -8,11 +8,12 @@ import { KeybindingLabel } from 'vs/base/browser/ui/keybindingLabel/keybindingLa
 import { IListEvent, IListMouseEvent, IListRenderer, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
 import { List } from 'vs/base/browser/ui/list/listWidget';
 import { Codicon } from 'vs/base/common/codicons';
+import { ResolvedKeybinding } from 'vs/base/common/keybindings';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { OS } from 'vs/base/common/platform';
 import 'vs/css!./actionWidget';
 import { localize } from 'vs/nls';
-import { IActionItem, IActionKeybindingResolver } from 'vs/platform/actionWidget/common/actionWidget';
+import { IActionItem } from 'vs/platform/actionWidget/common/actionWidget';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 
@@ -25,12 +26,14 @@ export interface IRenderDelegate {
 }
 
 export interface IListMenuItem<T extends IActionItem> {
-	item?: T;
-	kind: ActionListItemKind;
-	group?: { kind?: any; icon?: { codicon: Codicon; color?: string }; title: string };
-	disabled?: boolean;
-	label?: string;
-	description?: string;
+	readonly item?: T;
+	readonly kind: ActionListItemKind;
+	readonly group?: { kind?: any; icon?: { codicon: Codicon; color?: string }; title: string };
+	readonly disabled?: boolean;
+	readonly label?: string;
+	readonly description?: string;
+
+	readonly keybinding?: ResolvedKeybinding;
 }
 
 interface IActionMenuTemplateData {
@@ -64,10 +67,7 @@ class HeaderRenderer<T extends IListMenuItem<IActionItem>> implements IListRende
 	}
 
 	renderElement(element: IListMenuItem<IActionItem>, _index: number, templateData: IHeaderTemplateData): void {
-		if (!element.group) {
-			return;
-		}
-		templateData.text.textContent = element.group?.title;
+		templateData.text.textContent = element.group?.title ?? '';
 	}
 
 	disposeTemplate(_templateData: IHeaderTemplateData): void {
@@ -77,10 +77,10 @@ class HeaderRenderer<T extends IListMenuItem<IActionItem>> implements IListRende
 
 class ActionItemRenderer<T extends IListMenuItem<IActionItem>> implements IListRenderer<T, IActionMenuTemplateData> {
 
-	get templateId(): string { return 'action'; }
+	get templateId(): string { return ActionListItemKind.Action; }
 
 	constructor(
-		private readonly _keybindingResolver: IActionKeybindingResolver | undefined,
+		private readonly _supportsPreview: boolean,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService
 	) { }
 
@@ -108,18 +108,17 @@ class ActionItemRenderer<T extends IListMenuItem<IActionItem>> implements IListR
 			data.icon.className = Codicon.lightBulb.classNames;
 			data.icon.style.color = 'var(--vscode-editorLightBulb-foreground)';
 		}
+
 		if (!element.item || !element.label) {
 			return;
 		}
+
 		data.text.textContent = stripNewlines(element.label);
-		const binding = this._keybindingResolver?.getResolver()(element.item);
-		if (binding) {
-			data.keybinding.set(binding);
-		}
 
-		if (!binding) {
+		if (!element.keybinding) {
 			dom.hide(data.keybinding.element);
 		} else {
+			data.keybinding.set(element.keybinding);
 			dom.show(data.keybinding.element);
 		}
 
@@ -129,10 +128,15 @@ class ActionItemRenderer<T extends IListMenuItem<IActionItem>> implements IListR
 		if (element.disabled) {
 			data.container.title = element.label;
 		} else if (actionTitle && previewTitle) {
-			data.container.title = localize({ key: 'label', comment: ['placeholders are keybindings, e.g "F2 to apply, Shift+F2 to preview"'] }, "{0} to apply, {1} to preview", actionTitle, previewTitle);
+			if (this._supportsPreview) {
+				data.container.title = localize({ key: 'label-preview', comment: ['placeholders are keybindings, e.g "F2 to apply, Shift+F2 to preview"'] }, "{0} to apply, {1} to preview", actionTitle, previewTitle);
+			} else {
+				data.container.title = localize({ key: 'label', comment: ['placeholder is a keybinding, e.g "F2 to apply"'] }, "{0} to apply", actionTitle);
+			}
 		} else {
 			data.container.title = '';
 		}
+
 		if (element.description) {
 			const label = new HighlightedLabel(dom.append(data.container, dom.$('span.label-description')));
 			label.element.classList.add('action-list-description');
@@ -145,6 +149,14 @@ class ActionItemRenderer<T extends IListMenuItem<IActionItem>> implements IListR
 	}
 }
 
+class AcceptSelectedEvent extends UIEvent {
+	constructor() { super('acceptSelectedAction'); }
+}
+
+class PreviewSelectedEvent extends UIEvent {
+	constructor() { super('previewSelectedAction'); }
+}
+
 export class ActionList<T extends IActionItem> extends Disposable {
 
 	public readonly domNode: HTMLElement;
@@ -154,13 +166,13 @@ export class ActionList<T extends IActionItem> extends Disposable {
 	private readonly _actionLineHeight = 24;
 	private readonly _headerLineHeight = 26;
 
-	private readonly _allMenuItems: IListMenuItem<IActionItem>[];
+	private readonly _allMenuItems: readonly IListMenuItem<IActionItem>[];
 
 	constructor(
 		user: string,
-		items: IListMenuItem<T>[],
+		preview: boolean,
+		items: readonly IListMenuItem<T>[],
 		private readonly _delegate: IRenderDelegate,
-		resolver: IActionKeybindingResolver | undefined,
 		@IContextViewService private readonly _contextViewService: IContextViewService,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService
 	) {
@@ -169,14 +181,14 @@ export class ActionList<T extends IActionItem> extends Disposable {
 		this.domNode = document.createElement('div');
 		this.domNode.classList.add('actionList');
 		const virtualDelegate: IListVirtualDelegate<IListMenuItem<IActionItem>> = {
-			getHeight: element => element.kind === 'header' ? this._headerLineHeight : this._actionLineHeight,
+			getHeight: element => element.kind === ActionListItemKind.Header ? this._headerLineHeight : this._actionLineHeight,
 			getTemplateId: element => element.kind
 		};
-		this._list = new List(user, this.domNode, virtualDelegate, [new ActionItemRenderer<IListMenuItem<IActionItem>>(resolver, this._keybindingService), new HeaderRenderer()], {
-			keyboardSupport: true,
+		this._list = this._register(new List(user, this.domNode, virtualDelegate, [new ActionItemRenderer<IListMenuItem<IActionItem>>(preview, this._keybindingService), new HeaderRenderer()], {
+			keyboardSupport: false,
 			accessibilityProvider: {
 				getAriaLabel: element => {
-					if (element.kind === 'action') {
+					if (element.kind === ActionListItemKind.Action) {
 						let label = element.label ? stripNewlines(element?.label) : '';
 						if (element.disabled) {
 							label = localize({ key: 'customQuickFixWidget.labels', comment: [`Action widget labels for accessibility.`] }, "{0}, Disabled Reason: {1}", label, element.disabled);
@@ -186,10 +198,10 @@ export class ActionList<T extends IActionItem> extends Disposable {
 					return null;
 				},
 				getWidgetAriaLabel: () => localize({ key: 'customQuickFixWidget', comment: [`An action widget option`] }, "Action Widget"),
-				getRole: () => 'option',
-				getWidgetRole: () => user
+				getRole: (e) => e.kind === ActionListItemKind.Action ? 'option' : 'separator',
+				getWidgetRole: () => 'listbox'
 			},
-		});
+		}));
 
 		this._register(this._list.onMouseClick(e => this.onListClick(e)));
 		this._register(this._list.onMouseOver(e => this.onListHover(e)));
@@ -198,7 +210,10 @@ export class ActionList<T extends IActionItem> extends Disposable {
 
 		this._allMenuItems = items;
 		this._list.splice(0, this._list.length, this._allMenuItems);
-		this.focusNext();
+
+		if (this._list.length) {
+			this.focusNext();
+		}
 	}
 
 	private focusCondition(element: IListMenuItem<IActionItem>): boolean {
@@ -259,7 +274,7 @@ export class ActionList<T extends IActionItem> extends Disposable {
 			return;
 		}
 
-		const event = new UIEvent(preview ? 'previewSelectedCodeAction' : 'acceptSelectedCodeAction');
+		const event = preview ? new PreviewSelectedEvent() : new AcceptSelectedEvent();
 		this._list.setSelection([focusIndex], event);
 	}
 
@@ -270,7 +285,7 @@ export class ActionList<T extends IActionItem> extends Disposable {
 
 		const element = e.elements[0];
 		if (element.item && this.focusCondition(element)) {
-			this._delegate.onSelect(element.item, e.browserEvent?.type === 'previewSelectedEventType');
+			this._delegate.onSelect(element.item, e.browserEvent instanceof PreviewSelectedEvent);
 		} else {
 			this._list.setSelection([]);
 		}
diff --git a/src/vs/platform/actionWidget/browser/actionWidget.css b/src/vs/platform/actionWidget/browser/actionWidget.css
index b67ed0cbe8c1d2..b7a76476df3730 100644
--- a/src/vs/platform/actionWidget/browser/actionWidget.css
+++ b/src/vs/platform/actionWidget/browser/actionWidget.css
@@ -50,6 +50,10 @@
 	border-width: 0 !important;
 }
 
+.action-widget .monaco-list:focus:before {
+	outline: 0 !important;
+}
+
 .action-widget .monaco-list .monaco-scrollable-element .monaco-list-rows {
 	height: 100% !important;
 }
@@ -87,9 +91,6 @@
 	cursor: default !important;
 	-webkit-touch-callout: none;
 	-webkit-user-select: none;
-	-khtml-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
 	user-select: none;
 	background-color: transparent !important;
 	outline: 0 solid !important;
diff --git a/src/vs/platform/actionWidget/browser/actionWidget.ts b/src/vs/platform/actionWidget/browser/actionWidget.ts
index a5646ebafe6789..8fa5405be055fc 100644
--- a/src/vs/platform/actionWidget/browser/actionWidget.ts
+++ b/src/vs/platform/actionWidget/browser/actionWidget.ts
@@ -12,7 +12,7 @@ import 'vs/css!./actionWidget';
 import { localize } from 'vs/nls';
 import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
 import { acceptSelectedActionCommand, ActionList, IListMenuItem, previewSelectedActionCommand } from 'vs/platform/actionWidget/browser/actionList';
-import { IActionItem, IActionKeybindingResolver } from 'vs/platform/actionWidget/common/actionWidget';
+import { IActionItem } from 'vs/platform/actionWidget/common/actionWidget';
 import { IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
@@ -21,7 +21,7 @@ import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegis
 
 
 const ActionWidgetContextKeys = {
-	Visible: new RawContextKey<boolean>('actionWidgetVisible', false, localize('actionWidgetVisible', "Whether the action widget list is visible"))
+	Visible: new RawContextKey<boolean>('codeActionMenuVisible', false, localize('codeActionMenuVisible', "Whether the action widget list is visible"))
 };
 
 export interface IRenderDelegate<T extends IActionItem> {
@@ -34,7 +34,7 @@ export const IActionWidgetService = createDecorator<IActionWidgetService>('actio
 export interface IActionWidgetService {
 	readonly _serviceBrand: undefined;
 
-	show(user: string, items: IListMenuItem<IActionItem>[], delegate: IRenderDelegate<any>, anchor: IAnchor, container: HTMLElement | undefined, actionBarActions?: readonly IAction[]): Promise<void>;
+	show(user: string, supportsPreview: boolean, items: IListMenuItem<IActionItem>[], delegate: IRenderDelegate<any>, anchor: IAnchor, container: HTMLElement | undefined, actionBarActions?: readonly IAction[]): Promise<void>;
 
 	hide(): void;
 
@@ -58,10 +58,10 @@ class ActionWidgetService extends Disposable implements IActionWidgetService {
 		super();
 	}
 
-	async show(user: string, items: IListMenuItem<IActionItem>[], delegate: IRenderDelegate<any>, anchor: IAnchor, container: HTMLElement | undefined, actionBarActions?: readonly IAction[], resolver?: IActionKeybindingResolver): Promise<void> {
+	async show(user: string, supportsPreview: boolean, items: IListMenuItem<IActionItem>[], delegate: IRenderDelegate<any>, anchor: IAnchor, container: HTMLElement | undefined, actionBarActions?: readonly IAction[]): Promise<void> {
 		const visibleContext = ActionWidgetContextKeys.Visible.bindTo(this._contextKeyService);
 
-		const list = this._instantiationService.createInstance(ActionList, user, items, delegate, resolver);
+		const list = this._instantiationService.createInstance(ActionList, user, supportsPreview, items, delegate);
 		this.contextViewService.showContextView({
 			getAnchor: () => anchor,
 			render: (container: HTMLElement) => {
diff --git a/src/vs/platform/actionWidget/common/actionWidget.ts b/src/vs/platform/actionWidget/common/actionWidget.ts
index e4e11f2e96be63..e0b76b41e29ce6 100644
--- a/src/vs/platform/actionWidget/common/actionWidget.ts
+++ b/src/vs/platform/actionWidget/common/actionWidget.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ResolvedKeybinding } from 'vs/base/common/keybindings';
 import { IDisposable } from 'vs/base/common/lifecycle';
 
 export interface ActionSet<T> extends IDisposable {
@@ -16,7 +15,3 @@ export interface IActionItem {
 	// TODO: Use generics
 	action: any;
 }
-
-export interface IActionKeybindingResolver {
-	getResolver(): (action: any) => ResolvedKeybinding | undefined;
-}
diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts
index 762b9754744057..db8b0d04551cb0 100644
--- a/src/vs/platform/actions/common/actions.ts
+++ b/src/vs/platform/actions/common/actions.ts
@@ -126,6 +126,7 @@ export class MenuId {
 	static readonly ViewContainerTitleContext = new MenuId('ViewContainerTitleContext');
 	static readonly ViewTitle = new MenuId('ViewTitle');
 	static readonly ViewTitleContext = new MenuId('ViewTitleContext');
+	static readonly CommentEditorActions = new MenuId('CommentEditorActions');
 	static readonly CommentThreadTitle = new MenuId('CommentThreadTitle');
 	static readonly CommentThreadActions = new MenuId('CommentThreadActions');
 	static readonly CommentThreadAdditionalActions = new MenuId('CommentThreadAdditionalActions');
@@ -545,7 +546,7 @@ interface IAction2CommonOptions extends ICommandAction {
 	/**
 	 * One or many menu items.
 	 */
-	menu?: OneOrN<{ id: MenuId } & Omit<IMenuItem, 'command'>>;
+	menu?: OneOrN<{ id: MenuId; precondition?: null } & Omit<IMenuItem, 'command'>>;
 
 	/**
 	 * One keybinding.
@@ -620,11 +621,11 @@ export function registerAction2(ctor: { new(): Action2 }): IDisposable {
 	// menu
 	if (Array.isArray(menu)) {
 		for (const item of menu) {
-			disposables.add(MenuRegistry.appendMenuItem(item.id, { command, ...item }));
+			disposables.add(MenuRegistry.appendMenuItem(item.id, { command: { ...command, precondition: item.precondition === null ? undefined : command.precondition }, ...item }));
 		}
 
 	} else if (menu) {
-		disposables.add(MenuRegistry.appendMenuItem(menu.id, { command, ...menu }));
+		disposables.add(MenuRegistry.appendMenuItem(menu.id, { command: { ...command, precondition: menu.precondition === null ? undefined : command.precondition }, ...menu }));
 	}
 	if (f1) {
 		disposables.add(MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command, when: command.precondition }));
diff --git a/src/vs/platform/assignment/common/assignmentService.ts b/src/vs/platform/assignment/common/assignmentService.ts
index 8c95858144518b..f07e1a340569af 100644
--- a/src/vs/platform/assignment/common/assignmentService.ts
+++ b/src/vs/platform/assignment/common/assignmentService.ts
@@ -10,18 +10,6 @@ import { IProductService } from 'vs/platform/product/common/productService';
 import { getTelemetryLevel } from 'vs/platform/telemetry/common/telemetryUtils';
 import { AssignmentFilterProvider, ASSIGNMENT_REFETCH_INTERVAL, ASSIGNMENT_STORAGE_KEY, IAssignmentService, TargetPopulation } from 'vs/platform/assignment/common/assignment';
 
-class NullAssignmentServiceTelemetry implements IExperimentationTelemetry {
-	constructor() { }
-
-	setSharedProperty(name: string, value: string): void {
-		// noop due to lack of telemetry service
-	}
-
-	postEvent(eventName: string, props: Map<string, string>): void {
-		// noop due to lack of telemetry service
-	}
-}
-
 export abstract class BaseAssignmentService implements IAssignmentService {
 	_serviceBrand: undefined;
 	protected tasClient: Promise<TASClient> | undefined;
@@ -112,12 +100,3 @@ export abstract class BaseAssignmentService implements IAssignmentService {
 		return tasClient;
 	}
 }
-
-export class AssignmentService extends BaseAssignmentService {
-	constructor(
-		machineId: string,
-		configurationService: IConfigurationService,
-		productService: IProductService) {
-		super(() => Promise.resolve(machineId), configurationService, productService, new NullAssignmentServiceTelemetry());
-	}
-}
diff --git a/src/vs/platform/audioCues/browser/audioCueService.ts b/src/vs/platform/audioCues/browser/audioCueService.ts
index 3508c387929d00..941fa121f6f488 100644
--- a/src/vs/platform/audioCues/browser/audioCueService.ts
+++ b/src/vs/platform/audioCues/browser/audioCueService.ts
@@ -11,7 +11,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { Event } from 'vs/base/common/event';
 import { localize } from 'vs/nls';
-import { IObservable, observableFromEvent, derived } from 'vs/base/common/observable';
+import { IObservable, observableFromEvent, derived, IObserver } from 'vs/base/common/observable';
 
 export const IAudioCueService = createDecorator<IAudioCueService>('audioCue');
 
@@ -19,7 +19,8 @@ export interface IAudioCueService {
 	readonly _serviceBrand: undefined;
 	playAudioCue(cue: AudioCue, allowManyInParallel?: boolean): Promise<void>;
 	playAudioCues(cues: AudioCue[]): Promise<void>;
-	isEnabled(cue: AudioCue): IObservable<boolean>;
+	isEnabled(cue: AudioCue): boolean;
+	onEnabledChanged(cue: AudioCue): Event<void>;
 
 	playSound(cue: Sound, allowManyInParallel?: boolean): Promise<void>;
 }
@@ -40,14 +41,14 @@ export class AudioCueService extends Disposable implements IAudioCueService {
 	}
 
 	public async playAudioCue(cue: AudioCue, allowManyInParallel = false): Promise<void> {
-		if (this.isEnabled(cue).get()) {
+		if (this.isEnabled(cue)) {
 			await this.playSound(cue.sound, allowManyInParallel);
 		}
 	}
 
 	public async playAudioCues(cues: AudioCue[]): Promise<void> {
 		// Some audio cues might reuse sounds. Don't play the same sound twice.
-		const sounds = new Set(cues.filter(cue => this.isEnabled(cue).get()).map(cue => cue.sound));
+		const sounds = new Set(cues.filter(cue => this.isEnabled(cue)).map(cue => cue.sound));
 		await Promise.all(Array.from(sounds).map(sound => this.playSound(sound)));
 	}
 
@@ -125,9 +126,45 @@ export class AudioCueService extends Disposable implements IAudioCueService {
 		});
 	});
 
-	public isEnabled(cue: AudioCue): IObservable<boolean> {
-		return this.isEnabledCache.get(cue);
+	public isEnabled(cue: AudioCue): boolean {
+		return this.isEnabledCache.get(cue).get();
 	}
+
+	public onEnabledChanged(cue: AudioCue): Event<void> {
+		return eventFromObservable(this.isEnabledCache.get(cue));
+	}
+}
+
+function eventFromObservable(observable: IObservable<any>): Event<void> {
+	return (listener) => {
+		let count = 0;
+		let didChange = false;
+		const observer: IObserver = {
+			beginUpdate() {
+				count++;
+			},
+			endUpdate() {
+				count--;
+				if (count === 0 && didChange) {
+					didChange = false;
+					listener();
+				}
+			},
+			handleChange() {
+				if (count === 0) {
+					listener();
+				} else {
+					didChange = true;
+				}
+			}
+		};
+		observable.addObserver(observer);
+		return {
+			dispose() {
+				observable.removeObserver(observer);
+			}
+		};
+	};
 }
 
 class Cache<TArg, TValue> {
diff --git a/src/vs/platform/backup/electron-main/backupMainService.ts b/src/vs/platform/backup/electron-main/backupMainService.ts
index ed16c44eee1e03..e8201c2ca80a27 100644
--- a/src/vs/platform/backup/electron-main/backupMainService.ts
+++ b/src/vs/platform/backup/electron-main/backupMainService.ts
@@ -11,7 +11,7 @@ import { isLinux } from 'vs/base/common/platform';
 import { extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
 import { Promises, RimRafMode } from 'vs/base/node/pfs';
 import { IBackupMainService } from 'vs/platform/backup/electron-main/backup';
-import { ISerializedBackupWorkspaces, IEmptyWindowBackupInfo, isEmptyWindowBackupInfo, deserializeWorkspaceInfos, deserializeFolderInfos, ISerializedWorkspaceBackupInfo, ISerializedFolderBackupInfo, ISerializedEmptyWindowBackupInfo, ILegacySerializedBackupWorkspaces } from 'vs/platform/backup/node/backup';
+import { ISerializedBackupWorkspaces, IEmptyWindowBackupInfo, isEmptyWindowBackupInfo, deserializeWorkspaceInfos, deserializeFolderInfos, ISerializedWorkspaceBackupInfo, ISerializedFolderBackupInfo, ISerializedEmptyWindowBackupInfo } from 'vs/platform/backup/node/backup';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
 import { IStateMainService } from 'vs/platform/state/electron-main/state';
@@ -50,7 +50,7 @@ export class BackupMainService implements IBackupMainService {
 	async initialize(): Promise<void> {
 
 		// read backup workspaces
-		const serializedBackupWorkspaces = await this.initializeAndMigrateBackupWorkspacesMetadata();
+		const serializedBackupWorkspaces = this.stateMainService.getItem<ISerializedBackupWorkspaces>(BackupMainService.backupWorkspacesMetadataStorageKey) ?? { workspaces: [], folders: [], emptyWindows: [] };
 
 		// validate empty workspaces backups first
 		this.emptyWindows = await this.validateEmptyWorkspaces(serializedBackupWorkspaces.emptyWindows);
@@ -65,36 +65,6 @@ export class BackupMainService implements IBackupMainService {
 		this.storeWorkspacesMetadata();
 	}
 
-	private async initializeAndMigrateBackupWorkspacesMetadata(): Promise<ISerializedBackupWorkspaces> {
-		let serializedBackupWorkspaces = this.stateMainService.getItem<ISerializedBackupWorkspaces>(BackupMainService.backupWorkspacesMetadataStorageKey);
-		if (!serializedBackupWorkspaces) {
-			try {
-				//TODO@bpasero remove after a while
-				const legacyBackupWorkspacesPath = join(this.backupHome, 'workspaces.json');
-				const legacyBackupWorkspaces = await Promises.readFile(legacyBackupWorkspacesPath, 'utf8');
-
-				try {
-					await Promises.unlink(legacyBackupWorkspacesPath);
-				} catch (error) {
-					// ignore
-				}
-
-				const legacySerializedBackupWorkspaces = JSON.parse(legacyBackupWorkspaces) as ILegacySerializedBackupWorkspaces;
-				serializedBackupWorkspaces = {
-					workspaces: Array.isArray(legacySerializedBackupWorkspaces.rootURIWorkspaces) ? legacySerializedBackupWorkspaces.rootURIWorkspaces : [],
-					folders: Array.isArray(legacySerializedBackupWorkspaces.folderWorkspaceInfos) ? legacySerializedBackupWorkspaces.folderWorkspaceInfos : [],
-					emptyWindows: Array.isArray(legacySerializedBackupWorkspaces.emptyWorkspaceInfos) ? legacySerializedBackupWorkspaces.emptyWorkspaceInfos : [],
-				};
-			} catch (error) {
-				if (error.code !== 'ENOENT') {
-					this.logService.error(`Backup: Could not migrate legacy backup workspaces metadata: ${error.toString()}`);
-				}
-			}
-		}
-
-		return serializedBackupWorkspaces ?? { workspaces: [], folders: [], emptyWindows: [] };
-	}
-
 	protected getWorkspaceBackups(): IWorkspaceBackupInfo[] {
 		if (this.isHotExitOnExitAndWindowClose()) {
 			// Only non-folder windows are restored on main process launch when
diff --git a/src/vs/platform/backup/test/electron-main/backupMainService.test.ts b/src/vs/platform/backup/test/electron-main/backupMainService.test.ts
index 21bfd8aa0d955d..5c77ec6f01d6b9 100644
--- a/src/vs/platform/backup/test/electron-main/backupMainService.test.ts
+++ b/src/vs/platform/backup/test/electron-main/backupMainService.test.ts
@@ -81,11 +81,6 @@ flakySuite('BackupMainService', () => {
 		return workspace;
 	}
 
-	function ensureEmptyWindowExists(id: string): Promise<void> {
-		const backupFolder = service.toBackupPath(id);
-		return createBackupFolder(backupFolder);
-	}
-
 	async function createBackupFolder(backupFolder: string): Promise<void> {
 		if (!fs.existsSync(backupFolder)) {
 			fs.mkdirSync(backupFolder);
@@ -171,73 +166,6 @@ flakySuite('BackupMainService', () => {
 		return Promises.rm(testDir);
 	});
 
-	test('service migrates from old workspace.json', async function () {
-		const legacyWorkspaceJsonPath = path.join(backupHome, 'workspaces.json');
-
-		// malformed file
-		stateMainService.removeItem('backupWorkspaces');
-		await Promises.writeFile(legacyWorkspaceJsonPath, '{ hello world');
-		await service.initialize();
-		assert.ok(!await Promises.exists(legacyWorkspaceJsonPath));
-		assert.equal(service.getEmptyWindowBackups().length, 0);
-		assert.equal(service.testGetFolderBackups().length, 0);
-		assert.equal(service.testGetWorkspaceBackups().length, 0);
-
-		// file with empty contents (1)
-		stateMainService.removeItem('backupWorkspaces');
-		await Promises.writeFile(legacyWorkspaceJsonPath, '{}');
-		await service.initialize();
-		assert.ok(!await Promises.exists(legacyWorkspaceJsonPath));
-		assert.equal(service.getEmptyWindowBackups().length, 0);
-		assert.equal(service.testGetFolderBackups().length, 0);
-		assert.equal(service.testGetWorkspaceBackups().length, 0);
-
-		// file with empty contents (2)
-		stateMainService.removeItem('backupWorkspaces');
-		await Promises.writeFile(legacyWorkspaceJsonPath, JSON.stringify({
-			rootURIWorkspaces: [],
-			folderWorkspaceInfos: [],
-			emptyWorkspaceInfos: []
-		}));
-		await service.initialize();
-		assert.ok(!await Promises.exists(legacyWorkspaceJsonPath));
-		assert.equal(service.getEmptyWindowBackups().length, 0);
-		assert.equal(service.testGetFolderBackups().length, 0);
-		assert.equal(service.testGetWorkspaceBackups().length, 0);
-
-		// file with contents
-
-		const workspacePath = path.join(testDir, 'Foo.code-workspace');
-		const workspace1 = await ensureWorkspaceExists(toWorkspace(workspacePath));
-		await ensureFolderExists(existingTestFolder1);
-		const emptyWindowWorkspaceId = '1662626964151';
-		await ensureEmptyWindowExists(emptyWindowWorkspaceId);
-
-		stateMainService.removeItem('backupWorkspaces');
-		await Promises.writeFile(legacyWorkspaceJsonPath, JSON.stringify({
-			rootURIWorkspaces: [workspace1].map(toSerializedWorkspace),
-			folderWorkspaceInfos: [{ folderUri: existingTestFolder1.toString() }],
-			emptyWorkspaceInfos: [{ backupFolder: emptyWindowWorkspaceId }]
-		}));
-		await service.initialize();
-		assert.ok(!await Promises.exists(legacyWorkspaceJsonPath));
-		assert.equal(service.getEmptyWindowBackups().length, 1);
-		assert.equal(service.testGetFolderBackups().length, 1);
-		assert.equal(service.testGetWorkspaceBackups().length, 1);
-
-		// subsequent initialize ignores file
-
-		await Promises.writeFile(legacyWorkspaceJsonPath, JSON.stringify({
-			rootURIWorkspaces: [],
-			folderWorkspaceInfos: [],
-			emptyWorkspaceInfos: []
-		}));
-		await service.initialize();
-		assert.equal(service.getEmptyWindowBackups().length, 1);
-		assert.equal(service.testGetFolderBackups().length, 1);
-		assert.equal(service.testGetWorkspaceBackups().length, 1);
-	});
-
 	test('service validates backup workspaces on startup and cleans up (folder workspaces)', async function () {
 
 		// 1) backup workspace path does not exist
diff --git a/src/vs/platform/configuration/common/configuration.ts b/src/vs/platform/configuration/common/configuration.ts
index 0afd5a8707cd82..8d8472df4eb535 100644
--- a/src/vs/platform/configuration/common/configuration.ts
+++ b/src/vs/platform/configuration/common/configuration.ts
@@ -64,7 +64,7 @@ export interface IConfigurationChange {
 export interface IConfigurationChangeEvent {
 
 	readonly source: ConfigurationTarget;
-	readonly affectedKeys: string[];
+	readonly affectedKeys: ReadonlySet<string>;
 	readonly change: IConfigurationChange;
 
 	affectsConfiguration(configuration: string, overrides?: IConfigurationOverrides): boolean;
@@ -99,6 +99,17 @@ export interface IConfigurationValue<T> {
 	readonly overrideIdentifiers?: string[];
 }
 
+export interface IConfigurationUpdateOptions {
+	/**
+	 * If `true`, do not notifies the error to user by showing the message box. Default is `false`.
+	 */
+	donotNotifyError?: boolean;
+	/**
+	 * How to handle dirty file when updating the configuration.
+	 */
+	handleDirtyFile?: 'save' | 'revert';
+}
+
 export interface IConfigurationService {
 	readonly _serviceBrand: undefined;
 
@@ -140,7 +151,7 @@ export interface IConfigurationService {
 	updateValue(key: string, value: any): Promise<void>;
 	updateValue(key: string, value: any, target: ConfigurationTarget): Promise<void>;
 	updateValue(key: string, value: any, overrides: IConfigurationOverrides | IConfigurationUpdateOverrides): Promise<void>;
-	updateValue(key: string, value: any, overrides: IConfigurationOverrides | IConfigurationUpdateOverrides, target: ConfigurationTarget, donotNotifyError?: boolean): Promise<void>;
+	updateValue(key: string, value: any, overrides: IConfigurationOverrides | IConfigurationUpdateOverrides, target: ConfigurationTarget, options?: IConfigurationUpdateOptions): Promise<void>;
 
 	inspect<T>(key: string, overrides?: IConfigurationOverrides): IConfigurationValue<Readonly<T>>;
 
diff --git a/src/vs/platform/configuration/common/configurationModels.ts b/src/vs/platform/configuration/common/configurationModels.ts
index 469bcf54e1c0d8..3701f2fc73a4cf 100644
--- a/src/vs/platform/configuration/common/configurationModels.ts
+++ b/src/vs/platform/configuration/common/configurationModels.ts
@@ -11,6 +11,7 @@ import { Disposable } from 'vs/base/common/lifecycle';
 import { getOrSet, ResourceMap } from 'vs/base/common/map';
 import * as objects from 'vs/base/common/objects';
 import { IExtUri } from 'vs/base/common/resources';
+import { TernarySearchTree } from 'vs/base/common/ternarySearchTree';
 import * as types from 'vs/base/common/types';
 import { URI, UriComponents } from 'vs/base/common/uri';
 import { addToValueTree, ConfigurationTarget, getConfigurationValue, IConfigurationChange, IConfigurationChangeEvent, IConfigurationCompareResult, IConfigurationData, IConfigurationModel, IConfigurationOverrides, IConfigurationUpdateOverrides, IConfigurationValue, IOverrides, removeFromValueTree, toValuesTree } from 'vs/platform/configuration/common/configuration';
@@ -694,15 +695,22 @@ export class Configuration {
 
 	inspect<C>(key: string, overrides: IConfigurationOverrides, workspace: Workspace | undefined): IConfigurationValue<C> {
 		const consolidateConfigurationModel = this.getConsolidatedConfigurationModel(key, overrides, workspace);
-		const overrideIdentifiers: string[] = arrays.distinct(consolidateConfigurationModel.overrides.map(override => override.identifiers).flat()).filter(overrideIdentifier => consolidateConfigurationModel.getOverrideValue(key, overrideIdentifier) !== undefined);
 		const folderConfigurationModel = this.getFolderConfigurationModelForResource(overrides.resource, workspace);
 		const memoryConfigurationModel = overrides.resource ? this._memoryConfigurationByResource.get(overrides.resource) || this._memoryConfiguration : this._memoryConfiguration;
+		const overrideIdentifiers = new Set<string>();
+		for (const override of consolidateConfigurationModel.overrides) {
+			for (const overrideIdentifier of override.identifiers) {
+				if (consolidateConfigurationModel.getOverrideValue(key, overrideIdentifier) !== undefined) {
+					overrideIdentifiers.add(overrideIdentifier);
+				}
+			}
+		}
 
 		return new ConfigurationInspectValue<C>(
 			key,
 			overrides,
 			consolidateConfigurationModel.getValue<C>(key),
-			overrideIdentifiers.length ? overrideIdentifiers : undefined,
+			overrideIdentifiers.size ? [...overrideIdentifiers] : undefined,
 			this._defaultConfiguration,
 			this._policyConfiguration.isEmpty() ? undefined : this._policyConfiguration.freeze(),
 			this.applicationConfiguration.isEmpty() ? undefined : this.applicationConfiguration.freeze(),
@@ -1069,20 +1077,23 @@ export function mergeChanges(...changes: IConfigurationChange[]): IConfiguration
 
 export class ConfigurationChangeEvent implements IConfigurationChangeEvent {
 
-	private readonly affectedKeysTree: any;
-	readonly affectedKeys: string[];
+	private readonly _changeTree = TernarySearchTree.forConfigKeys<true>();
+
+	readonly affectedKeys = new Set<string>();
 	source!: ConfigurationTarget;
 	sourceConfig: any;
 
 	constructor(readonly change: IConfigurationChange, private readonly previous: { workspace?: Workspace; data: IConfigurationData } | undefined, private readonly currentConfiguraiton: Configuration, private readonly currentWorkspace?: Workspace) {
-		const keysSet = new Set<string>();
-		change.keys.forEach(key => keysSet.add(key));
-		change.overrides.forEach(([, keys]) => keys.forEach(key => keysSet.add(key)));
-		this.affectedKeys = [...keysSet.values()];
-
-		const configurationModel = new ConfigurationModel();
-		this.affectedKeys.forEach(key => configurationModel.setValue(key, {}));
-		this.affectedKeysTree = configurationModel.contents;
+		for (const key of change.keys) {
+			this._changeTree.set(key, true);
+			this.affectedKeys.add(key);
+		}
+		for (const [, keys] of change.overrides) {
+			for (const key of keys) {
+				this._changeTree.set(key, true);
+				this.affectedKeys.add(key);
+			}
+		}
 	}
 
 	private _previousConfiguration: Configuration | undefined = undefined;
@@ -1094,27 +1105,13 @@ export class ConfigurationChangeEvent implements IConfigurationChangeEvent {
 	}
 
 	affectsConfiguration(section: string, overrides?: IConfigurationOverrides): boolean {
-		if (this.doesAffectedKeysTreeContains(this.affectedKeysTree, section)) {
-			if (overrides) {
-				const value1 = this.previousConfiguration ? this.previousConfiguration.getValue(section, overrides, this.previous?.workspace) : undefined;
-				const value2 = this.currentConfiguraiton.getValue(section, overrides, this.currentWorkspace);
-				return !objects.equals(value1, value2);
-			}
-			return true;
+		if (!this._changeTree.hasElementOrSubtree(section)) {
+			return false;
 		}
-		return false;
-	}
-
-	private doesAffectedKeysTreeContains(affectedKeysTree: any, section: string): boolean {
-		let requestedTree = toValuesTree({ [section]: true }, () => { });
-
-		let key;
-		while (typeof requestedTree === 'object' && (key = Object.keys(requestedTree)[0])) { // Only one key should present, since we added only one property
-			affectedKeysTree = affectedKeysTree[key];
-			if (!affectedKeysTree) {
-				return false; // Requested tree is not found
-			}
-			requestedTree = requestedTree[key];
+		if (overrides) {
+			const value1 = this.previousConfiguration ? this.previousConfiguration.getValue(section, overrides, this.previous?.workspace) : undefined;
+			const value2 = this.currentConfiguraiton.getValue(section, overrides, this.currentWorkspace);
+			return !objects.equals(value1, value2);
 		}
 		return true;
 	}
diff --git a/src/vs/platform/configuration/common/configurationRegistry.ts b/src/vs/platform/configuration/common/configurationRegistry.ts
index 63347d8f2a7b61..78e5fcf6579fd7 100644
--- a/src/vs/platform/configuration/common/configurationRegistry.ts
+++ b/src/vs/platform/configuration/common/configurationRegistry.ts
@@ -274,7 +274,13 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 			properties: {}
 		};
 		this.configurationContributors = [this.defaultLanguageConfigurationOverridesNode];
-		this.resourceLanguageSettingsSchema = { properties: {}, patternProperties: {}, additionalProperties: false, errorMessage: 'Unknown editor configuration setting', allowTrailingCommas: true, allowComments: true };
+		this.resourceLanguageSettingsSchema = {
+			properties: {},
+			patternProperties: {},
+			additionalProperties: true,
+			allowTrailingCommas: true,
+			allowComments: true
+		};
 		this.configurationProperties = {};
 		this.policyConfigurations = new Map<PolicyName, string>();
 		this.excludedConfigurationProperties = {};
@@ -355,7 +361,7 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 			}
 		}
 
-		this.registerOverrideIdentifiers(overrideIdentifiers);
+		this.doRegisterOverrideIdentifiers(overrideIdentifiers);
 		this._onDidSchemaChange.fire();
 		this._onDidUpdateConfiguration.fire({ properties, defaultsOverrides: true });
 	}
@@ -395,6 +401,11 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 	}
 
 	public registerOverrideIdentifiers(overrideIdentifiers: string[]): void {
+		this.doRegisterOverrideIdentifiers(overrideIdentifiers);
+		this._onDidSchemaChange.fire();
+	}
+
+	private doRegisterOverrideIdentifiers(overrideIdentifiers: string[]) {
 		for (const overrideIdentifier of overrideIdentifiers) {
 			this.overrideIdentifiers.add(overrideIdentifier);
 		}
@@ -593,7 +604,6 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 			windowSettings.properties[overrideIdentifierProperty] = resourceLanguagePropertiesSchema;
 			resourceSettings.properties[overrideIdentifierProperty] = resourceLanguagePropertiesSchema;
 		}
-		this._onDidSchemaChange.fire();
 	}
 
 	private registerOverridePropertyPatternKey(): void {
diff --git a/src/vs/platform/configuration/common/configurations.ts b/src/vs/platform/configuration/common/configurations.ts
index af542f3777b902..ce69e3bb06b7f0 100644
--- a/src/vs/platform/configuration/common/configurations.ts
+++ b/src/vs/platform/configuration/common/configurations.ts
@@ -107,6 +107,7 @@ export class PolicyConfiguration extends Disposable implements IPolicyConfigurat
 	}
 
 	async initialize(): Promise<ConfigurationModel> {
+		this.logService.trace('PolicyConfiguration#initialize');
 		this.update(await this.updatePolicyDefinitions(this.defaultConfiguration.configurationModel.keys), false);
 		this._register(this.policyService.onDidChange(policyNames => this.onDidChangePolicies(policyNames)));
 		this._register(this.defaultConfiguration.onDidChangeConfiguration(async ({ properties }) => this.update(await this.updatePolicyDefinitions(properties), true)));
@@ -114,6 +115,7 @@ export class PolicyConfiguration extends Disposable implements IPolicyConfigurat
 	}
 
 	private async updatePolicyDefinitions(properties: string[]): Promise<string[]> {
+		this.logService.trace('PolicyConfiguration#updatePolicyDefinitions', properties);
 		const policyDefinitions: IStringDictionary<PolicyDefinition> = {};
 		const keys: string[] = [];
 		const configurationProperties = Registry.as<IConfigurationRegistry>(Extensions.Configuration).getConfigurationProperties();
@@ -143,12 +145,14 @@ export class PolicyConfiguration extends Disposable implements IPolicyConfigurat
 	}
 
 	private onDidChangePolicies(policyNames: readonly PolicyName[]): void {
+		this.logService.trace('PolicyConfiguration#onDidChangePolicies', policyNames);
 		const policyConfigurations = Registry.as<IConfigurationRegistry>(Extensions.Configuration).getPolicyConfigurations();
 		const keys = coalesce(policyNames.map(policyName => policyConfigurations.get(policyName)));
 		this.update(keys, true);
 	}
 
 	private update(keys: string[], trigger: boolean): void {
+		this.logService.trace('PolicyConfiguration#update', keys);
 		const configurationProperties = Registry.as<IConfigurationRegistry>(Extensions.Configuration).getConfigurationProperties();
 		const changed: [string, PolicyValue | undefined][] = [];
 		const wasEmpty = this._configurationModel.isEmpty();
@@ -168,6 +172,7 @@ export class PolicyConfiguration extends Disposable implements IPolicyConfigurat
 		}
 
 		if (changed.length) {
+			this.logService.trace('PolicyConfiguration#changed', changed);
 			const old = this._configurationModel;
 			this._configurationModel = new ConfigurationModel();
 			for (const key of old.keys) {
diff --git a/src/vs/platform/configuration/test/common/configurationModels.test.ts b/src/vs/platform/configuration/test/common/configurationModels.test.ts
index 6f6fd8f37245cd..027a8b2d323c5e 100644
--- a/src/vs/platform/configuration/test/common/configurationModels.test.ts
+++ b/src/vs/platform/configuration/test/common/configurationModels.test.ts
@@ -504,9 +504,9 @@ suite('CustomConfigurationModel', () => {
 	});
 });
 
-suite('CustomConfigurationModel', () => {
+suite('CustomConfigurationModel (2)', () => {
 
-	test('Default configuration model uses overrides', () => {
+	test('Default configuration model uses overrides (1/2)', () => {
 		Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfiguration({
 			'id': 'a',
 			'order': 1,
@@ -523,7 +523,7 @@ suite('CustomConfigurationModel', () => {
 		assert.strictEqual(true, new DefaultConfigurationModel().getValue('a'));
 	});
 
-	test('Default configuration model uses overrides', () => {
+	test('Default configuration model uses overrides (2/2)', () => {
 		Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfiguration({
 			'id': 'a',
 			'order': 1,
@@ -713,7 +713,7 @@ suite('ConfigurationChangeEvent', () => {
 		}));
 		const testObject = new ConfigurationChangeEvent(change, undefined, configuration);
 
-		assert.deepStrictEqual(testObject.affectedKeys, ['window.zoomLevel', 'workbench.editor.enablePreview', 'files.autoSave']);
+		assert.deepStrictEqual([...testObject.affectedKeys], ['window.zoomLevel', 'workbench.editor.enablePreview', 'files.autoSave']);
 
 		assert.ok(testObject.affectsConfiguration('window.zoomLevel'));
 		assert.ok(testObject.affectsConfiguration('window'));
@@ -745,7 +745,7 @@ suite('ConfigurationChangeEvent', () => {
 		}));
 		const testObject = new ConfigurationChangeEvent(change, { data }, configuration);
 
-		assert.deepStrictEqual(testObject.affectedKeys, ['window.zoomLevel', 'workbench.editor.enablePreview']);
+		assert.deepStrictEqual([...testObject.affectedKeys], ['window.zoomLevel', 'workbench.editor.enablePreview']);
 
 		assert.ok(testObject.affectsConfiguration('window.zoomLevel'));
 		assert.ok(testObject.affectsConfiguration('window'));
@@ -772,7 +772,7 @@ suite('ConfigurationChangeEvent', () => {
 		}));
 		const testObject = new ConfigurationChangeEvent(change, undefined, configuration);
 
-		assert.deepStrictEqual(testObject.affectedKeys, ['files.autoSave', '[markdown]', '[typescript][jsonc]', 'editor.wordWrap', 'editor.lineNumbers']);
+		assert.deepStrictEqual([...testObject.affectedKeys], ['files.autoSave', '[markdown]', '[typescript][jsonc]', 'editor.wordWrap', 'editor.lineNumbers']);
 
 		assert.ok(testObject.affectsConfiguration('files'));
 		assert.ok(testObject.affectsConfiguration('files.autoSave'));
@@ -830,7 +830,7 @@ suite('ConfigurationChangeEvent', () => {
 		}));
 		const testObject = new ConfigurationChangeEvent(change, { data }, configuration);
 
-		assert.deepStrictEqual(testObject.affectedKeys, ['window.zoomLevel', '[markdown]', '[css][scss]', 'workbench.editor.enablePreview', 'editor.fontSize', 'editor.lineNumbers']);
+		assert.deepStrictEqual([...testObject.affectedKeys], ['window.zoomLevel', '[markdown]', '[css][scss]', 'workbench.editor.enablePreview', 'editor.fontSize', 'editor.lineNumbers']);
 
 		assert.ok(!testObject.affectsConfiguration('files'));
 
@@ -882,7 +882,7 @@ suite('ConfigurationChangeEvent', () => {
 		);
 		const testObject = new ConfigurationChangeEvent(change, { data, workspace }, configuration, workspace);
 
-		assert.deepStrictEqual(testObject.affectedKeys, ['window.title', 'window.zoomLevel', 'window.restoreFullscreen', 'workbench.editor.enablePreview', 'window.restoreWindows']);
+		assert.deepStrictEqual([...testObject.affectedKeys], ['window.title', 'window.zoomLevel', 'window.restoreFullscreen', 'workbench.editor.enablePreview', 'window.restoreWindows']);
 
 		assert.ok(testObject.affectsConfiguration('window.zoomLevel'));
 		assert.ok(testObject.affectsConfiguration('window.zoomLevel', { resource: URI.file('folder1') }));
@@ -980,7 +980,7 @@ suite('ConfigurationChangeEvent', () => {
 		const workspace = new Workspace('a', [new WorkspaceFolder({ index: 0, name: 'a', uri: URI.file('file1') }), new WorkspaceFolder({ index: 1, name: 'b', uri: URI.file('file2') }), new WorkspaceFolder({ index: 2, name: 'c', uri: URI.file('folder3') })]);
 		const testObject = new ConfigurationChangeEvent(change, { data, workspace }, configuration, workspace);
 
-		assert.deepStrictEqual(testObject.affectedKeys, ['editor.lineNumbers', '[markdown]', '[json]', 'window.title', 'window.zoomLevel', 'window.restoreFullscreen', 'workbench.editor.enablePreview', 'window.restoreWindows', 'editor.wordWrap']);
+		assert.deepStrictEqual([...testObject.affectedKeys], ['editor.lineNumbers', '[markdown]', '[json]', 'window.title', 'window.zoomLevel', 'window.restoreFullscreen', 'workbench.editor.enablePreview', 'window.restoreWindows', 'editor.wordWrap']);
 
 		assert.ok(testObject.affectsConfiguration('window.title'));
 		assert.ok(testObject.affectsConfiguration('window.title', { resource: URI.file('file1') }));
@@ -1066,7 +1066,7 @@ suite('ConfigurationChangeEvent', () => {
 		}));
 		const testObject = new ConfigurationChangeEvent(change, undefined, configuration);
 
-		assert.deepStrictEqual(testObject.affectedKeys, ['launch', 'launch.version', 'tasks']);
+		assert.deepStrictEqual([...testObject.affectedKeys], ['launch', 'launch.version', 'tasks']);
 		assert.ok(testObject.affectsConfiguration('launch'));
 		assert.ok(testObject.affectsConfiguration('launch.version'));
 		assert.ok(testObject.affectsConfiguration('tasks'));
diff --git a/src/vs/platform/contextkey/browser/contextKeyService.ts b/src/vs/platform/contextkey/browser/contextKeyService.ts
index d5597a913cf329..17cd0275224d5d 100644
--- a/src/vs/platform/contextkey/browser/contextKeyService.ts
+++ b/src/vs/platform/contextkey/browser/contextKeyService.ts
@@ -14,7 +14,7 @@ import { URI } from 'vs/base/common/uri';
 import { localize } from 'vs/nls';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpression, ContextKeyInfo, ContextKeyValue, IContext, IContextKey, IContextKeyChangeEvent, IContextKeyService, IContextKeyServiceTarget, IReadableSet, RawContextKey, SET_CONTEXT_COMMAND_ID } from 'vs/platform/contextkey/common/contextkey';
+import { ContextKeyExpression, ContextKeyInfo, ContextKeyValue, IContext, IContextKey, IContextKeyChangeEvent, IContextKeyService, IContextKeyServiceTarget, IReadableSet, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 
 const KEYBINDING_CONTEXT_ATTR = 'data-keybinding-context';
@@ -619,7 +619,7 @@ function stringifyURIs(contextValue: any): any {
 	});
 }
 
-CommandsRegistry.registerCommand(SET_CONTEXT_COMMAND_ID, setContext);
+CommandsRegistry.registerCommand('_setContext', setContext);
 
 CommandsRegistry.registerCommand({
 	id: 'getContextKeyInfo',
diff --git a/src/vs/platform/contextkey/common/contextkey.ts b/src/vs/platform/contextkey/common/contextkey.ts
index cb5f1b7a88016c..111cf4bce1cc09 100644
--- a/src/vs/platform/contextkey/common/contextkey.ts
+++ b/src/vs/platform/contextkey/common/contextkey.ts
@@ -1647,8 +1647,6 @@ export interface IContextKeyService {
 	updateParent(parentContextKeyService: IContextKeyService): void;
 }
 
-export const SET_CONTEXT_COMMAND_ID = 'setContext';
-
 function cmp1(key1: string, key2: string): number {
 	if (key1 < key2) {
 		return -1;
diff --git a/src/vs/platform/contextview/browser/contextMenuHandler.ts b/src/vs/platform/contextview/browser/contextMenuHandler.ts
index d35346284fadcb..a7e08c7fc874a2 100644
--- a/src/vs/platform/contextview/browser/contextMenuHandler.ts
+++ b/src/vs/platform/contextview/browser/contextMenuHandler.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IContextMenuDelegate } from 'vs/base/browser/contextmenu';
-import { $, addDisposableListener, EventType, isHTMLElement } from 'vs/base/browser/dom';
+import { $, addDisposableListener, EventType, getActiveElement, isAncestor, isHTMLElement } from 'vs/base/browser/dom';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { Menu } from 'vs/base/browser/ui/menu/menu';
 import { ActionRunner, IRunEvent, WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from 'vs/base/common/actions';
 import { isCancellationError } from 'vs/base/common/errors';
-import { combinedDisposable, DisposableStore } from 'vs/base/common/lifecycle';
+import { combinedDisposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { INotificationService } from 'vs/platform/notification/common/notification';
@@ -24,7 +24,9 @@ export interface IContextMenuHandlerOptions {
 
 export class ContextMenuHandler {
 	private focusToReturn: HTMLElement | null = null;
+	private lastContainer: HTMLElement | null = null;
 	private block: HTMLElement | null = null;
+	private blockDisposable: IDisposable | null = null;
 	private options: IContextMenuHandlerOptions = { blockMouse: true };
 
 	constructor(
@@ -57,6 +59,7 @@ export class ContextMenuHandler {
 			anchorAxisAlignment: delegate.anchorAxisAlignment,
 
 			render: (container) => {
+				this.lastContainer = container;
 				const className = delegate.getMenuClassName ? delegate.getMenuClassName() : '';
 
 				if (className) {
@@ -74,8 +77,8 @@ export class ContextMenuHandler {
 					this.block.style.height = '100%';
 					this.block.style.zIndex = '-1';
 
-					// TODO@Steven: this is never getting disposed
-					addDisposableListener(this.block, EventType.MOUSE_DOWN, e => e.stopPropagation());
+					this.blockDisposable?.dispose();
+					this.blockDisposable = addDisposableListener(this.block, EventType.MOUSE_DOWN, e => e.stopPropagation());
 				}
 
 				const menuDisposables = new DisposableStore();
@@ -134,7 +137,14 @@ export class ContextMenuHandler {
 					this.block = null;
 				}
 
-				this.focusToReturn?.focus();
+				this.blockDisposable?.dispose();
+				this.blockDisposable = null;
+
+				if (!!this.lastContainer && (getActiveElement() === this.lastContainer || isAncestor(getActiveElement(), this.lastContainer))) {
+					this.focusToReturn?.focus();
+				}
+
+				this.lastContainer = null;
 			}
 		}, shadowRootElement, !!shadowRootElement);
 	}
@@ -143,9 +153,6 @@ export class ContextMenuHandler {
 		this.telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: e.action.id, from: 'contextMenu' });
 
 		this.contextViewService.hideContextView(false);
-
-		// Restore focus here
-		this.focusToReturn?.focus();
 	}
 
 	private onDidActionRun(e: IRunEvent): void {
diff --git a/src/vs/platform/contextview/browser/contextViewService.ts b/src/vs/platform/contextview/browser/contextViewService.ts
index 3a2d4a47dbcb96..817b0750c4758d 100644
--- a/src/vs/platform/contextview/browser/contextViewService.ts
+++ b/src/vs/platform/contextview/browser/contextViewService.ts
@@ -17,7 +17,7 @@ export class ContextViewService extends Disposable implements IContextViewServic
 	private shadowRoot: boolean | undefined;
 
 	constructor(
-		@ILayoutService readonly layoutService: ILayoutService
+		@ILayoutService private readonly layoutService: ILayoutService
 	) {
 		super();
 
diff --git a/src/vs/platform/diagnostics/node/diagnosticsService.ts b/src/vs/platform/diagnostics/node/diagnosticsService.ts
index 561966bf679080..f74a5e9c8e5388 100644
--- a/src/vs/platform/diagnostics/node/diagnosticsService.ts
+++ b/src/vs/platform/diagnostics/node/diagnosticsService.ts
@@ -19,18 +19,6 @@ import { IProductService } from 'vs/platform/product/common/productService';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IWorkspace } from 'vs/platform/workspace/common/workspace';
 
-export interface VersionInfo {
-	vscodeVersion: string;
-	os: string;
-}
-
-export interface ProcessInfo {
-	cpu: number;
-	memory: number;
-	pid: number;
-	name: string;
-}
-
 interface ConfigFilePatterns {
 	tag: string;
 	filePattern: RegExp;
diff --git a/src/vs/platform/environment/common/environmentService.ts b/src/vs/platform/environment/common/environmentService.ts
index 87401e16abeceb..0bd3493cbd50b1 100644
--- a/src/vs/platform/environment/common/environmentService.ts
+++ b/src/vs/platform/environment/common/environmentService.ts
@@ -282,10 +282,6 @@ export function parseExtensionHostPort(args: NativeParsedArgs, isBuild: boolean)
 	return parseDebugParams(args['inspect-extensions'], args['inspect-brk-extensions'], 5870, isBuild, args.debugId, args.extensionEnvironment);
 }
 
-export function parseSearchPort(args: NativeParsedArgs, isBuild: boolean): IDebugParams {
-	return parseDebugParams(args['inspect-search'], args['inspect-brk-search'], 5876, isBuild, args.extensionEnvironment);
-}
-
 export function parsePtyHostPort(args: NativeParsedArgs, isBuild: boolean): IDebugParams {
 	return parseDebugParams(args['inspect-ptyhost'], args['inspect-brk-ptyhost'], 5877, isBuild, args.extensionEnvironment);
 }
diff --git a/src/vs/platform/environment/electron-main/environmentMainService.ts b/src/vs/platform/environment/electron-main/environmentMainService.ts
index 292ccbcf5592ff..a783410ccd7e26 100644
--- a/src/vs/platform/environment/electron-main/environmentMainService.ts
+++ b/src/vs/platform/environment/electron-main/environmentMainService.ts
@@ -19,21 +19,21 @@ export const IEnvironmentMainService = refineServiceDecorator<IEnvironmentServic
 export interface IEnvironmentMainService extends INativeEnvironmentService {
 
 	// --- NLS cache path
-	cachedLanguagesPath: string;
+	readonly cachedLanguagesPath: string;
 
 	// --- backup paths
-	backupHome: string;
+	readonly backupHome: string;
 
 	// --- V8 code caching
-	codeCachePath: string | undefined;
-	useCodeCache: boolean;
+	readonly codeCachePath: string | undefined;
+	readonly useCodeCache: boolean;
 
 	// --- IPC
-	mainIPCHandle: string;
-	mainLockfile: string;
+	readonly mainIPCHandle: string;
+	readonly mainLockfile: string;
 
 	// --- config
-	disableUpdates: boolean;
+	readonly disableUpdates: boolean;
 }
 
 export class EnvironmentMainService extends NativeEnvironmentService implements IEnvironmentMainService {
diff --git a/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts b/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
index 5eee92232e71e0..94838d666fdafc 100644
--- a/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isNonEmptyArray } from 'vs/base/common/arrays';
+import { distinct, isNonEmptyArray } from 'vs/base/common/arrays';
 import { Barrier, CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { CancellationError, getErrorMessage } from 'vs/base/common/errors';
@@ -160,20 +160,21 @@ export abstract class AbstractExtensionManagementService extends Disposable impl
 				try {
 					const allDepsAndPackExtensionsToInstall = await this.getAllDepsAndPackExtensions(installExtensionTask.identifier, manifest, !!installExtensionTaskOptions.installOnlyNewlyAddedFromExtensionPack, !!installExtensionTaskOptions.installPreReleaseVersion, installExtensionTaskOptions.profileLocation);
 					const installed = await this.getInstalled(undefined, installExtensionTaskOptions.profileLocation);
-					for (const { gallery, manifest } of allDepsAndPackExtensionsToInstall) {
+					for (const { gallery, manifest } of distinct(allDepsAndPackExtensionsToInstall, ({ gallery }) => gallery.identifier.id)) {
 						installExtensionHasDependents = installExtensionHasDependents || !!manifest.extensionDependencies?.some(id => areSameExtensions({ id }, installExtensionTask.identifier));
 						const key = getInstallExtensionTaskKey(gallery);
 						const existingInstallingExtension = this.installingExtensions.get(key);
 						if (existingInstallingExtension) {
 							if (this.canWaitForTask(installExtensionTask, existingInstallingExtension.task)) {
-								this.logService.info('Waiting for already requested installing extension', gallery.identifier.id, installExtensionTask.identifier.id);
-								existingInstallingExtension.waitingTasks.push(installExtensionTask);
 								const identifier = existingInstallingExtension.task.identifier;
+								this.logService.info('Waiting for already requested installing extension', identifier.id, installExtensionTask.identifier.id);
+								existingInstallingExtension.waitingTasks.push(installExtensionTask);
 								// add promise that waits until the extension is completely installed, ie., onDidInstallExtensions event is triggered for this extension
 								alreadyRequestedInstallations.push(
 									Event.toPromise(
 										Event.filter(this.onDidInstallExtensions, results => results.some(result => areSameExtensions(result.identifier, identifier)))
 									).then(results => {
+										this.logService.info('Finished waiting for already requested installing extension', identifier.id, installExtensionTask.identifier.id);
 										const result = results.find(result => areSameExtensions(result.identifier, identifier));
 										if (!result?.local) {
 											// Extension failed to install
@@ -296,15 +297,10 @@ export abstract class AbstractExtensionManagementService extends Disposable impl
 			this._onDidInstallExtensions.fire(allInstallExtensionTasks.map(({ task }) => ({ identifier: task.identifier, operation: InstallOperation.Install, source: task.source, context: installExtensionTaskOptions.context, profileLocation: installExtensionTaskOptions.profileLocation })));
 			throw error;
 		} finally {
-			for (const [key, { task, waitingTasks }] of this.installingExtensions.entries()) {
-				const index = waitingTasks.indexOf(installExtensionTask);
-				if (index !== -1) {
-					/* Current task was waiting for this task */
-					waitingTasks.splice(index, 1);
-				}
-				if (waitingTasks.length === 0 // No tasks are waiting for this task
-					&& (task === installExtensionTask || index !== -1)) {
-					this.installingExtensions.delete(key);
+			// Finally, remove all the tasks from the cache
+			for (const { task } of allInstallExtensionTasks) {
+				if (task.source && !URI.isUri(task.source)) {
+					this.installingExtensions.delete(getInstallExtensionTaskKey(task.source));
 				}
 			}
 		}
@@ -353,10 +349,11 @@ export abstract class AbstractExtensionManagementService extends Disposable impl
 		}
 
 		const installed = await this.getInstalled(undefined, profile);
-		const knownIdentifiers = [extensionIdentifier];
+		const knownIdentifiers: IExtensionIdentifier[] = [];
 
 		const allDependenciesAndPacks: { gallery: IGalleryExtension; manifest: IExtensionManifest }[] = [];
 		const collectDependenciesAndPackExtensionsToInstall = async (extensionIdentifier: IExtensionIdentifier, manifest: IExtensionManifest): Promise<void> => {
+			knownIdentifiers.push(extensionIdentifier);
 			const dependecies: string[] = manifest.extensionDependencies || [];
 			const dependenciesAndPackExtensions = [...dependecies];
 			if (manifest.extensionPack) {
@@ -373,12 +370,11 @@ export abstract class AbstractExtensionManagementService extends Disposable impl
 
 			if (dependenciesAndPackExtensions.length) {
 				// filter out known extensions
-				const identifiers = [...knownIdentifiers, ...allDependenciesAndPacks.map(r => r.gallery.identifier)];
-				const ids = dependenciesAndPackExtensions.filter(id => identifiers.every(galleryIdentifier => !areSameExtensions(galleryIdentifier, { id })));
+				const ids = dependenciesAndPackExtensions.filter(id => knownIdentifiers.every(galleryIdentifier => !areSameExtensions(galleryIdentifier, { id })));
 				if (ids.length) {
 					const galleryExtensions = await this.galleryService.getExtensions(ids.map(id => ({ id, preRelease: installPreRelease })), CancellationToken.None);
 					for (const galleryExtension of galleryExtensions) {
-						if (identifiers.find(identifier => areSameExtensions(identifier, galleryExtension.identifier))) {
+						if (knownIdentifiers.find(identifier => areSameExtensions(identifier, galleryExtension.identifier))) {
 							continue;
 						}
 						const isDependency = dependecies.some(id => areSameExtensions({ id }, galleryExtension.identifier));
diff --git a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
index 8fbe4ebff244be..9d29f17117988d 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
@@ -12,6 +12,7 @@ import { URI } from 'vs/base/common/uri';
 import { getErrorMessage } from 'vs/base/common/errors';
 import { ILogService } from 'vs/platform/log/common/log';
 import { arch } from 'vs/base/common/process';
+import { TrustedTelemetryValue } from 'vs/platform/telemetry/common/telemetryUtils';
 
 export function areSameExtensions(a: IExtensionIdentifier, b: IExtensionIdentifier): boolean {
 	if (a.uuid && b.uuid) {
@@ -133,8 +134,8 @@ export function getLocalExtensionTelemetryData(extension: ILocalExtension): any
 */
 export function getGalleryExtensionTelemetryData(extension: IGalleryExtension): any {
 	return {
-		id: extension.identifier.id,
-		name: extension.name,
+		id: new TrustedTelemetryValue(extension.identifier.id),
+		name: new TrustedTelemetryValue(extension.name),
 		galleryId: extension.identifier.uuid,
 		publisherId: extension.publisherId,
 		publisherName: extension.publisher,
diff --git a/src/vs/platform/extensionManagement/common/extensionsProfileScannerService.ts b/src/vs/platform/extensionManagement/common/extensionsProfileScannerService.ts
index 98a8204fbf53a6..8127c54601b51c 100644
--- a/src/vs/platform/extensionManagement/common/extensionsProfileScannerService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionsProfileScannerService.ts
@@ -17,14 +17,38 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
 import { ILogService } from 'vs/platform/log/common/log';
 import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
+import { isObject, isString } from 'vs/base/common/types';
+import { Schemas } from 'vs/base/common/network';
+import { getErrorMessage } from 'vs/base/common/errors';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 
 interface IStoredProfileExtension {
 	identifier: IExtensionIdentifier;
-	location: UriComponents;
+	location: UriComponents | string;
 	version: string;
 	metadata?: Metadata;
 }
 
+export const enum ExtensionsProfileScanningErrorCode {
+
+	/**
+	 * Error when trying to scan extensions from a profile that does not exist.
+	 */
+	ERROR_PROFILE_NOT_FOUND = 'ERROR_PROFILE_NOT_FOUND',
+
+	/**
+	 * Error when profile file is invalid.
+	 */
+	ERROR_INVALID_CONTENT = 'ERROR_INVALID_CONTENT',
+
+}
+
+export class ExtensionsProfileScanningError extends Error {
+	constructor(message: string, public code: ExtensionsProfileScanningErrorCode) {
+		super(message);
+	}
+}
+
 export interface IScannedProfileExtension {
 	readonly identifier: IExtensionIdentifier;
 	readonly version: string;
@@ -45,6 +69,10 @@ export interface DidRemoveProfileExtensionsEvent extends ProfileExtensionsEvent
 	readonly error?: Error;
 }
 
+export interface IProfileExtensionsScanOptions {
+	readonly bailOutWhenFileNotFound?: boolean;
+}
+
 export const IExtensionsProfileScannerService = createDecorator<IExtensionsProfileScannerService>('IExtensionsProfileScannerService');
 export interface IExtensionsProfileScannerService {
 	readonly _serviceBrand: undefined;
@@ -54,7 +82,7 @@ export interface IExtensionsProfileScannerService {
 	readonly onRemoveExtensions: Event<ProfileExtensionsEvent>;
 	readonly onDidRemoveExtensions: Event<DidRemoveProfileExtensionsEvent>;
 
-	scanProfileExtensions(profileLocation: URI): Promise<IScannedProfileExtension[]>;
+	scanProfileExtensions(profileLocation: URI, options?: IProfileExtensionsScanOptions): Promise<IScannedProfileExtension[]>;
 	addExtensionsToProfile(extensions: [IExtension, Metadata | undefined][], profileLocation: URI): Promise<IScannedProfileExtension[]>;
 	removeExtensionFromProfile(extension: IExtension, profileLocation: URI): Promise<void>;
 }
@@ -80,13 +108,14 @@ export class ExtensionsProfileScannerService extends Disposable implements IExte
 		@IFileService private readonly fileService: IFileService,
 		@IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService,
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@ILogService private readonly logService: ILogService,
 	) {
 		super();
 	}
 
-	scanProfileExtensions(profileLocation: URI): Promise<IScannedProfileExtension[]> {
-		return this.withProfileExtensions(profileLocation);
+	scanProfileExtensions(profileLocation: URI, options?: IProfileExtensionsScanOptions): Promise<IScannedProfileExtension[]> {
+		return this.withProfileExtensions(profileLocation, undefined, options);
 	}
 
 	async addExtensionsToProfile(extensions: [IExtension, Metadata | undefined][], profileLocation: URI): Promise<IScannedProfileExtension[]> {
@@ -166,45 +195,58 @@ export class ExtensionsProfileScannerService extends Disposable implements IExte
 		}
 	}
 
-	private async withProfileExtensions(file: URI, updateFn?: (extensions: IScannedProfileExtension[]) => IScannedProfileExtension[]): Promise<IScannedProfileExtension[]> {
+	private async withProfileExtensions(file: URI, updateFn?: (extensions: IScannedProfileExtension[]) => IScannedProfileExtension[], options?: IProfileExtensionsScanOptions): Promise<IScannedProfileExtension[]> {
 		return this.getResourceAccessQueue(file).queue(async () => {
 			let extensions: IScannedProfileExtension[] = [];
 
 			// Read
-			let storedWebExtensions: IStoredProfileExtension[] | undefined;
+			let storedProfileExtensions;
 			try {
 				const content = await this.fileService.readFile(file);
-				storedWebExtensions = <IStoredProfileExtension[]>JSON.parse(content.value.toString());
+				storedProfileExtensions = JSON.parse(content.value.toString());
 			} catch (error) {
 				if (toFileOperationResult(error) !== FileOperationResult.FILE_NOT_FOUND) {
 					throw error;
 				}
 				// migrate from old location, remove this after couple of releases
 				if (this.uriIdentityService.extUri.isEqual(file, this.userDataProfilesService.defaultProfile.extensionsResource)) {
-					storedWebExtensions = await this.migrateFromOldDefaultProfileExtensionsLocation();
+					storedProfileExtensions = await this.migrateFromOldDefaultProfileExtensionsLocation();
+				}
+				if (!storedProfileExtensions && options?.bailOutWhenFileNotFound) {
+					throw new ExtensionsProfileScanningError(getErrorMessage(error), ExtensionsProfileScanningErrorCode.ERROR_PROFILE_NOT_FOUND);
 				}
 			}
-			if (storedWebExtensions) {
-				for (const e of storedWebExtensions) {
-					if (!e.identifier) {
-						this.logService.info('Ignoring invalid extension while scanning. Identifier does not exist.', e);
-						continue;
-					}
-					if (!e.location) {
-						this.logService.info('Ignoring invalid extension while scanning. Location does not exist.', e);
-						continue;
+			if (storedProfileExtensions) {
+				if (!Array.isArray(storedProfileExtensions)) {
+					this.reportAndThrowInvalidConentError(file);
+				}
+				// TODO @sandy081: Remove this migration after couple of releases
+				let migrate = false;
+				for (const e of storedProfileExtensions) {
+					if (!isStoredProfileExtension(e)) {
+						this.reportAndThrowInvalidConentError(file);
 					}
-					if (!e.version) {
-						this.logService.info('Ignoring invalid extension while scanning. Version does not exist.', e);
-						continue;
+					let location: URI;
+					if (isString(e.location)) {
+						location = this.resolveExtensionLocation(file, e.location);
+					} else {
+						location = URI.revive(e.location);
+						const relativePath = this.toRelativePath(file, location);
+						if (relativePath) {
+							migrate = true;
+							e.location = relativePath;
+						}
 					}
 					extensions.push({
 						identifier: e.identifier,
-						location: URI.revive(e.location),
+						location,
 						version: e.version,
 						metadata: e.metadata,
 					});
 				}
+				if (migrate) {
+					await this.fileService.writeFile(file, VSBuffer.fromString(JSON.stringify(storedProfileExtensions)));
+				}
 			}
 
 			// Update
@@ -213,7 +255,7 @@ export class ExtensionsProfileScannerService extends Disposable implements IExte
 				const storedProfileExtensions: IStoredProfileExtension[] = extensions.map(e => ({
 					identifier: e.identifier,
 					version: e.version,
-					location: e.location.toJSON(),
+					location: this.toRelativePath(file, e.location) ?? e.location.toJSON(),
 					metadata: e.metadata
 				}));
 				await this.fileService.writeFile(file, VSBuffer.fromString(JSON.stringify(storedProfileExtensions)));
@@ -223,6 +265,33 @@ export class ExtensionsProfileScannerService extends Disposable implements IExte
 		});
 	}
 
+	private reportAndThrowInvalidConentError(file: URI): void {
+		type ErrorClassification = {
+			owner: 'sandy081';
+			comment: 'Information about the error that occurred while scanning';
+			code: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'error code' };
+		};
+		const error = new ExtensionsProfileScanningError(`Invalid extensions content in ${file.toString()}`, ExtensionsProfileScanningErrorCode.ERROR_INVALID_CONTENT);
+		this.telemetryService.publicLogError2<{ code: string }, ErrorClassification>('extensionsProfileScanningError', { code: error.code });
+		throw error;
+	}
+
+	private toRelativePath(extensionsProfileLocation: URI, extensionLocation: URI): string | undefined {
+		// Extension Profile location scheme is always vscode-userdata and Extension location scheme is always file
+		// Hence we need to convert the Extension Profile location scheme to file to resolve the relative path
+		const parent = this.uriIdentityService.extUri.dirname(extensionsProfileLocation).with({ scheme: Schemas.file });
+		if (this.uriIdentityService.extUri.isEqualOrParent(extensionLocation, parent)) {
+			return this.uriIdentityService.extUri.relativePath(parent, extensionLocation);
+		}
+		return undefined;
+	}
+
+	private resolveExtensionLocation(extensionsProfileLocation: URI, path: string): URI {
+		// Extension Profile location scheme is always vscode-userdata and Extension location scheme is always file
+		// Hence we need to convert the Extension Profile location scheme to file to resolve extension location
+		return this.uriIdentityService.extUri.joinPath(this.uriIdentityService.extUri.dirname(extensionsProfileLocation), path).with({ scheme: Schemas.file });
+	}
+
 	private _migrationPromise: Promise<IStoredProfileExtension[] | undefined> | undefined;
 	private async migrateFromOldDefaultProfileExtensionsLocation(): Promise<IStoredProfileExtension[] | undefined> {
 		if (!this._migrationPromise) {
@@ -242,11 +311,7 @@ export class ExtensionsProfileScannerService extends Disposable implements IExte
 				let storedProfileExtensions: IStoredProfileExtension[] | undefined;
 				try {
 					const parsedData = JSON.parse(content);
-					if (Array.isArray(parsedData) && parsedData.every(candidate =>
-						!!(candidate && typeof candidate === 'object'
-							&& isIExtensionIdentifier(candidate.identifier)
-							&& isUriComponents(candidate.location)
-							&& candidate.version && typeof candidate.version === 'string'))) {
+					if (Array.isArray(parsedData) && parsedData.every(candidate => isStoredProfileExtension(candidate))) {
 						storedProfileExtensions = parsedData;
 					} else {
 						this.logService.warn('Skipping migrating from old default profile locaiton: Found invalid data', parsedData);
@@ -293,10 +358,17 @@ export class ExtensionsProfileScannerService extends Disposable implements IExte
 	}
 }
 
+function isStoredProfileExtension(candidate: any): candidate is IStoredProfileExtension {
+	return isObject(candidate)
+		&& isIExtensionIdentifier(candidate.identifier)
+		&& (isUriComponents(candidate.location) || isString(candidate.location))
+		&& candidate.version && isString(candidate.version);
+}
+
 function isUriComponents(thing: unknown): thing is UriComponents {
 	if (!thing) {
 		return false;
 	}
-	return typeof (<any>thing).path === 'string' &&
-		typeof (<any>thing).scheme === 'string';
+	return isString((<any>thing).path) &&
+		isString((<any>thing).scheme);
 }
diff --git a/src/vs/platform/extensionManagement/common/extensionsScannerService.ts b/src/vs/platform/extensionManagement/common/extensionsScannerService.ts
index 36f092c29b6dc9..b8102b49caefda 100644
--- a/src/vs/platform/extensionManagement/common/extensionsScannerService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionsScannerService.ts
@@ -32,7 +32,7 @@ import { ILogService } from 'vs/platform/log/common/log';
 import { IProductService } from 'vs/platform/product/common/productService';
 import { Emitter, Event } from 'vs/base/common/event';
 import { revive } from 'vs/base/common/marshalling';
-import { IExtensionsProfileScannerService, IScannedProfileExtension } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
+import { ExtensionsProfileScanningError, ExtensionsProfileScanningErrorCode, IExtensionsProfileScannerService, IProfileExtensionsScanOptions, IScannedProfileExtension } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
 import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 import { localizeManifest } from 'vs/platform/extensionManagement/common/extensionNls';
@@ -195,9 +195,20 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 	async scanUserExtensions(scanOptions: ScanOptions): Promise<IScannedExtension[]> {
 		const location = scanOptions.profileLocation ?? this.userExtensionsLocation;
 		this.logService.trace('Started scanning user extensions', location);
-		const extensionsScannerInput = await this.createExtensionScannerInput(location, !!scanOptions.profileLocation, ExtensionType.User, !scanOptions.includeUninstalled, scanOptions.language);
+		const profileScanOptions: IProfileExtensionsScanOptions | undefined = this.uriIdentityService.extUri.isEqual(scanOptions.profileLocation, this.userDataProfilesService.defaultProfile.extensionsResource) ? { bailOutWhenFileNotFound: true } : undefined;
+		const extensionsScannerInput = await this.createExtensionScannerInput(location, !!scanOptions.profileLocation, ExtensionType.User, !scanOptions.includeUninstalled, scanOptions.language, true, profileScanOptions);
 		const extensionsScanner = scanOptions.useCache && !extensionsScannerInput.devMode && extensionsScannerInput.excludeObsolete ? this.userExtensionsCachedScanner : this.extensionsScanner;
-		let extensions = await extensionsScanner.scanExtensions(extensionsScannerInput);
+		let extensions: IRelaxedScannedExtension[];
+		try {
+			extensions = await extensionsScanner.scanExtensions(extensionsScannerInput);
+		} catch (error) {
+			if (error instanceof ExtensionsProfileScanningError && error.code === ExtensionsProfileScanningErrorCode.ERROR_PROFILE_NOT_FOUND) {
+				await this.doInitializeDefaultProfileExtensions();
+				extensions = await extensionsScanner.scanExtensions(extensionsScannerInput);
+			} else {
+				throw error;
+			}
+		}
 		extensions = await this.applyScanOptions(extensions, ExtensionType.User, scanOptions, true);
 		this.logService.trace('Scanned user extensions:', extensions.length);
 		return extensions;
@@ -207,7 +218,7 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 		if (this.environmentService.isExtensionDevelopment && this.environmentService.extensionDevelopmentLocationURI) {
 			const extensions = (await Promise.all(this.environmentService.extensionDevelopmentLocationURI.filter(extLoc => extLoc.scheme === Schemas.file)
 				.map(async extensionDevelopmentLocationURI => {
-					const input = await this.createExtensionScannerInput(extensionDevelopmentLocationURI, false, ExtensionType.User, true, scanOptions.language, false /* do not validate */);
+					const input = await this.createExtensionScannerInput(extensionDevelopmentLocationURI, false, ExtensionType.User, true, scanOptions.language, false /* do not validate */, undefined);
 					const extensions = await this.extensionsScanner.scanOneOrMultipleExtensions(input);
 					return extensions.map(extension => {
 						// Override the extension type from the existing extensions
@@ -223,7 +234,7 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 	}
 
 	async scanExistingExtension(extensionLocation: URI, extensionType: ExtensionType, scanOptions: ScanOptions): Promise<IScannedExtension | null> {
-		const extensionsScannerInput = await this.createExtensionScannerInput(extensionLocation, false, extensionType, true, scanOptions.language);
+		const extensionsScannerInput = await this.createExtensionScannerInput(extensionLocation, false, extensionType, true, scanOptions.language, true, undefined);
 		const extension = await this.extensionsScanner.scanExtension(extensionsScannerInput);
 		if (!extension) {
 			return null;
@@ -235,7 +246,7 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 	}
 
 	async scanOneOrMultipleExtensions(extensionLocation: URI, extensionType: ExtensionType, scanOptions: ScanOptions): Promise<IScannedExtension[]> {
-		const extensionsScannerInput = await this.createExtensionScannerInput(extensionLocation, false, extensionType, true, scanOptions.language);
+		const extensionsScannerInput = await this.createExtensionScannerInput(extensionLocation, false, extensionType, true, scanOptions.language, true, undefined);
 		const extensions = await this.extensionsScanner.scanOneOrMultipleExtensions(extensionsScannerInput);
 		return this.applyScanOptions(extensions, extensionType, scanOptions, true);
 	}
@@ -261,40 +272,45 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 		await this.fileService.writeFile(joinPath(extensionLocation, 'package.json'), VSBuffer.fromString(JSON.stringify(manifest, null, '\t')));
 	}
 
-	private _initializeDefaultProfileExtensionsPromise: Promise<void> | undefined = undefined;
-	initializeDefaultProfileExtensions(): Promise<void> {
-		if (!this._initializeDefaultProfileExtensionsPromise) {
-			this._initializeDefaultProfileExtensionsPromise = (async () => {
+	async initializeDefaultProfileExtensions(): Promise<void> {
+		try {
+			await this.extensionsProfileScannerService.scanProfileExtensions(this.userDataProfilesService.defaultProfile.extensionsResource, { bailOutWhenFileNotFound: true });
+		} catch (error) {
+			if (error instanceof ExtensionsProfileScanningError && error.code === ExtensionsProfileScanningErrorCode.ERROR_PROFILE_NOT_FOUND) {
+				await this.doInitializeDefaultProfileExtensions();
+			} else {
+				throw error;
+			}
+		}
+	}
+
+	private initializeDefaultProfileExtensionsPromise: Promise<void> | undefined = undefined;
+	private async doInitializeDefaultProfileExtensions(): Promise<void> {
+		if (!this.initializeDefaultProfileExtensionsPromise) {
+			this.initializeDefaultProfileExtensionsPromise = (async () => {
 				try {
-					const initMarker = this.uriIdentityService.extUri.joinPath(this.userExtensionsLocation, '.init-default-profile-extensions');
-					if (await this.fileService.exists(initMarker)) {
-						return;
-					}
-					if (
-						// current default profile extensions location
-						!(await this.fileService.exists(this.userDataProfilesService.defaultProfile.extensionsResource))
-						// old default profile extensions location
-						&& !(await this.fileService.exists(this.uriIdentityService.extUri.joinPath(this.userDataProfilesService.defaultProfile.location, 'extensions.json')))
-					) {
-						this.logService.info('Started initializing default profile extensions in extensions installation folder.', this.userExtensionsLocation.toString());
-						const userExtensions = await this.scanUserExtensions({ includeInvalid: true });
+					this.logService.info('Started initializing default profile extensions in extensions installation folder.', this.userExtensionsLocation.toString());
+					const userExtensions = await this.scanUserExtensions({ includeInvalid: true });
+					if (userExtensions.length) {
 						await this.extensionsProfileScannerService.addExtensionsToProfile(userExtensions.map(e => [e, e.metadata]), this.userDataProfilesService.defaultProfile.extensionsResource);
-						this.logService.info('Completed initializing default profile extensions in extensions installation folder.', this.userExtensionsLocation.toString());
-					}
-					try {
-						await this.fileService.createFile(initMarker, VSBuffer.fromString(''));
-					} catch (error) {
-						if (toFileOperationResult(error) !== FileOperationResult.FILE_NOT_FOUND) {
-							this.logService.warn('Failed to create default profile extensions initialize marker in extensions installation folder.', this.userExtensionsLocation.toString(), getErrorMessage(error));
+					} else {
+						try {
+							await this.fileService.createFile(this.userDataProfilesService.defaultProfile.extensionsResource, VSBuffer.fromString(JSON.stringify([])));
+						} catch (error) {
+							if (toFileOperationResult(error) !== FileOperationResult.FILE_NOT_FOUND) {
+								this.logService.warn('Failed to create default profile extensions manifest in extensions installation folder.', this.userExtensionsLocation.toString(), getErrorMessage(error));
+							}
 						}
 					}
+					this.logService.info('Completed initializing default profile extensions in extensions installation folder.', this.userExtensionsLocation.toString());
 				} catch (error) {
 					this.logService.error(error);
-					throw error;
+				} finally {
+					this.initializeDefaultProfileExtensionsPromise = undefined;
 				}
 			})();
 		}
-		return this._initializeDefaultProfileExtensionsPromise;
+		return this.initializeDefaultProfileExtensionsPromise;
 	}
 
 	private async applyScanOptions(extensions: IRelaxedScannedExtension[], type: ExtensionType | 'development', scanOptions: ScanOptions, pickLatest: boolean): Promise<IRelaxedScannedExtension[]> {
@@ -377,7 +393,7 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 
 	private async scanDefaultSystemExtensions(useCache: boolean, language: string | undefined): Promise<IRelaxedScannedExtension[]> {
 		this.logService.trace('Started scanning system extensions');
-		const extensionsScannerInput = await this.createExtensionScannerInput(this.systemExtensionsLocation, false, ExtensionType.System, true, language);
+		const extensionsScannerInput = await this.createExtensionScannerInput(this.systemExtensionsLocation, false, ExtensionType.System, true, language, true, undefined);
 		const extensionsScanner = useCache && !extensionsScannerInput.devMode ? this.systemExtensionsCachedScanner : this.extensionsScanner;
 		const result = await extensionsScanner.scanExtensions(extensionsScannerInput);
 		this.logService.trace('Scanned system extensions:', result.length);
@@ -407,7 +423,7 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 					break;
 			}
 		}
-		const result = await Promise.all(devSystemExtensionsLocations.map(async location => this.extensionsScanner.scanExtension((await this.createExtensionScannerInput(location, false, ExtensionType.System, true, language)))));
+		const result = await Promise.all(devSystemExtensionsLocations.map(async location => this.extensionsScanner.scanExtension((await this.createExtensionScannerInput(location, false, ExtensionType.System, true, language, true, undefined)))));
 		this.logService.trace('Scanned dev system extensions:', result.length);
 		return coalesce(result);
 	}
@@ -421,7 +437,7 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 		}
 	}
 
-	private async createExtensionScannerInput(location: URI, profile: boolean, type: ExtensionType, excludeObsolete: boolean, language: string | undefined, validate: boolean = true): Promise<ExtensionScannerInput> {
+	private async createExtensionScannerInput(location: URI, profile: boolean, type: ExtensionType, excludeObsolete: boolean, language: string | undefined, validate: boolean, profileScanOptions: IProfileExtensionsScanOptions | undefined): Promise<ExtensionScannerInput> {
 		const translations = await this.getTranslations(language ?? platform.language);
 		const mtime = await this.getMtime(location);
 		const applicationExtensionsLocation = profile && !this.uriIdentityService.extUri.isEqual(location, this.userDataProfilesService.defaultProfile.extensionsResource) ? this.userDataProfilesService.defaultProfile.extensionsResource : undefined;
@@ -432,6 +448,7 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 			applicationExtensionsLocation,
 			applicationExtensionsLocationMtime,
 			profile,
+			profileScanOptions,
 			type,
 			excludeObsolete,
 			validate,
@@ -466,6 +483,7 @@ class ExtensionScannerInput {
 		public readonly applicationExtensionslocation: URI | undefined,
 		public readonly applicationExtensionslocationMtime: number | undefined,
 		public readonly profile: boolean,
+		public readonly profileScanOptions: IProfileExtensionsScanOptions | undefined,
 		public readonly type: ExtensionType,
 		public readonly excludeObsolete: boolean,
 		public readonly validate: boolean,
@@ -495,6 +513,7 @@ class ExtensionScannerInput {
 			&& isEqual(a.applicationExtensionslocation, b.applicationExtensionslocation)
 			&& a.applicationExtensionslocationMtime === b.applicationExtensionslocationMtime
 			&& a.profile === b.profile
+			&& a.profileScanOptions === b.profileScanOptions
 			&& a.type === b.type
 			&& a.excludeObsolete === b.excludeObsolete
 			&& a.validate === b.validate
@@ -553,7 +572,7 @@ class ExtensionsScanner extends Disposable {
 				if (input.type === ExtensionType.User && basename(c.resource).indexOf('.') === 0) {
 					return null;
 				}
-				const extensionScannerInput = new ExtensionScannerInput(c.resource, input.mtime, input.applicationExtensionslocation, input.applicationExtensionslocationMtime, input.profile, input.type, input.excludeObsolete, input.validate, input.productVersion, input.productDate, input.productCommit, input.devMode, input.language, input.translations);
+				const extensionScannerInput = new ExtensionScannerInput(c.resource, input.mtime, input.applicationExtensionslocation, input.applicationExtensionslocationMtime, input.profile, input.profileScanOptions, input.type, input.excludeObsolete, input.validate, input.productVersion, input.productDate, input.productCommit, input.devMode, input.language, input.translations);
 				return this.scanExtension(extensionScannerInput);
 			}));
 		return coalesce(extensions)
@@ -572,14 +591,14 @@ class ExtensionsScanner extends Disposable {
 	}
 
 	private async scanExtensionsFromProfileResource(profileResource: URI, filter: (extensionInfo: IScannedProfileExtension) => boolean, input: ExtensionScannerInput): Promise<IRelaxedScannedExtension[]> {
-		const scannedProfileExtensions = await this.extensionsProfileScannerService.scanProfileExtensions(profileResource);
+		const scannedProfileExtensions = await this.extensionsProfileScannerService.scanProfileExtensions(profileResource, input.profileScanOptions);
 		if (!scannedProfileExtensions.length) {
 			return [];
 		}
 		const extensions = await Promise.all<IRelaxedScannedExtension | null>(
 			scannedProfileExtensions.map(async extensionInfo => {
 				if (filter(extensionInfo)) {
-					const extensionScannerInput = new ExtensionScannerInput(extensionInfo.location, input.mtime, input.applicationExtensionslocation, input.applicationExtensionslocationMtime, input.profile, input.type, input.excludeObsolete, input.validate, input.productVersion, input.productDate, input.productCommit, input.devMode, input.language, input.translations);
+					const extensionScannerInput = new ExtensionScannerInput(extensionInfo.location, input.mtime, input.applicationExtensionslocation, input.applicationExtensionslocationMtime, input.profile, input.profileScanOptions, input.type, input.excludeObsolete, input.validate, input.productVersion, input.productDate, input.productCommit, input.devMode, input.language, input.translations);
 					return this.scanExtension(extensionScannerInput, extensionInfo.metadata);
 				}
 				return null;
diff --git a/src/vs/platform/extensionManagement/common/implicitActivationEvents.ts b/src/vs/platform/extensionManagement/common/implicitActivationEvents.ts
index 8810abc6127a0c..0cac2ee70da4a6 100644
--- a/src/vs/platform/extensionManagement/common/implicitActivationEvents.ts
+++ b/src/vs/platform/extensionManagement/common/implicitActivationEvents.ts
@@ -7,7 +7,7 @@ import { onUnexpectedError } from 'vs/base/common/errors';
 import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
 
 export interface IActivationEventsGenerator<T> {
-	(contribution: T, result: { push(item: string): void }): void;
+	(contributions: T[], result: { push(item: string): void }): void;
 }
 
 export class ImplicitActivationEventsImpl {
@@ -19,10 +19,13 @@ export class ImplicitActivationEventsImpl {
 	}
 
 	public updateManifest(manifest: IExtensionManifest) {
-		if (!Array.isArray(manifest.activationEvents) || !manifest.contributes) {
+		if (typeof manifest.main === 'undefined' && typeof manifest.browser === 'undefined') {
 			return;
 		}
-		if (typeof manifest.main === 'undefined' && typeof manifest.browser === 'undefined') {
+		if (manifest.activationEvents === undefined) {
+			Object.assign(manifest, { activationEvents: [] });
+		}
+		if (!Array.isArray(manifest.activationEvents) || !manifest.contributes) {
 			return;
 		}
 
diff --git a/src/vs/platform/extensionManagement/electron-sandbox/extensionTipsService.ts b/src/vs/platform/extensionManagement/electron-sandbox/extensionTipsService.ts
index 9d8760e2145818..d96b9c0ee58bdd 100644
--- a/src/vs/platform/extensionManagement/electron-sandbox/extensionTipsService.ts
+++ b/src/vs/platform/extensionManagement/electron-sandbox/extensionTipsService.ts
@@ -298,11 +298,11 @@ export class ExtensionTipsService extends BaseExtensionTipsService {
 			const exePaths: string[] = [];
 			if (isWindows) {
 				if (extensionTip.windowsPath) {
-					exePaths.push(extensionTip.windowsPath.replace('%USERPROFILE%', env['USERPROFILE']!)
-						.replace('%ProgramFiles(x86)%', env['ProgramFiles(x86)']!)
-						.replace('%ProgramFiles%', env['ProgramFiles']!)
-						.replace('%APPDATA%', env['APPDATA']!)
-						.replace('%WINDIR%', env['WINDIR']!));
+					exePaths.push(extensionTip.windowsPath.replace('%USERPROFILE%', () => env['USERPROFILE']!)
+						.replace('%ProgramFiles(x86)%', () => env['ProgramFiles(x86)']!)
+						.replace('%ProgramFiles%', () => env['ProgramFiles']!)
+						.replace('%APPDATA%', () => env['APPDATA']!)
+						.replace('%WINDIR%', () => env['WINDIR']!));
 				}
 			} else {
 				exePaths.push(join('/usr/local/bin', exeName));
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index e7a421629400e9..8d4b8ada39d992 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -39,7 +39,7 @@ import { ExtensionsManifestCache } from 'vs/platform/extensionManagement/node/ex
 import { DidChangeProfileExtensionsEvent, ExtensionsWatcher } from 'vs/platform/extensionManagement/node/extensionsWatcher';
 import { ExtensionType, IExtension, IExtensionManifest, isApplicationScopedExtension, TargetPlatform } from 'vs/platform/extensions/common/extensions';
 import { isEngineValid } from 'vs/platform/extensions/common/extensionValidator';
-import { FileChangesEvent, IFileService } from 'vs/platform/files/common/files';
+import { FileChangesEvent, FileChangeType, IFileService } from 'vs/platform/files/common/files';
 import { IInstantiationService, refineServiceDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IProductService } from 'vs/platform/product/common/productService';
@@ -251,7 +251,7 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 				installExtensionTask.waitUntilTaskIsFinished().then(() => this.installGalleryExtensionsTasks.delete(key));
 			}
 		}
-		return new InstallExtensionInProfileTask(installExtensionTask, options.profileLocation, this.extensionsProfileScannerService);
+		return new InstallExtensionInProfileTask(installExtensionTask, options.profileLocation, this.uriIdentityService, this.userDataProfilesService, this.extensionsScannerService, this.extensionsProfileScannerService);
 	}
 
 	protected createUninstallExtensionTask(extension: ILocalExtension, options: UninstallExtensionTaskOptions): IUninstallExtensionTask {
@@ -314,6 +314,10 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 	}
 
 	private async onDidFilesChange(e: FileChangesEvent): Promise<void> {
+		if (!e.affects(this.extensionsScannerService.userExtensionsLocation, FileChangeType.ADDED)) {
+			return;
+		}
+
 		const added: ILocalExtension[] = [];
 		for (const resource of e.rawAdded) {
 			// Check if this is a known directory
@@ -387,7 +391,6 @@ export class ExtensionsScanner extends Disposable {
 	}
 
 	async scanExtensions(type: ExtensionType | null, profileLocation: URI | undefined): Promise<ILocalExtension[]> {
-		await this.extensionsScannerService.initializeDefaultProfileExtensions();
 		const userScanOptions: ScanOptions = { includeInvalid: true, profileLocation };
 		let scannedExtensions: IScannedExtension[] = [];
 		if (type === null || type === ExtensionType.System) {
@@ -417,7 +420,6 @@ export class ExtensionsScanner extends Disposable {
 	}
 
 	async extractUserExtension(extensionKey: ExtensionKey, zipPath: string, metadata: Metadata, token: CancellationToken): Promise<ILocalExtension> {
-		await this.extensionsScannerService.initializeDefaultProfileExtensions();
 		const folderName = extensionKey.toString();
 		const tempPath = path.join(this.extensionsScannerService.userExtensionsLocation.fsPath, `.${generateUuid()}`);
 		const extensionPath = path.join(this.extensionsScannerService.userExtensionsLocation.fsPath, folderName);
@@ -613,7 +615,7 @@ export class ExtensionsScanner extends Disposable {
 				await this.beforeRemovingExtension(await this.toLocalExtension(latest));
 			}
 		}));
-		const toRemove = extensions.filter(e => uninstalled[ExtensionKey.create(e).toString()]);
+		const toRemove = extensions.filter(e => e.metadata /* Installed by VS Code */ && uninstalled[ExtensionKey.create(e).toString()]);
 		await Promises.settled(toRemove.map(e => this.removeUninstalledExtension(e)));
 	}
 
@@ -844,6 +846,9 @@ class InstallExtensionInProfileTask implements IInstallExtensionTask {
 	constructor(
 		private readonly task: IInstallExtensionTask,
 		private readonly profileLocation: URI,
+		private readonly uriIdentityService: IUriIdentityService,
+		private readonly userDataProfilesService: IUserDataProfilesService,
+		private readonly extensionsScannerService: IExtensionsScannerService,
 		private readonly extensionsProfileScannerService: IExtensionsProfileScannerService,
 	) {
 		this.promise = this.waitAndAddExtensionToProfile();
@@ -851,6 +856,9 @@ class InstallExtensionInProfileTask implements IInstallExtensionTask {
 
 	private async waitAndAddExtensionToProfile(): Promise<{ local: ILocalExtension; metadata: Metadata }> {
 		const result = await this.task.waitUntilTaskIsFinished();
+		if (this.uriIdentityService.extUri.isEqual(this.userDataProfilesService.defaultProfile.extensionsResource, this.profileLocation)) {
+			await this.extensionsScannerService.initializeDefaultProfileExtensions();
+		}
 		await this.extensionsProfileScannerService.addExtensionsToProfile([[result.local, result.metadata]], this.profileLocation);
 		return result;
 	}
diff --git a/src/vs/platform/extensionManagement/node/extensionsWatcher.ts b/src/vs/platform/extensionManagement/node/extensionsWatcher.ts
index c6abc2739b4093..18bf8b92837f37 100644
--- a/src/vs/platform/extensionManagement/node/extensionsWatcher.ts
+++ b/src/vs/platform/extensionManagement/node/extensionsWatcher.ts
@@ -65,11 +65,7 @@ export class ExtensionsWatcher extends Disposable {
 				this.extensionsProfileWatchDisposables.deleteAndDispose(profile.id);
 				return this.removeExtensionsFromProfile(profile.extensionsResource);
 			}));
-		} catch (error) {
-			this.logService.error(error);
-		}
 
-		try {
 			if (added.length) {
 				await Promise.all(added.map(profile => {
 					this.extensionsProfileWatchDisposables.set(profile.id, combinedDisposable(
@@ -82,6 +78,7 @@ export class ExtensionsWatcher extends Disposable {
 			}
 		} catch (error) {
 			this.logService.error(error);
+			throw error;
 		}
 	}
 
@@ -180,7 +177,7 @@ export class ExtensionsWatcher extends Disposable {
 
 	private async uninstallExtensionsNotInProfiles(): Promise<void> {
 		const installed = await this.extensionManagementService.getAllUserInstalled();
-		const toUninstall = installed.filter(installedExtension => !this.allExtensions.has(this.getKey(installedExtension.identifier, installedExtension.manifest.version)));
+		const toUninstall = installed.filter(installedExtension => installedExtension.installedTimestamp /* Installed by VS Code */ && !this.allExtensions.has(this.getKey(installedExtension.identifier, installedExtension.manifest.version)));
 		if (toUninstall.length) {
 			await this.extensionManagementService.markAsUninstalled(...toUninstall);
 		}
diff --git a/src/vs/platform/extensionManagement/test/node/extensionsScannerService.test.ts b/src/vs/platform/extensionManagement/test/node/extensionsScannerService.test.ts
index 979e954a9d3fa0..481a318f17ac96 100644
--- a/src/vs/platform/extensionManagement/test/node/extensionsScannerService.test.ts
+++ b/src/vs/platform/extensionManagement/test/node/extensionsScannerService.test.ts
@@ -18,6 +18,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { ILogService, NullLogService } from 'vs/platform/log/common/log';
 import { IProductService } from 'vs/platform/product/common/productService';
+import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
 import { IUserDataProfilesService, UserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
@@ -75,9 +76,10 @@ suite('NativeExtensionsScanerService Test', () => {
 		});
 		instantiationService.stub(IProductService, { version: '1.66.0' });
 		const uriIdentityService = new UriIdentityService(fileService);
+		instantiationService.stub(IUriIdentityService, uriIdentityService);
 		const userDataProfilesService = new UserDataProfilesService(environmentService, fileService, uriIdentityService, logService);
 		instantiationService.stub(IUserDataProfilesService, userDataProfilesService);
-		instantiationService.stub(IExtensionsProfileScannerService, new ExtensionsProfileScannerService(fileService, userDataProfilesService, uriIdentityService, logService));
+		instantiationService.stub(IExtensionsProfileScannerService, new ExtensionsProfileScannerService(fileService, userDataProfilesService, uriIdentityService, NullTelemetryService, logService));
 		await fileService.createFolder(systemExtensionsLocation);
 		await fileService.createFolder(userExtensionsLocation);
 	});
diff --git a/src/vs/platform/externalTerminal/electron-main/externalTerminalService.test.ts b/src/vs/platform/externalTerminal/electron-main/externalTerminalService.test.ts
index f5f7003b36e27f..78e0c40e78f1f8 100644
--- a/src/vs/platform/externalTerminal/electron-main/externalTerminalService.test.ts
+++ b/src/vs/platform/externalTerminal/electron-main/externalTerminalService.test.ts
@@ -64,7 +64,7 @@ suite('ExternalTerminalService', () => {
 		);
 	});
 
-	test(`WinTerminalService - uses default terminal when configuration.terminal.external.windowsExec is undefined`, done => {
+	test(`WinTerminalService - cwd is correct regardless of case`, done => {
 		const testShell = 'cmd';
 		const testCwd = 'c:/foo';
 		const mockSpawner: any = {
diff --git a/src/vs/platform/files/common/diskFileSystemProviderClient.ts b/src/vs/platform/files/common/diskFileSystemProviderClient.ts
index 263ffbe800eed0..4eeed662440b3e 100644
--- a/src/vs/platform/files/common/diskFileSystemProviderClient.ts
+++ b/src/vs/platform/files/common/diskFileSystemProviderClient.ts
@@ -13,7 +13,7 @@ import { newWriteableStream, ReadableStreamEventPayload, ReadableStreamEvents }
 import { URI, UriComponents } from 'vs/base/common/uri';
 import { generateUuid } from 'vs/base/common/uuid';
 import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { createFileSystemProviderError, IFileAtomicReadOptions, FileChangeType, IFileDeleteOptions, IFileOpenOptions, IFileOverwriteOptions, IFileReadStreamOptions, FileSystemProviderCapabilities, FileSystemProviderErrorCode, FileType, IFileWriteOptions, IFileChange, IFileSystemProviderWithFileAtomicReadCapability, IFileSystemProviderWithFileCloneCapability, IFileSystemProviderWithFileFolderCopyCapability, IFileSystemProviderWithFileReadStreamCapability, IFileSystemProviderWithFileReadWriteCapability, IFileSystemProviderWithOpenReadWriteCloseCapability, IStat, IWatchOptions } from 'vs/platform/files/common/files';
+import { createFileSystemProviderError, IFileAtomicReadOptions, FileChangeType, IFileDeleteOptions, IFileOpenOptions, IFileOverwriteOptions, IFileReadStreamOptions, FileSystemProviderCapabilities, FileSystemProviderErrorCode, FileType, IFileWriteOptions, IFileChange, IFileSystemProviderWithFileAtomicReadCapability, IFileSystemProviderWithFileCloneCapability, IFileSystemProviderWithFileFolderCopyCapability, IFileSystemProviderWithFileReadStreamCapability, IFileSystemProviderWithFileReadWriteCapability, IFileSystemProviderWithOpenReadWriteCloseCapability, IStat, IWatchOptions, IFileSystemProviderError } from 'vs/platform/files/common/files';
 
 export const LOCAL_FILE_SYSTEM_CHANNEL_NAME = 'localFilesystem';
 
@@ -105,14 +105,20 @@ export class DiskFileSystemProviderClient extends Disposable implements
 				if (dataOrErrorOrEnd === 'end') {
 					stream.end();
 				} else {
+					let error: Error;
 
-					// Since we receive data through a IPC channel, it is likely
-					// that the error was not serialized, or only partially. To
-					// ensure our API use is correct, we convert the data to an
-					// error here to forward it properly.
-					let error = dataOrErrorOrEnd;
-					if (!(error instanceof Error)) {
-						error = createFileSystemProviderError(toErrorMessage(error), FileSystemProviderErrorCode.Unknown);
+					// Take Error as is if type matches
+					if (dataOrErrorOrEnd instanceof Error) {
+						error = dataOrErrorOrEnd;
+					}
+
+					// Otherwise, try to deserialize into an error.
+					// Since we communicate via IPC, we cannot be sure
+					// that Error objects are properly serialized.
+					else {
+						const errorCandidate = dataOrErrorOrEnd as IFileSystemProviderError;
+
+						error = createFileSystemProviderError(errorCandidate.message ?? toErrorMessage(errorCandidate), errorCandidate.code ?? FileSystemProviderErrorCode.Unknown);
 					}
 
 					stream.error(error);
diff --git a/src/vs/platform/files/common/files.ts b/src/vs/platform/files/common/files.ts
index 37aacc25140ff8..5b1ef38f4fb7c2 100644
--- a/src/vs/platform/files/common/files.ts
+++ b/src/vs/platform/files/common/files.ts
@@ -441,6 +441,11 @@ export interface IWatchOptions {
 
 export const enum FileSystemProviderCapabilities {
 
+	/**
+	 * No capabilities.
+	 */
+	None = 0,
+
 	/**
 	 * Provider supports unbuffered read/write.
 	 */
@@ -592,7 +597,12 @@ export enum FileSystemProviderErrorCode {
 	Unknown = 'Unknown'
 }
 
-export class FileSystemProviderError extends Error {
+export interface IFileSystemProviderError extends Error {
+	readonly name: string;
+	readonly code: FileSystemProviderErrorCode;
+}
+
+export class FileSystemProviderError extends Error implements IFileSystemProviderError {
 
 	constructor(message: string, readonly code: FileSystemProviderErrorCode) {
 		super(message);
@@ -766,7 +776,6 @@ export class FileChangesEvent {
 	private readonly deleted: TernarySearchTree<URI, IFileChange> | undefined = undefined;
 
 	constructor(changes: readonly IFileChange[], ignorePathCasing: boolean) {
-		this.rawChanges = changes;
 
 		const entriesByType = new Map<FileChangeType, [URI, IFileChange][]>();
 
@@ -891,14 +900,6 @@ export class FileChangesEvent {
 		return !!this.updated;
 	}
 
-	/**
-	 * @deprecated use the `contains` or `affects` method to efficiently find
-	 * out if the event relates to a given resource. these methods ensure:
-	 * - that there is no expensive lookup needed (by using a `TernarySearchTree`)
-	 * - correctly handles `FileChangeType.DELETED` events
-	 */
-	readonly rawChanges: readonly IFileChange[] = [];
-
 	/**
 	 * @deprecated use the `contains` or `affects` method to efficiently find
 	 * out if the event relates to a given resource. these methods ensure:
diff --git a/src/vs/platform/files/node/watcher/nodejs/nodejsWatcherLib.ts b/src/vs/platform/files/node/watcher/nodejs/nodejsWatcherLib.ts
index 4ac95affd8d18d..3d1ac5dfceb1ae 100644
--- a/src/vs/platform/files/node/watcher/nodejs/nodejsWatcherLib.ts
+++ b/src/vs/platform/files/node/watcher/nodejs/nodejsWatcherLib.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { watch } from 'fs';
-import { ThrottledDelayer, ThrottledWorker } from 'vs/base/common/async';
+import { RunOnceWorker, ThrottledWorker } from 'vs/base/common/async';
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 import { isEqualOrParent } from 'vs/base/common/extpath';
 import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
@@ -26,25 +26,26 @@ export class NodeJSFileWatcherLibrary extends Disposable {
 
 	// A delay for collecting file changes from node.js
 	// before collecting them for coalescing and emitting
-	// (same delay as Parcel is using)
-	private static readonly FILE_CHANGES_HANDLER_DELAY = 50;
+	// Same delay as used for the recursive watcher.
+	private static readonly FILE_CHANGES_HANDLER_DELAY = 75;
 
 	// Reduce likelyhood of spam from file events via throttling.
 	// These numbers are a bit more aggressive compared to the
 	// recursive watcher because we can have many individual
 	// node.js watchers per request.
 	// (https://github.com/microsoft/vscode/issues/124723)
-	private readonly throttledFileChangesWorker = new ThrottledWorker<IDiskFileChange>(
+	private readonly throttledFileChangesEmitter = this._register(new ThrottledWorker<IDiskFileChange>(
 		{
 			maxWorkChunkSize: 100,	// only process up to 100 changes at once before...
 			throttleDelay: 200,	  	// ...resting for 200ms until we process events again...
 			maxBufferedWork: 10000 	// ...but never buffering more than 10000 events in memory
 		},
 		events => this.onDidFilesChange(events)
-	);
+	));
 
-	private readonly fileChangesDelayer = this._register(new ThrottledDelayer<void>(NodeJSFileWatcherLibrary.FILE_CHANGES_HANDLER_DELAY));
-	private fileChangesBuffer: IDiskFileChange[] = [];
+	// Aggregate file changes over FILE_CHANGES_HANDLER_DELAY
+	// to coalesce events and reduce spam.
+	private readonly fileChangesAggregator = this._register(new RunOnceWorker<IDiskFileChange>(events => this.handleFileChanges(events), NodeJSFileWatcherLibrary.FILE_CHANGES_HANDLER_DELAY));
 
 	private readonly excludes = parseWatcherPatterns(this.request.path, this.request.excludes);
 	private readonly includes = this.request.includes ? parseWatcherPatterns(this.request.path, this.request.includes) : undefined;
@@ -324,12 +325,13 @@ export class NodeJSFileWatcherLibrary extends Disposable {
 
 							// File seems to be really gone, so emit a deleted event and dispose
 							else {
-								const eventPromise = this.onFileChange({ path: this.request.path, type: FileChangeType.DELETED }, true /* skip excludes/includes (file is explicitly watched) */);
+								this.onFileChange({ path: this.request.path, type: FileChangeType.DELETED }, true /* skip excludes/includes (file is explicitly watched) */);
 
-								// Important to await the event delivery
+								// Important to flush the event delivery
 								// before disposing the watcher, otherwise
 								// we will loose this event.
-								await eventPromise;
+								this.fileChangesAggregator.flush();
+
 								this.dispose();
 							}
 						}, NodeJSFileWatcherLibrary.FILE_DELETE_HANDLER_DELAY);
@@ -358,7 +360,7 @@ export class NodeJSFileWatcherLibrary extends Disposable {
 		});
 	}
 
-	private async onFileChange(event: IDiskFileChange, skipIncludeExcludeChecks = false): Promise<void> {
+	private onFileChange(event: IDiskFileChange, skipIncludeExcludeChecks = false): void {
 		if (this.cts.token.isCancellationRequested) {
 			return;
 		}
@@ -368,7 +370,7 @@ export class NodeJSFileWatcherLibrary extends Disposable {
 			this.trace(`${event.type === FileChangeType.ADDED ? '[ADDED]' : event.type === FileChangeType.DELETED ? '[DELETED]' : '[CHANGED]'} ${event.path}`);
 		}
 
-		// Add to buffer unless excluded or not included (not if explicitly disabled)
+		// Add to aggregator unless excluded or not included (not if explicitly disabled)
 		if (!skipIncludeExcludeChecks && this.excludes.some(exclude => exclude(event.path))) {
 			if (this.verboseLogging) {
 				this.trace(` >> ignored (excluded) ${event.path}`);
@@ -378,42 +380,34 @@ export class NodeJSFileWatcherLibrary extends Disposable {
 				this.trace(` >> ignored (not included) ${event.path}`);
 			}
 		} else {
-			this.fileChangesBuffer.push(event);
+			this.fileChangesAggregator.work(event);
 		}
+	}
 
-		// Handle emit through delayer to accommodate for bulk changes and thus reduce spam
-		try {
-			await this.fileChangesDelayer.trigger(async () => {
-				const fileChanges = this.fileChangesBuffer;
-				this.fileChangesBuffer = [];
-
-				// Coalesce events: merge events of same kind
-				const coalescedFileChanges = coalesceEvents(fileChanges);
+	private handleFileChanges(fileChanges: IDiskFileChange[]): void {
 
-				if (coalescedFileChanges.length > 0) {
+		// Coalesce events: merge events of same kind
+		const coalescedFileChanges = coalesceEvents(fileChanges);
+		if (coalescedFileChanges.length > 0) {
 
-					// Logging
-					if (this.verboseLogging) {
-						for (const event of coalescedFileChanges) {
-							this.trace(`>> normalized ${event.type === FileChangeType.ADDED ? '[ADDED]' : event.type === FileChangeType.DELETED ? '[DELETED]' : '[CHANGED]'} ${event.path}`);
-						}
-					}
+			// Logging
+			if (this.verboseLogging) {
+				for (const event of coalescedFileChanges) {
+					this.trace(`>> normalized ${event.type === FileChangeType.ADDED ? '[ADDED]' : event.type === FileChangeType.DELETED ? '[DELETED]' : '[CHANGED]'} ${event.path}`);
+				}
+			}
 
-					// Broadcast to clients via throttler
-					const worked = this.throttledFileChangesWorker.work(coalescedFileChanges);
+			// Broadcast to clients via throttled emitter
+			const worked = this.throttledFileChangesEmitter.work(coalescedFileChanges);
 
-					// Logging
-					if (!worked) {
-						this.warn(`started ignoring events due to too many file change events at once (incoming: ${coalescedFileChanges.length}, most recent change: ${coalescedFileChanges[0].path}). Use 'files.watcherExclude' setting to exclude folders with lots of changing files (e.g. compilation output).`);
-					} else {
-						if (this.throttledFileChangesWorker.pending > 0) {
-							this.trace(`started throttling events due to large amount of file change events at once (pending: ${this.throttledFileChangesWorker.pending}, most recent change: ${coalescedFileChanges[0].path}). Use 'files.watcherExclude' setting to exclude folders with lots of changing files (e.g. compilation output).`);
-						}
-					}
+			// Logging
+			if (!worked) {
+				this.warn(`started ignoring events due to too many file change events at once (incoming: ${coalescedFileChanges.length}, most recent change: ${coalescedFileChanges[0].path}). Use 'files.watcherExclude' setting to exclude folders with lots of changing files (e.g. compilation output).`);
+			} else {
+				if (this.throttledFileChangesEmitter.pending > 0) {
+					this.trace(`started throttling events due to large amount of file change events at once (pending: ${this.throttledFileChangesEmitter.pending}, most recent change: ${coalescedFileChanges[0].path}). Use 'files.watcherExclude' setting to exclude folders with lots of changing files (e.g. compilation output).`);
 				}
-			});
-		} catch (error) {
-			// ignore (we are likely disposed and cancelled)
+			}
 		}
 	}
 
diff --git a/src/vs/platform/files/node/watcher/parcel/parcelWatcher.ts b/src/vs/platform/files/node/watcher/parcel/parcelWatcher.ts
index 6126ccaf8b5364..260e6d39331cee 100644
--- a/src/vs/platform/files/node/watcher/parcel/parcelWatcher.ts
+++ b/src/vs/platform/files/node/watcher/parcel/parcelWatcher.ts
@@ -6,7 +6,7 @@
 import * as parcelWatcher from '@parcel/watcher';
 import { existsSync, statSync, unlinkSync } from 'fs';
 import { tmpdir } from 'os';
-import { DeferredPromise, RunOnceScheduler, ThrottledWorker } from 'vs/base/common/async';
+import { DeferredPromise, RunOnceScheduler, RunOnceWorker, ThrottledWorker } from 'vs/base/common/async';
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import { Emitter } from 'vs/base/common/event';
@@ -46,6 +46,11 @@ export interface IParcelWatcherInstance {
 	 */
 	readonly token: CancellationToken;
 
+	/**
+	 * An event aggregator to coalesce events and reduce duplicates.
+	 */
+	readonly worker: RunOnceWorker<IDiskFileChange>;
+
 	/**
 	 * Stops and disposes the watcher. This operation is async to await
 	 * unsubscribe call in Parcel.
@@ -88,16 +93,28 @@ export class ParcelWatcher extends Disposable implements IRecursiveWatcher {
 
 	protected readonly watchers = new Map<string, IParcelWatcherInstance>();
 
+	// A delay for collecting file changes from Parcel
+	// before collecting them for coalescing and emitting.
+	// Parcel internally uses 50ms as delay, so we use 75ms,
+	// to schedule sufficiently after Parcel.
+	//
+	// Note: since Parcel 2.0.7, the very first event is
+	// emitted without delay if no events occured over a
+	// duration of 500ms. But we always want to aggregate
+	// events to apply our coleasing logic.
+	//
+	private static readonly FILE_CHANGES_HANDLER_DELAY = 75;
+
 	// Reduce likelyhood of spam from file events via throttling.
 	// (https://github.com/microsoft/vscode/issues/124723)
-	private readonly throttledFileChangesWorker = new ThrottledWorker<IDiskFileChange>(
+	private readonly throttledFileChangesEmitter = this._register(new ThrottledWorker<IDiskFileChange>(
 		{
 			maxWorkChunkSize: 500,	// only process up to 500 changes at once before...
 			throttleDelay: 200,	  	// ...resting for 200ms until we process events again...
 			maxBufferedWork: 30000 	// ...but never buffering more than 30000 events in memory
 		},
 		events => this._onDidChangeFile.fire(events)
-	);
+	));
 
 	private verboseLogging = false;
 	private enospcErrorLogged = false;
@@ -272,8 +289,13 @@ export class ParcelWatcher extends Disposable implements IRecursiveWatcher {
 			ready: instance.p,
 			restarts,
 			token: cts.token,
+			worker: new RunOnceWorker<IDiskFileChange>(events => this.handleParcelEvents(events, watcher), ParcelWatcher.FILE_CHANGES_HANDLER_DELAY),
 			stop: async () => {
 				cts.dispose(true);
+
+				watcher.worker.flush();
+				watcher.worker.dispose();
+
 				pollingWatcher.dispose();
 				unlinkSync(snapshotFile);
 			}
@@ -341,9 +363,13 @@ export class ParcelWatcher extends Disposable implements IRecursiveWatcher {
 			ready: instance.p,
 			restarts,
 			token: cts.token,
+			worker: new RunOnceWorker<IDiskFileChange>(events => this.handleParcelEvents(events, watcher), ParcelWatcher.FILE_CHANGES_HANDLER_DELAY),
 			stop: async () => {
 				cts.dispose(true);
 
+				watcher.worker.flush();
+				watcher.worker.dispose();
+
 				const watcherInstance = await instance.p;
 				await watcherInstance?.unsubscribe();
 			}
@@ -395,23 +421,14 @@ export class ParcelWatcher extends Disposable implements IRecursiveWatcher {
 		// Normalize events: handle NFC normalization and symlinks
 		// It is important to do this before checking for includes
 		// and excludes to check on the original path.
-		const { events: normalizedEvents, rootDeleted } = this.normalizeEvents(parcelEvents, watcher.request, realPathDiffers, realPathLength);
+		this.normalizeEvents(parcelEvents, watcher.request, realPathDiffers, realPathLength);
 
 		// Check for excludes
-		const includedEvents = this.handleExcludeIncludes(normalizedEvents, excludes, includes);
-
-		// Coalesce events: merge events of same kind
-		const coalescedEvents = coalesceEvents(includedEvents);
-
-		// Filter events: check for specific events we want to exclude
-		const filteredEvents = this.filterEvents(coalescedEvents, watcher.request, rootDeleted);
-
-		// Broadcast to clients
-		this.emitEvents(filteredEvents);
+		const includedEvents = this.handleExcludeIncludes(parcelEvents, excludes, includes);
 
-		// Handle root path delete if confirmed from coalesced events
-		if (rootDeleted && coalescedEvents.some(event => event.path === watcher.request.path && event.type === FileChangeType.DELETED)) {
-			this.onWatchedPathDeleted(watcher);
+		// Add to event aggregator for later processing
+		for (const includedEvent of includedEvents) {
+			watcher.worker.work(includedEvent);
 		}
 	}
 
@@ -441,6 +458,23 @@ export class ParcelWatcher extends Disposable implements IRecursiveWatcher {
 		return events;
 	}
 
+	private handleParcelEvents(parcelEvents: IDiskFileChange[], watcher: IParcelWatcherInstance): void {
+
+		// Coalesce events: merge events of same kind
+		const coalescedEvents = coalesceEvents(parcelEvents);
+
+		// Filter events: check for specific events we want to exclude
+		const { events: filteredEvents, rootDeleted } = this.filterEvents(coalescedEvents, watcher);
+
+		// Broadcast to clients
+		this.emitEvents(filteredEvents);
+
+		// Handle root path deletes
+		if (rootDeleted) {
+			this.onWatchedPathDeleted(watcher);
+		}
+	}
+
 	private emitEvents(events: IDiskFileChange[]): void {
 		if (events.length === 0) {
 			return;
@@ -454,14 +488,14 @@ export class ParcelWatcher extends Disposable implements IRecursiveWatcher {
 		}
 
 		// Broadcast to clients via throttler
-		const worked = this.throttledFileChangesWorker.work(events);
+		const worked = this.throttledFileChangesEmitter.work(events);
 
 		// Logging
 		if (!worked) {
 			this.warn(`started ignoring events due to too many file change events at once (incoming: ${events.length}, most recent change: ${events[0].path}). Use 'files.watcherExclude' setting to exclude folders with lots of changing files (e.g. compilation output).`);
 		} else {
-			if (this.throttledFileChangesWorker.pending > 0) {
-				this.trace(`started throttling events due to large amount of file change events at once (pending: ${this.throttledFileChangesWorker.pending}, most recent change: ${events[0].path}). Use 'files.watcherExclude' setting to exclude folders with lots of changing files (e.g. compilation output).`);
+			if (this.throttledFileChangesEmitter.pending > 0) {
+				this.trace(`started throttling events due to large amount of file change events at once (pending: ${this.throttledFileChangesEmitter.pending}, most recent change: ${events[0].path}). Use 'files.watcherExclude' setting to exclude folders with lots of changing files (e.g. compilation output).`);
 			}
 		}
 	}
@@ -496,9 +530,7 @@ export class ParcelWatcher extends Disposable implements IRecursiveWatcher {
 		return { realPath, realPathDiffers, realPathLength };
 	}
 
-	private normalizeEvents(events: parcelWatcher.Event[], request: IRecursiveWatchRequest, realPathDiffers: boolean, realPathLength: number): { events: parcelWatcher.Event[]; rootDeleted: boolean } {
-		let rootDeleted = false;
-
+	private normalizeEvents(events: parcelWatcher.Event[], request: IRecursiveWatchRequest, realPathDiffers: boolean, realPathLength: number): void {
 		for (const event of events) {
 
 			// Mac uses NFD unicode form on disk, but we want NFC
@@ -518,33 +550,29 @@ export class ParcelWatcher extends Disposable implements IRecursiveWatcher {
 			if (realPathDiffers) {
 				event.path = request.path + event.path.substr(realPathLength);
 			}
-
-			// Check for root deleted
-			if (event.path === request.path && event.type === 'delete') {
-				rootDeleted = true;
-			}
 		}
-
-		return { events, rootDeleted };
 	}
 
-	private filterEvents(events: IDiskFileChange[], request: IRecursiveWatchRequest, rootDeleted: boolean): IDiskFileChange[] {
-		if (!rootDeleted) {
-			return events;
-		}
+	private filterEvents(events: IDiskFileChange[], watcher: IParcelWatcherInstance): { events: IDiskFileChange[]; rootDeleted?: boolean } {
+		const filteredEvents: IDiskFileChange[] = [];
+		let rootDeleted = false;
+
+		for (const event of events) {
+			if (event.type === FileChangeType.DELETED && event.path === watcher.request.path) {
 
-		return events.filter(event => {
-			if (event.path === request.path && event.type === FileChangeType.DELETED) {
 				// Explicitly exclude changes to root if we have any
 				// to avoid VS Code closing all opened editors which
 				// can happen e.g. in case of network connectivity
 				// issues
 				// (https://github.com/microsoft/vscode/issues/136673)
-				return false;
+
+				rootDeleted = true;
+			} else {
+				filteredEvents.push(event);
 			}
+		}
 
-			return true;
-		});
+		return { events: filteredEvents, rootDeleted };
 	}
 
 	private onWatchedPathDeleted(watcher: IParcelWatcherInstance): void {
diff --git a/src/vs/platform/files/test/common/files.test.ts b/src/vs/platform/files/test/common/files.test.ts
index 93bc99927f504c..8927ad945b972b 100644
--- a/src/vs/platform/files/test/common/files.test.ts
+++ b/src/vs/platform/files/test/common/files.test.ts
@@ -60,7 +60,6 @@ suite('Files', () => {
 			assert.strictEqual(1, event.rawAdded.length);
 			assert.strictEqual(2, event.rawUpdated.length);
 			assert.strictEqual(3, event.rawDeleted.length);
-			assert.strictEqual(6, event.rawChanges.length);
 			assert.strictEqual(true, event.gotAdded());
 			assert.strictEqual(true, event.gotUpdated());
 			assert.strictEqual(true, event.gotDeleted());
diff --git a/src/vs/platform/files/test/node/nodejsWatcher.integrationTest.ts b/src/vs/platform/files/test/node/nodejsWatcher.integrationTest.ts
index cd5a3a6a6f4a46..f49d6b1e85beea 100644
--- a/src/vs/platform/files/test/node/nodejsWatcher.integrationTest.ts
+++ b/src/vs/platform/files/test/node/nodejsWatcher.integrationTest.ts
@@ -64,6 +64,7 @@ import { NodeJSWatcher } from 'vs/platform/files/node/watcher/nodejs/nodejsWatch
 
 	setup(async () => {
 		watcher = new TestNodeJSWatcher();
+		watcher?.setVerboseLogging(loggingEnabled);
 
 		watcher.onDidLogMessage(e => {
 			if (loggingEnabled) {
diff --git a/src/vs/platform/files/test/node/parcelWatcher.integrationTest.ts b/src/vs/platform/files/test/node/parcelWatcher.integrationTest.ts
index 32d8b98c63bbcc..c3e1028ae2f522 100644
--- a/src/vs/platform/files/test/node/parcelWatcher.integrationTest.ts
+++ b/src/vs/platform/files/test/node/parcelWatcher.integrationTest.ts
@@ -13,7 +13,7 @@ import { Promises, RimRafMode } from 'vs/base/node/pfs';
 import { flakySuite, getPathFromAmdModule, getRandomTestPath } from 'vs/base/test/node/testUtils';
 import { FileChangeType } from 'vs/platform/files/common/files';
 import { ParcelWatcher } from 'vs/platform/files/node/watcher/parcel/parcelWatcher';
-import { IRecursiveWatchRequest } from 'vs/platform/files/common/watcher';
+import { IDiskFileChange, IRecursiveWatchRequest } from 'vs/platform/files/common/watcher';
 import { getDriveLetter } from 'vs/base/common/extpath';
 import { ltrim } from 'vs/base/common/strings';
 
@@ -66,6 +66,7 @@ import { ltrim } from 'vs/base/common/strings';
 
 	setup(async () => {
 		watcher = new TestParcelWatcher();
+		watcher.setVerboseLogging(loggingEnabled);
 
 		watcher.onDidLogMessage(e => {
 			if (loggingEnabled) {
@@ -105,13 +106,13 @@ import { ltrim } from 'vs/base/common/strings';
 		}
 	}
 
-	async function awaitEvent(service: TestParcelWatcher, path: string, type: FileChangeType, failOnEventReason?: string): Promise<void> {
+	async function awaitEvent(service: TestParcelWatcher, path: string, type: FileChangeType, failOnEventReason?: string): Promise<IDiskFileChange[]> {
 		if (loggingEnabled) {
 			console.log(`Awaiting change type '${toMsg(type)}' on file '${path}'`);
 		}
 
 		// Await the event
-		await new Promise<void>((resolve, reject) => {
+		const res = await new Promise<IDiskFileChange[]>((resolve, reject) => {
 			const disposable = service.onDidChangeFile(events => {
 				for (const event of events) {
 					if (event.path === path && event.type === type) {
@@ -119,7 +120,7 @@ import { ltrim } from 'vs/base/common/strings';
 						if (failOnEventReason) {
 							reject(new Error(`Unexpected file event: ${failOnEventReason}`));
 						} else {
-							setImmediate(() => resolve()); // copied from parcel watcher tests, seems to drop unrelated events on macOS
+							setImmediate(() => resolve(events)); // copied from parcel watcher tests, seems to drop unrelated events on macOS
 						}
 						break;
 					}
@@ -132,6 +133,8 @@ import { ltrim } from 'vs/base/common/strings';
 		// change event
 		// Refs: https://github.com/microsoft/vscode/issues/137430
 		await timeout(1);
+
+		return res;
 	}
 
 	function awaitMessage(service: TestParcelWatcher, type: 'trace' | 'warn' | 'error' | 'info' | 'debug'): Promise<void> {
@@ -244,26 +247,20 @@ import { ltrim } from 'vs/base/common/strings';
 		await Promises.writeFile(anotherNewFilePath, 'Hello Another World');
 		await changeFuture;
 
-		// Skip following asserts on macOS where the fs-events service
-		// does not really give a full guarantee about the correlation
-		// of an event to a change.
-		if (!isMacintosh) {
-
-			// Read file does not emit event
-			changeFuture = awaitEvent(watcher, anotherNewFilePath, FileChangeType.UPDATED, 'unexpected-event-from-read-file');
-			await Promises.readFile(anotherNewFilePath);
-			await Promise.race([timeout(100), changeFuture]);
-
-			// Stat file does not emit event
-			changeFuture = awaitEvent(watcher, anotherNewFilePath, FileChangeType.UPDATED, 'unexpected-event-from-stat');
-			await Promises.stat(anotherNewFilePath);
-			await Promise.race([timeout(100), changeFuture]);
-
-			// Stat folder does not emit event
-			changeFuture = awaitEvent(watcher, copiedFolderpath, FileChangeType.UPDATED, 'unexpected-event-from-stat');
-			await Promises.stat(copiedFolderpath);
-			await Promise.race([timeout(100), changeFuture]);
-		}
+		// Read file does not emit event
+		changeFuture = awaitEvent(watcher, anotherNewFilePath, FileChangeType.UPDATED, 'unexpected-event-from-read-file');
+		await Promises.readFile(anotherNewFilePath);
+		await Promise.race([timeout(100), changeFuture]);
+
+		// Stat file does not emit event
+		changeFuture = awaitEvent(watcher, anotherNewFilePath, FileChangeType.UPDATED, 'unexpected-event-from-stat');
+		await Promises.stat(anotherNewFilePath);
+		await Promise.race([timeout(100), changeFuture]);
+
+		// Stat folder does not emit event
+		changeFuture = awaitEvent(watcher, copiedFolderpath, FileChangeType.UPDATED, 'unexpected-event-from-stat');
+		await Promises.stat(copiedFolderpath);
+		await Promise.race([timeout(100), changeFuture]);
 
 		// Delete file
 		changeFuture = awaitEvent(watcher, copiedFilepath, FileChangeType.DELETED);
@@ -281,7 +278,7 @@ import { ltrim } from 'vs/base/common/strings';
 
 		// Delete + Recreate file
 		const newFilePath = join(testDir, 'deep', 'conway.js');
-		const changeFuture: Promise<unknown> = awaitEvent(watcher, newFilePath, FileChangeType.UPDATED);
+		const changeFuture = awaitEvent(watcher, newFilePath, FileChangeType.UPDATED);
 		await Promises.unlink(newFilePath);
 		Promises.writeFile(newFilePath, 'Hello Atomic World');
 		await changeFuture;
@@ -296,7 +293,7 @@ import { ltrim } from 'vs/base/common/strings';
 	async function basicCrudTest(filePath: string): Promise<void> {
 
 		// New file
-		let changeFuture: Promise<unknown> = awaitEvent(watcher, filePath, FileChangeType.ADDED);
+		let changeFuture = awaitEvent(watcher, filePath, FileChangeType.ADDED);
 		await Promises.writeFile(filePath, 'Hello World');
 		await changeFuture;
 
@@ -324,12 +321,12 @@ import { ltrim } from 'vs/base/common/strings';
 		const newFilePath5 = join(testDir, 'deep-multiple', 'newFile-2.txt');
 		const newFilePath6 = join(testDir, 'deep-multiple', 'newFile-3.txt');
 
-		const addedFuture1: Promise<unknown> = awaitEvent(watcher, newFilePath1, FileChangeType.ADDED);
-		const addedFuture2: Promise<unknown> = awaitEvent(watcher, newFilePath2, FileChangeType.ADDED);
-		const addedFuture3: Promise<unknown> = awaitEvent(watcher, newFilePath3, FileChangeType.ADDED);
-		const addedFuture4: Promise<unknown> = awaitEvent(watcher, newFilePath4, FileChangeType.ADDED);
-		const addedFuture5: Promise<unknown> = awaitEvent(watcher, newFilePath5, FileChangeType.ADDED);
-		const addedFuture6: Promise<unknown> = awaitEvent(watcher, newFilePath6, FileChangeType.ADDED);
+		const addedFuture1 = awaitEvent(watcher, newFilePath1, FileChangeType.ADDED);
+		const addedFuture2 = awaitEvent(watcher, newFilePath2, FileChangeType.ADDED);
+		const addedFuture3 = awaitEvent(watcher, newFilePath3, FileChangeType.ADDED);
+		const addedFuture4 = awaitEvent(watcher, newFilePath4, FileChangeType.ADDED);
+		const addedFuture5 = awaitEvent(watcher, newFilePath5, FileChangeType.ADDED);
+		const addedFuture6 = awaitEvent(watcher, newFilePath6, FileChangeType.ADDED);
 
 		await Promise.all([
 			await Promises.writeFile(newFilePath1, 'Hello World 1'),
@@ -344,12 +341,12 @@ import { ltrim } from 'vs/base/common/strings';
 
 		// multiple change
 
-		const changeFuture1: Promise<unknown> = awaitEvent(watcher, newFilePath1, FileChangeType.UPDATED);
-		const changeFuture2: Promise<unknown> = awaitEvent(watcher, newFilePath2, FileChangeType.UPDATED);
-		const changeFuture3: Promise<unknown> = awaitEvent(watcher, newFilePath3, FileChangeType.UPDATED);
-		const changeFuture4: Promise<unknown> = awaitEvent(watcher, newFilePath4, FileChangeType.UPDATED);
-		const changeFuture5: Promise<unknown> = awaitEvent(watcher, newFilePath5, FileChangeType.UPDATED);
-		const changeFuture6: Promise<unknown> = awaitEvent(watcher, newFilePath6, FileChangeType.UPDATED);
+		const changeFuture1 = awaitEvent(watcher, newFilePath1, FileChangeType.UPDATED);
+		const changeFuture2 = awaitEvent(watcher, newFilePath2, FileChangeType.UPDATED);
+		const changeFuture3 = awaitEvent(watcher, newFilePath3, FileChangeType.UPDATED);
+		const changeFuture4 = awaitEvent(watcher, newFilePath4, FileChangeType.UPDATED);
+		const changeFuture5 = awaitEvent(watcher, newFilePath5, FileChangeType.UPDATED);
+		const changeFuture6 = awaitEvent(watcher, newFilePath6, FileChangeType.UPDATED);
 
 		await Promise.all([
 			await Promises.writeFile(newFilePath1, 'Hello Update 1'),
@@ -364,10 +361,10 @@ import { ltrim } from 'vs/base/common/strings';
 
 		// copy with multiple files
 
-		const copyFuture1: Promise<unknown> = awaitEvent(watcher, join(testDir, 'deep-multiple-copy', 'newFile-1.txt'), FileChangeType.ADDED);
-		const copyFuture2: Promise<unknown> = awaitEvent(watcher, join(testDir, 'deep-multiple-copy', 'newFile-2.txt'), FileChangeType.ADDED);
-		const copyFuture3: Promise<unknown> = awaitEvent(watcher, join(testDir, 'deep-multiple-copy', 'newFile-3.txt'), FileChangeType.ADDED);
-		const copyFuture4: Promise<unknown> = awaitEvent(watcher, join(testDir, 'deep-multiple-copy'), FileChangeType.ADDED);
+		const copyFuture1 = awaitEvent(watcher, join(testDir, 'deep-multiple-copy', 'newFile-1.txt'), FileChangeType.ADDED);
+		const copyFuture2 = awaitEvent(watcher, join(testDir, 'deep-multiple-copy', 'newFile-2.txt'), FileChangeType.ADDED);
+		const copyFuture3 = awaitEvent(watcher, join(testDir, 'deep-multiple-copy', 'newFile-3.txt'), FileChangeType.ADDED);
+		const copyFuture4 = awaitEvent(watcher, join(testDir, 'deep-multiple-copy'), FileChangeType.ADDED);
 
 		await Promises.copy(join(testDir, 'deep-multiple'), join(testDir, 'deep-multiple-copy'), { preserveSymlinks: false });
 
@@ -375,12 +372,12 @@ import { ltrim } from 'vs/base/common/strings';
 
 		// multiple delete (single files)
 
-		const deleteFuture1: Promise<unknown> = awaitEvent(watcher, newFilePath1, FileChangeType.DELETED);
-		const deleteFuture2: Promise<unknown> = awaitEvent(watcher, newFilePath2, FileChangeType.DELETED);
-		const deleteFuture3: Promise<unknown> = awaitEvent(watcher, newFilePath3, FileChangeType.DELETED);
-		const deleteFuture4: Promise<unknown> = awaitEvent(watcher, newFilePath4, FileChangeType.DELETED);
-		const deleteFuture5: Promise<unknown> = awaitEvent(watcher, newFilePath5, FileChangeType.DELETED);
-		const deleteFuture6: Promise<unknown> = awaitEvent(watcher, newFilePath6, FileChangeType.DELETED);
+		const deleteFuture1 = awaitEvent(watcher, newFilePath1, FileChangeType.DELETED);
+		const deleteFuture2 = awaitEvent(watcher, newFilePath2, FileChangeType.DELETED);
+		const deleteFuture3 = awaitEvent(watcher, newFilePath3, FileChangeType.DELETED);
+		const deleteFuture4 = awaitEvent(watcher, newFilePath4, FileChangeType.DELETED);
+		const deleteFuture5 = awaitEvent(watcher, newFilePath5, FileChangeType.DELETED);
+		const deleteFuture6 = awaitEvent(watcher, newFilePath6, FileChangeType.DELETED);
 
 		await Promise.all([
 			await Promises.unlink(newFilePath1),
@@ -395,8 +392,8 @@ import { ltrim } from 'vs/base/common/strings';
 
 		// multiple delete (folder)
 
-		const deleteFolderFuture1: Promise<unknown> = awaitEvent(watcher, join(testDir, 'deep-multiple'), FileChangeType.DELETED);
-		const deleteFolderFuture2: Promise<unknown> = awaitEvent(watcher, join(testDir, 'deep-multiple-copy'), FileChangeType.DELETED);
+		const deleteFolderFuture1 = awaitEvent(watcher, join(testDir, 'deep-multiple'), FileChangeType.DELETED);
+		const deleteFolderFuture2 = awaitEvent(watcher, join(testDir, 'deep-multiple-copy'), FileChangeType.DELETED);
 
 		await Promise.all([Promises.rm(join(testDir, 'deep-multiple'), RimRafMode.UNLINK), Promises.rm(join(testDir, 'deep-multiple-copy'), RimRafMode.UNLINK)]);
 
@@ -408,7 +405,7 @@ import { ltrim } from 'vs/base/common/strings';
 
 		// New file (*.txt)
 		let newTextFilePath = join(testDir, 'deep', 'newFile.txt');
-		let changeFuture: Promise<unknown> = awaitEvent(watcher, newTextFilePath, FileChangeType.ADDED);
+		let changeFuture = awaitEvent(watcher, newTextFilePath, FileChangeType.ADDED);
 		await Promises.writeFile(newTextFilePath, 'Hello World');
 		await changeFuture;
 
diff --git a/src/vs/platform/instantiation/common/instantiationService.ts b/src/vs/platform/instantiation/common/instantiationService.ts
index 659430cd332fb2..f0db479e3c1d49 100644
--- a/src/vs/platform/instantiation/common/instantiationService.ts
+++ b/src/vs/platform/instantiation/common/instantiationService.ts
@@ -309,6 +309,9 @@ export class InstantiationService implements IInstantiationService {
 				set(_target: T, p: PropertyKey, value: any): boolean {
 					idle.value[p] = value;
 					return true;
+				},
+				getPrototypeOf(_target: T) {
+					return ctor.prototype;
 				}
 			});
 		}
@@ -327,7 +330,10 @@ export class InstantiationService implements IInstantiationService {
 //#region -- tracing ---
 
 const enum TraceType {
-	Creation, Invocation, Branch
+	None = 0,
+	Creation = 1,
+	Invocation = 2,
+	Branch = 3,
 }
 
 export class Trace {
@@ -335,7 +341,7 @@ export class Trace {
 	static all = new Set<string>();
 
 	private static readonly _None = new class extends Trace {
-		constructor() { super(-1, null); }
+		constructor() { super(TraceType.None, null); }
 		override stop() { }
 		override branch() { return this; }
 	};
diff --git a/src/vs/platform/instantiation/test/common/instantiationService.test.ts b/src/vs/platform/instantiation/test/common/instantiationService.test.ts
index fabe3100318613..4a7d45c5989573 100644
--- a/src/vs/platform/instantiation/test/common/instantiationService.test.ts
+++ b/src/vs/platform/instantiation/test/common/instantiationService.test.ts
@@ -382,7 +382,7 @@ suite('Instantiation Service', () => {
 		// and then Servce2 should not be created a second time
 		const Service21 = createDecorator<any>('service21');
 		class Service21Impl {
-			constructor(@Service2 readonly service2: Service2Impl, @Service1 readonly service1: Service1Impl) { }
+			constructor(@Service2 public readonly service2: Service2Impl, @Service1 public readonly service1: Service1Impl) { }
 		}
 
 		const insta = new InstantiationService(new ServiceCollection(
@@ -403,7 +403,7 @@ suite('Instantiation Service', () => {
 		interface B { _serviceBrand: undefined; b(): boolean }
 
 		class BConsumer {
-			constructor(@B readonly b: B) {
+			constructor(@B private readonly b: B) {
 
 			}
 			doIt() {
@@ -493,7 +493,7 @@ suite('Instantiation Service', () => {
 		), true, undefined, true);
 
 		class Consumer {
-			constructor(@A readonly a: A) {
+			constructor(@A public readonly a: A) {
 				// eager subscribe -> NO service instance
 			}
 		}
diff --git a/src/vs/platform/issue/electron-main/issueMainService.ts b/src/vs/platform/issue/electron-main/issueMainService.ts
index c1967961955df6..91a91d5667eccc 100644
--- a/src/vs/platform/issue/electron-main/issueMainService.ts
+++ b/src/vs/platform/issue/electron-main/issueMainService.ts
@@ -28,7 +28,11 @@ import { IWindowState } from 'vs/platform/window/electron-main/window';
 import { randomPath } from 'vs/base/common/extpath';
 import { withNullAsUndefined } from 'vs/base/common/types';
 
+import { IApplicationStorageMainService } from 'vs/platform/storage/electron-main/storageMainService';
+import { StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
+
 export const IIssueMainService = createDecorator<IIssueMainService>('issueMainService');
+const processExplorerWindowState = 'issue.processExplorerWindowState';
 
 interface IBrowserWindowOptions {
 	backgroundColor: string | undefined;
@@ -37,6 +41,8 @@ interface IBrowserWindowOptions {
 	alwaysOnTop: boolean;
 }
 
+type IStrictWindowState = Required<Pick<IWindowState, 'x' | 'y' | 'width' | 'height'>>;
+
 export interface IIssueMainService extends ICommonIssueService {
 	stopTracing(): Promise<void>;
 }
@@ -62,7 +68,8 @@ export class IssueMainService implements IIssueMainService {
 		@IDialogMainService private readonly dialogMainService: IDialogMainService,
 		@INativeHostMainService private readonly nativeHostMainService: INativeHostMainService,
 		@IProtocolMainService private readonly protocolMainService: IProtocolMainService,
-		@IProductService private readonly productService: IProductService
+		@IProductService private readonly productService: IProductService,
+		@IApplicationStorageMainService private readonly applicationStorageMainService: IApplicationStorageMainService
 	) {
 		this.registerListeners();
 	}
@@ -196,6 +203,14 @@ export class IssueMainService implements IIssueMainService {
 		}
 	}
 
+	private safeParseJson(text: string | undefined, defaultObject: any) {
+		try {
+			return text ? JSON.parse(text) || defaultObject : defaultObject;
+		} catch (e) {
+			return defaultObject;
+		}
+	}
+
 	async openReporter(data: IssueReporterData): Promise<void> {
 		if (!this.issueReporterWindow) {
 			this.issueReporterParentWindow = BrowserWindow.getFocusedWindow();
@@ -260,7 +275,14 @@ export class IssueMainService implements IIssueMainService {
 				const processExplorerDisposables = new DisposableStore();
 
 				const processExplorerWindowConfigUrl = processExplorerDisposables.add(this.protocolMainService.createIPCObjectUrl<ProcessExplorerWindowConfiguration>());
-				const position = this.getWindowPosition(this.processExplorerParentWindow, 800, 500);
+
+				const savedPosition = this.safeParseJson(this.applicationStorageMainService.get(processExplorerWindowState, StorageScope.APPLICATION), undefined);
+				const position = isStrictWindowState(savedPosition) ? savedPosition : this.getWindowPosition(this.processExplorerParentWindow, 800, 500);
+
+				// Correct dimensions to take scale/dpr into account
+				const displayToUse = screen.getDisplayNearestPoint({ x: position.x!, y: position.y! });
+				position.width /= displayToUse.scaleFactor;
+				position.height /= displayToUse.scaleFactor;
 
 				this.processExplorerWindow = this.createBrowserWindow(position, processExplorerWindowConfigUrl, {
 					backgroundColor: data.styles.backgroundColor,
@@ -295,6 +317,27 @@ export class IssueMainService implements IIssueMainService {
 						processExplorerDisposables.dispose();
 					}
 				});
+
+				const storeState = () => {
+					if (!this.processExplorerWindow) {
+						return;
+					}
+					const size = this.processExplorerWindow.getSize();
+					const position = this.processExplorerWindow.getPosition();
+					if (!size || !position) {
+						return;
+					}
+					const state: IWindowState = {
+						width: size[0],
+						height: size[1],
+						x: position[0],
+						y: position[1]
+					};
+					this.applicationStorageMainService.store(processExplorerWindowState, JSON.stringify(state), StorageScope.APPLICATION, StorageTarget.MACHINE);
+				};
+
+				this.processExplorerWindow.on('moved', storeState);
+				this.processExplorerWindow.on('resized', storeState);
 			}
 		}
 
@@ -349,7 +392,7 @@ export class IssueMainService implements IIssueMainService {
 		return this.diagnosticsService.getDiagnostics(info, remoteData);
 	}
 
-	private getWindowPosition(parentWindow: BrowserWindow, defaultWidth: number, defaultHeight: number): IWindowState {
+	private getWindowPosition(parentWindow: BrowserWindow, defaultWidth: number, defaultHeight: number): IStrictWindowState {
 
 		// We want the new window to open on the same display that the parent is in
 		let displayToUse: Display | undefined;
@@ -380,15 +423,15 @@ export class IssueMainService implements IIssueMainService {
 			}
 		}
 
-		const state: IWindowState = {
+		const displayBounds = displayToUse.bounds;
+
+		const state: IStrictWindowState = {
 			width: defaultWidth,
-			height: defaultHeight
+			height: defaultHeight,
+			x: displayBounds.x + (displayBounds.width / 2) - (defaultWidth / 2),
+			y: displayBounds.y + (displayBounds.height / 2) - (defaultHeight / 2)
 		};
 
-		const displayBounds = displayToUse.bounds;
-		state.x = displayBounds.x + (displayBounds.width / 2) - (state.width! / 2);
-		state.y = displayBounds.y + (displayBounds.height / 2) - (state.height! / 2);
-
 		if (displayBounds.width > 0 && displayBounds.height > 0 /* Linux X11 sessions sometimes report wrong display bounds */) {
 			if (state.x < displayBounds.x) {
 				state.x = displayBounds.x; // prevent window from falling out of the screen to the left
@@ -451,3 +494,15 @@ export class IssueMainService implements IIssueMainService {
 		this.nativeHostMainService.showItemInFolder(undefined, path);
 	}
 }
+
+function isStrictWindowState(obj: unknown): obj is IStrictWindowState {
+	if (typeof obj !== 'object' || obj === null) {
+		return false;
+	}
+	return (
+		'x' in obj &&
+		'y' in obj &&
+		'width' in obj &&
+		'height' in obj
+	);
+}
diff --git a/src/vs/platform/keybinding/common/keybinding.ts b/src/vs/platform/keybinding/common/keybinding.ts
index effdf15f3366f7..dbb2e1ff129849 100644
--- a/src/vs/platform/keybinding/common/keybinding.ts
+++ b/src/vs/platform/keybinding/common/keybinding.ts
@@ -26,6 +26,7 @@ export interface IKeyboardEvent {
 	readonly shiftKey: boolean;
 	readonly altKey: boolean;
 	readonly metaKey: boolean;
+	readonly altGraphKey: boolean;
 	readonly keyCode: KeyCode;
 	readonly code: string;
 }
diff --git a/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts b/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts
index cada490a6a09b8..153cb5f852a27a 100644
--- a/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts
+++ b/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts
@@ -77,6 +77,7 @@ suite('AbstractKeybindingService', () => {
 				shiftKey: keybinding.shiftKey,
 				altKey: keybinding.altKey,
 				metaKey: keybinding.metaKey,
+				altGraphKey: false,
 				keyCode: keybinding.keyCode,
 				code: null!
 			}, null!);
diff --git a/src/vs/platform/keyboardLayout/common/dispatchConfig.ts b/src/vs/platform/keyboardLayout/common/dispatchConfig.ts
deleted file mode 100644
index a92871c7e96a1b..00000000000000
--- a/src/vs/platform/keyboardLayout/common/dispatchConfig.ts
+++ /dev/null
@@ -1,17 +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 { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-
-export const enum DispatchConfig {
-	Code,
-	KeyCode
-}
-
-export function getDispatchConfig(configurationService: IConfigurationService): DispatchConfig {
-	const keyboard = configurationService.getValue('keyboard');
-	const r = (keyboard ? (<any>keyboard).dispatch : null);
-	return (r === 'keyCode' ? DispatchConfig.KeyCode : DispatchConfig.Code);
-}
\ No newline at end of file
diff --git a/src/vs/platform/keyboardLayout/common/keyboardConfig.ts b/src/vs/platform/keyboardLayout/common/keyboardConfig.ts
new file mode 100644
index 00000000000000..e9e83dcd70f39d
--- /dev/null
+++ b/src/vs/platform/keyboardLayout/common/keyboardConfig.ts
@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as nls from 'vs/nls';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { OS, OperatingSystem } from 'vs/base/common/platform';
+import { ConfigurationScope, Extensions as ConfigExtensions, IConfigurationNode, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
+import { Registry } from 'vs/platform/registry/common/platform';
+
+export const enum DispatchConfig {
+	Code,
+	KeyCode
+}
+
+export interface IKeyboardConfig {
+	dispatch: DispatchConfig;
+	mapAltGrToCtrlAlt: boolean;
+}
+
+export function readKeyboardConfig(configurationService: IConfigurationService): IKeyboardConfig {
+	const keyboard = configurationService.getValue<{ dispatch: any; mapAltGrToCtrlAlt: any } | undefined>('keyboard');
+	const dispatch = (keyboard?.dispatch === 'keyCode' ? DispatchConfig.KeyCode : DispatchConfig.Code);
+	const mapAltGrToCtrlAlt = Boolean(keyboard?.mapAltGrToCtrlAlt);
+	return { dispatch, mapAltGrToCtrlAlt };
+}
+
+const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigExtensions.Configuration);
+const keyboardConfiguration: IConfigurationNode = {
+	'id': 'keyboard',
+	'order': 15,
+	'type': 'object',
+	'title': nls.localize('keyboardConfigurationTitle', "Keyboard"),
+	'properties': {
+		'keyboard.dispatch': {
+			scope: ConfigurationScope.APPLICATION,
+			type: 'string',
+			enum: ['code', 'keyCode'],
+			default: 'code',
+			markdownDescription: nls.localize('dispatch', "Controls the dispatching logic for key presses to use either `code` (recommended) or `keyCode`."),
+			included: OS === OperatingSystem.Macintosh || OS === OperatingSystem.Linux
+		},
+		'keyboard.mapAltGrToCtrlAlt': {
+			scope: ConfigurationScope.APPLICATION,
+			type: 'boolean',
+			default: false,
+			markdownDescription: nls.localize('mapAltGrToCtrlAlt', "Controls if the AltGraph+ modifier should be treated as Ctrl+Alt+."),
+			included: OS === OperatingSystem.Windows
+		}
+	}
+};
+
+configurationRegistry.registerConfiguration(keyboardConfiguration);
diff --git a/src/vs/platform/keyboardLayout/common/keyboardLayout.ts b/src/vs/platform/keyboardLayout/common/keyboardLayout.ts
index 3f842d30d96d17..ee6c1d894619f8 100644
--- a/src/vs/platform/keyboardLayout/common/keyboardLayout.ts
+++ b/src/vs/platform/keyboardLayout/common/keyboardLayout.ts
@@ -7,7 +7,6 @@ import { Event } from 'vs/base/common/event';
 import { ScanCode, ScanCodeUtils } from 'vs/base/common/keyCodes';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
-import { DispatchConfig } from 'vs/platform/keyboardLayout/common/dispatchConfig';
 import { IKeyboardMapper } from 'vs/platform/keyboardLayout/common/keyboardMapper';
 
 export const IKeyboardLayoutService = createDecorator<IKeyboardLayoutService>('keyboardLayoutService');
@@ -80,7 +79,7 @@ export interface IKeyboardLayoutService {
 	getRawKeyboardMapping(): IKeyboardMapping | null;
 	getCurrentKeyboardLayout(): IKeyboardLayoutInfo | null;
 	getAllKeyboardLayouts(): IKeyboardLayoutInfo[];
-	getKeyboardMapper(dispatchConfig: DispatchConfig): IKeyboardMapper;
+	getKeyboardMapper(): IKeyboardMapper;
 	validateCurrentKeyboardMapping(keyboardEvent: IKeyboardEvent): void;
 }
 
diff --git a/src/vs/platform/label/common/label.ts b/src/vs/platform/label/common/label.ts
index e5b6b8a10458b2..60d6acb858a989 100644
--- a/src/vs/platform/label/common/label.ts
+++ b/src/vs/platform/label/common/label.ts
@@ -23,7 +23,7 @@ export interface ILabelService {
 	 */
 	getUriLabel(resource: URI, options?: { relative?: boolean; noPrefix?: boolean; separator?: '/' | '\\' }): string;
 	getUriBasenameLabel(resource: URI): string;
-	getWorkspaceLabel(workspace: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI | IWorkspace), options?: { verbose: boolean }): string;
+	getWorkspaceLabel(workspace: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI | IWorkspace), options?: { verbose: Verbosity }): string;
 	getHostLabel(scheme: string, authority?: string): string;
 	getHostTooltip(scheme: string, authority?: string): string | undefined;
 	getSeparator(scheme: string, authority?: string): '/' | '\\';
@@ -39,6 +39,12 @@ export interface ILabelService {
 	registerCachedFormatter(formatter: ResourceLabelFormatter): IDisposable;
 }
 
+export const enum Verbosity {
+	SHORT,
+	MEDIUM,
+	LONG
+}
+
 export interface IFormatterChangeEvent {
 	scheme: string;
 }
diff --git a/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts b/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts
index 72c83416a674d2..e8e12ac067f87a 100644
--- a/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts
+++ b/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts
@@ -26,17 +26,17 @@ interface WindowLoadEvent {
 	/**
 	 * The window that is loaded to a new workspace.
 	 */
-	window: ICodeWindow;
+	readonly window: ICodeWindow;
 
 	/**
 	 * The workspace the window is loaded into.
 	 */
-	workspace: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | undefined;
+	readonly workspace: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | undefined;
 
 	/**
 	 * More details why the window loads to a new workspace.
 	 */
-	reason: LoadReason;
+	readonly reason: LoadReason;
 }
 
 export const enum ShutdownReason {
diff --git a/src/vs/platform/policy/common/filePolicyService.ts b/src/vs/platform/policy/common/filePolicyService.ts
index 6695d82e3be8b3..3d3a1531e92c53 100644
--- a/src/vs/platform/policy/common/filePolicyService.ts
+++ b/src/vs/platform/policy/common/filePolicyService.ts
@@ -15,7 +15,7 @@ import { AbstractPolicyService, IPolicyService, PolicyName, PolicyValue } from '
 function keysDiff<T>(a: Map<string, T>, b: Map<string, T>): string[] {
 	const result: string[] = [];
 
-	for (const key of Iterable.concat(a.keys(), b.keys())) {
+	for (const key of new Set(Iterable.concat(a.keys(), b.keys()))) {
 		if (a.get(key) !== b.get(key)) {
 			result.push(key);
 		}
diff --git a/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorker.ts b/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorker.ts
index 19845b7208da52..ebe15db7288a4c 100644
--- a/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorker.ts
+++ b/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorker.ts
@@ -29,7 +29,7 @@ class ProfileAnalysisWorker implements IRequestHandler, IProfileAnalysisWorker {
 		const samples = bottomUp(model, 5, false)
 			.filter(s => !s.isSpecial);
 
-		if (samples.length === 0 || samples[1].percentage < 10) {
+		if (samples.length === 0 || samples[0].percentage < 10) {
 			// ignore this profile because 90% of the time is spent inside "special" frames
 			// like idle, GC, or program
 			return { kind: ProfilingOutput.Irrelevant, samples: [] };
@@ -85,23 +85,43 @@ function printCallFrame(frame: CdpCallFrame, fullPaths: boolean): string {
 			result += ':';
 			result += frame.lineNumber + 1;
 		}
+		if (frame.columnNumber >= 0) {
+			result += ',';
+			result += frame.columnNumber + 1;
+		}
 	}
 	return result;
 }
 
-function bottomUp(model: IProfileModel, topN: number, fullPaths: boolean = false) {
+function getHeaviestLocationIds(model: IProfileModel, topN: number) {
+	const stackSelfTime: { [locationId: number]: number } = {};
+	for (const node of model.nodes) {
+		stackSelfTime[node.locationId] = (stackSelfTime[node.locationId] || 0) + node.selfTime;
+	}
+
+	const locationIds = Object.entries(stackSelfTime)
+		.sort(([, a], [, b]) => b - a)
+		.slice(0, topN)
+		.map(([locationId]) => Number(locationId));
 
+	return new Set(locationIds);
+}
+
+function bottomUp(model: IProfileModel, topN: number, fullPaths: boolean = false) {
 	const root = BottomUpNode.root();
+	const locationIds = getHeaviestLocationIds(model, topN);
+
 	for (const node of model.nodes) {
-		processNode(root, node, model);
-		root.addNode(node);
+		if (locationIds.has(node.locationId)) {
+			processNode(root, node, model);
+			root.addNode(node);
+		}
 	}
 
 	const result = Object.values(root.children)
 		.sort((a, b) => b.selfTime - a.selfTime)
 		.slice(0, topN);
 
-
 	const samples: BottomUpSample[] = [];
 
 	for (const node of result) {
diff --git a/src/vs/platform/quickinput/browser/quickInput.ts b/src/vs/platform/quickinput/browser/quickInput.ts
index a6a0f7ec7ccc45..83d992a2ddf2d5 100644
--- a/src/vs/platform/quickinput/browser/quickInput.ts
+++ b/src/vs/platform/quickinput/browser/quickInput.ts
@@ -16,8 +16,8 @@ import { IWorkbenchListOptions, WorkbenchList } from 'vs/platform/list/browser/l
 import { QuickAccessController } from 'vs/platform/quickinput/browser/quickAccess';
 import { IQuickAccessController } from 'vs/platform/quickinput/common/quickAccess';
 import { IInputBox, IInputOptions, IKeyMods, IPickOptions, IQuickInputButton, IQuickInputService, IQuickNavigateConfiguration, IQuickPick, IQuickPickItem, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
-import { defaultButtonStyles, defaultInputBoxStyles, defaultKeybindingLabelStyles, defaultProgressBarStyles, defaultToggleStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { activeContrastBorder, badgeBackground, badgeForeground, contrastBorder, pickerGroupBorder, pickerGroupForeground, quickInputBackground, quickInputForeground, quickInputListFocusBackground, quickInputListFocusForeground, quickInputListFocusIconForeground, quickInputTitleBackground, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
+import { defaultButtonStyles, defaultCountBadgeStyles, defaultInputBoxStyles, defaultKeybindingLabelStyles, defaultProgressBarStyles, defaultToggleStyles } from 'vs/platform/theme/browser/defaultStyles';
+import { activeContrastBorder, pickerGroupBorder, pickerGroupForeground, quickInputBackground, quickInputForeground, quickInputListFocusBackground, quickInputListFocusForeground, quickInputListFocusIconForeground, quickInputTitleBackground, widgetBorder, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
 import { computeStyles } from 'vs/platform/theme/common/styler';
 import { IThemeService, Themable } from 'vs/platform/theme/common/themeService';
 
@@ -190,17 +190,13 @@ export class QuickInputService extends Themable implements IQuickInputService {
 					quickInputBackground,
 					quickInputForeground,
 					quickInputTitleBackground,
-					contrastBorder,
+					widgetBorder,
 					widgetShadow
 				}),
 			},
 			inputBox: defaultInputBoxStyles,
 			toggle: defaultToggleStyles,
-			countBadge: computeStyles(this.theme, {
-				badgeBackground,
-				badgeForeground,
-				badgeBorder: contrastBorder
-			}),
+			countBadge: defaultCountBadgeStyles,
 			button: defaultButtonStyles,
 			progressBar: defaultProgressBarStyles, // default uses progressBarBackground
 			keybindingLabel: defaultKeybindingLabelStyles,
diff --git a/src/vs/platform/remote/common/remoteAgentConnection.ts b/src/vs/platform/remote/common/remoteAgentConnection.ts
index e3e72781d7e5a4..f1b22d74b1c254 100644
--- a/src/vs/platform/remote/common/remoteAgentConnection.ts
+++ b/src/vs/platform/remote/common/remoteAgentConnection.ts
@@ -11,7 +11,7 @@ import { Emitter } from 'vs/base/common/event';
 import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { generateUuid } from 'vs/base/common/uuid';
 import { IIPCLogger } from 'vs/base/parts/ipc/common/ipc';
-import { Client, ISocket, PersistentProtocol, SocketCloseEventType } from 'vs/base/parts/ipc/common/ipc.net';
+import { Client, ConnectionHealth, ISocket, PersistentProtocol, ProtocolConstants, SocketCloseEventType } from 'vs/base/parts/ipc/common/ipc.net';
 import { ILogService } from 'vs/platform/log/common/log';
 import { RemoteAgentConnectionContext } from 'vs/platform/remote/common/remoteAgentEnvironment';
 import { RemoteAuthorityResolverError } from 'vs/platform/remote/common/remoteAuthorityResolver';
@@ -249,7 +249,7 @@ async function connectToRemoteExtensionHostAgent(options: ISimpleConnectionOptio
 		protocol = options.reconnectionProtocol;
 		ownsProtocol = false;
 	} else {
-		protocol = new PersistentProtocol(socket, null);
+		protocol = new PersistentProtocol({ socket, measureRoundTripTime: true });
 		ownsProtocol = true;
 	}
 
@@ -483,7 +483,8 @@ export const enum PersistentConnectionEventType {
 	ReconnectionWait,
 	ReconnectionRunning,
 	ReconnectionPermanentFailure,
-	ConnectionGain
+	ConnectionGain,
+	ConnectionHealthChanged
 }
 export class ConnectionLostEvent {
 	public readonly type = PersistentConnectionEventType.ConnectionLost;
@@ -521,6 +522,13 @@ export class ConnectionGainEvent {
 		public readonly attempt: number
 	) { }
 }
+export class ConnectionHealthChangedEvent {
+	public readonly type = PersistentConnectionEventType.ConnectionHealthChanged;
+	constructor(
+		public readonly reconnectionToken: string,
+		public readonly connectionHealth: ConnectionHealth
+	) { }
+}
 export class ReconnectionPermanentFailureEvent {
 	public readonly type = PersistentConnectionEventType.ReconnectionPermanentFailure;
 	constructor(
@@ -530,7 +538,7 @@ export class ReconnectionPermanentFailureEvent {
 		public readonly handled: boolean
 	) { }
 }
-export type PersistentConnectionEvent = ConnectionGainEvent | ConnectionLostEvent | ReconnectionWaitEvent | ReconnectionRunningEvent | ReconnectionPermanentFailureEvent;
+export type PersistentConnectionEvent = ConnectionGainEvent | ConnectionHealthChangedEvent | ConnectionLostEvent | ReconnectionWaitEvent | ReconnectionRunningEvent | ReconnectionPermanentFailureEvent;
 
 export abstract class PersistentConnection extends Disposable {
 
@@ -600,6 +608,13 @@ export abstract class PersistentConnection extends Disposable {
 			this._options.logService.info(`${logPrefix} received socket timeout event (unacknowledgedMsgCount: ${e.unacknowledgedMsgCount}, timeSinceOldestUnacknowledgedMsg: ${e.timeSinceOldestUnacknowledgedMsg}, timeSinceLastReceivedSomeData: ${e.timeSinceLastReceivedSomeData}).`);
 			this._beginReconnecting();
 		}));
+		this._register(protocol.onHighRoundTripTime((e) => {
+			const logPrefix = _commonLogPrefix(this._connectionType, this.reconnectionToken);
+			this._options.logService.info(`${logPrefix} high roundtrip time: ${e.roundTripTime}ms (${e.recentHighRoundTripCount} of ${ProtocolConstants.LatencySampleCount} recent samples)`);
+		}));
+		this._register(protocol.onDidChangeConnectionHealth((connectionHealth) => {
+			this._onDidStateChange.fire(new ConnectionHealthChangedEvent(this.reconnectionToken, connectionHealth));
+		}));
 
 		PersistentConnection._instances.push(this);
 		this._register(toDisposable(() => {
@@ -792,8 +807,12 @@ function stringRightPad(str: string, len: number): string {
 	return str;
 }
 
+function _commonLogPrefix(connectionType: ConnectionType, reconnectionToken: string): string {
+	return `[remote-connection][${stringRightPad(connectionTypeToString(connectionType), 13)}][${reconnectionToken.substr(0, 5)}…]`;
+}
+
 function commonLogPrefix(connectionType: ConnectionType, reconnectionToken: string, isReconnect: boolean): string {
-	return `[remote-connection][${stringRightPad(connectionTypeToString(connectionType), 13)}][${reconnectionToken.substr(0, 5)}…][${isReconnect ? 'reconnect' : 'initial'}]`;
+	return `${_commonLogPrefix(connectionType, reconnectionToken)}[${isReconnect ? 'reconnect' : 'initial'}]`;
 }
 
 function connectLogPrefix(options: ISimpleConnectionOptions, connectionType: ConnectionType): string {
diff --git a/src/vs/platform/remoteTunnel/common/remoteTunnel.ts b/src/vs/platform/remoteTunnel/common/remoteTunnel.ts
index 16a7aa1e56dacd..831686e6123447 100644
--- a/src/vs/platform/remoteTunnel/common/remoteTunnel.ts
+++ b/src/vs/platform/remoteTunnel/common/remoteTunnel.ts
@@ -25,6 +25,8 @@ export interface IRemoteTunnelService {
 	readonly onDidChangeAccount: Event<IRemoteTunnelAccount | undefined>;
 	updateAccount(account: IRemoteTunnelAccount | undefined): Promise<TunnelStatus>;
 
+	getHostName(): Promise<string | undefined>;
+
 }
 
 export type TunnelStatus = TunnelStates.Connected | TunnelStates.Disconnected | TunnelStates.Connecting | TunnelStates.Uninitialized;
diff --git a/src/vs/platform/remoteTunnel/electron-browser/remoteTunnelService.ts b/src/vs/platform/remoteTunnel/electron-browser/remoteTunnelService.ts
index 3fb8c1c812c8f4..0b1d38f5807f7f 100644
--- a/src/vs/platform/remoteTunnel/electron-browser/remoteTunnelService.ts
+++ b/src/vs/platform/remoteTunnel/electron-browser/remoteTunnelService.ts
@@ -171,7 +171,7 @@ export class RemoteTunnelService extends Disposable implements IRemoteTunnelServ
 			return;
 		}
 
-		const hostName = this.getHostName();
+		const hostName = this._getHostName();
 		if (hostName) {
 			this.setTunnelStatus(TunnelStates.connecting(localize({ key: 'remoteTunnelService.openTunnelWithName', comment: ['{0} is a host name'] }, 'Opening tunnel for {0}', hostName)));
 		} else {
@@ -279,9 +279,13 @@ export class RemoteTunnelService extends Disposable implements IRemoteTunnelServ
 		});
 	}
 
-	private getHostName() {
+	public async getHostName(): Promise<string | undefined> {
+		return this._getHostName();
+	}
+
+	private _getHostName(): string | undefined {
 		let name = this.configurationService.getValue<string>(CONFIGURATION_KEY_HOST_NAME) || hostname();
-		name = name.replace(/[^\w-]/g, '').substring(0, 20);
+		name = name.replace(/^-+/g, '').replace(/[^\w-]/g, '').substring(0, 20);
 		return name || undefined;
 	}
 
diff --git a/src/vs/platform/request/common/request.ts b/src/vs/platform/request/common/request.ts
index ede2afcf7f3195..af45363bdb1b27 100644
--- a/src/vs/platform/request/common/request.ts
+++ b/src/vs/platform/request/common/request.ts
@@ -62,14 +62,6 @@ export async function asJson<T = {}>(context: IRequestContext): Promise<T | null
 }
 
 
-export interface IHTTPConfiguration {
-	http?: {
-		proxy?: string;
-		proxyStrictSSL?: boolean;
-		proxyAuthorization?: string;
-	};
-}
-
 export function updateProxyConfigurationsScope(scope: ConfigurationScope): void {
 	registerProxyConfigurations(scope);
 }
diff --git a/src/vs/platform/request/node/requestService.ts b/src/vs/platform/request/node/requestService.ts
index 482636e68b7193..3cab0d4fd0702e 100644
--- a/src/vs/platform/request/node/requestService.ts
+++ b/src/vs/platform/request/node/requestService.ts
@@ -18,10 +18,16 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
 import { getResolvedShellEnv } from 'vs/platform/shell/node/shellEnv';
 import { ILogService } from 'vs/platform/log/common/log';
-import { IHTTPConfiguration, IRequestService } from 'vs/platform/request/common/request';
+import { IRequestService } from 'vs/platform/request/common/request';
 import { Agent, getProxyAgent } from 'vs/platform/request/node/proxy';
 import { createGunzip } from 'zlib';
 
+interface IHTTPConfiguration {
+	proxy?: string;
+	proxyStrictSSL?: boolean;
+	proxyAuthorization?: string;
+}
+
 export interface IRawRequestFunction {
 	(options: http.RequestOptions, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
 }
@@ -47,19 +53,24 @@ export class RequestService extends Disposable implements IRequestService {
 	private shellEnvErrorLogged?: boolean;
 
 	constructor(
-		@IConfigurationService configurationService: IConfigurationService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@INativeEnvironmentService private readonly environmentService: INativeEnvironmentService,
 		@ILogService private readonly logService: ILogService
 	) {
 		super();
-		this.configure(configurationService.getValue<IHTTPConfiguration>());
-		this._register(configurationService.onDidChangeConfiguration(() => this.configure(configurationService.getValue()), this));
+		this.configure();
+		this._register(configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('http')) {
+				this.configure();
+			}
+		}));
 	}
 
-	private configure(config: IHTTPConfiguration) {
-		this.proxyUrl = config.http && config.http.proxy;
-		this.strictSSL = !!(config.http && config.http.proxyStrictSSL);
-		this.authorization = config.http && config.http.proxyAuthorization;
+	private configure() {
+		const config = this.configurationService.getValue<IHTTPConfiguration | undefined>('http');
+		this.proxyUrl = config?.proxy;
+		this.strictSSL = !!config?.proxyStrictSSL;
+		this.authorization = config?.proxyAuthorization;
 	}
 
 	async request(options: NodeRequestOptions, token: CancellationToken): Promise<IRequestContext> {
@@ -69,7 +80,7 @@ export class RequestService extends Disposable implements IRequestService {
 
 		let shellEnv: typeof process.env | undefined = undefined;
 		try {
-			shellEnv = await getResolvedShellEnv(this.logService, this.environmentService.args, process.env);
+			shellEnv = await getResolvedShellEnv(this.configurationService, this.logService, this.environmentService.args, process.env);
 		} catch (error) {
 			if (!this.shellEnvErrorLogged) {
 				this.shellEnvErrorLogged = true;
diff --git a/src/vs/platform/severityIcon/browser/media/severityIcon.css b/src/vs/platform/severityIcon/browser/media/severityIcon.css
new file mode 100644
index 00000000000000..06681b4c2b895d
--- /dev/null
+++ b/src/vs/platform/severityIcon/browser/media/severityIcon.css
@@ -0,0 +1,31 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.monaco-editor .zone-widget .codicon.codicon-error,
+.markers-panel .marker-icon.codicon.codicon-error,
+.text-search-provider-messages .providerMessage .codicon.codicon-error,
+.extensions-viewlet > .extensions .codicon.codicon-error,
+.extension-editor .codicon.codicon-error,
+.preferences-editor .codicon.codicon-error {
+	color: var(--vscode-problemsErrorIcon-foreground);
+}
+
+.monaco-editor .zone-widget .codicon.codicon-warning,
+.markers-panel .marker-icon.codicon.codicon-warning,
+.text-search-provider-messages .providerMessage .codicon.codicon-warning,
+.extensions-viewlet > .extensions .codicon.codicon-warning,
+.extension-editor .codicon.codicon-warning,
+.preferences-editor .codicon.codicon-warning {
+	color: var(--vscode-problemsWarningIcon-foreground);
+}
+
+.monaco-editor .zone-widget .codicon.codicon-info,
+.markers-panel .marker-icon.codicon.codicon-info,
+.text-search-provider-messages .providerMessage .codicon.codicon-info,
+.extensions-viewlet > .extensions .codicon.codicon-info,
+.extension-editor .codicon.codicon-info,
+.preferences-editor .codicon.codicon-info {
+	color: var(--vscode-problemsInfoIcon-foreground);
+}
diff --git a/src/vs/platform/severityIcon/browser/severityIcon.ts b/src/vs/platform/severityIcon/browser/severityIcon.ts
new file mode 100644
index 00000000000000..342130d9f14509
--- /dev/null
+++ b/src/vs/platform/severityIcon/browser/severityIcon.ts
@@ -0,0 +1,26 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import 'vs/css!./media/severityIcon';
+import { Codicon } from 'vs/base/common/codicons';
+import Severity from 'vs/base/common/severity';
+
+export namespace SeverityIcon {
+
+	export function className(severity: Severity): string {
+		switch (severity) {
+			case Severity.Ignore:
+				return 'severity-ignore ' + Codicon.info.classNames;
+			case Severity.Info:
+				return Codicon.info.classNames;
+			case Severity.Warning:
+				return Codicon.warning.classNames;
+			case Severity.Error:
+				return Codicon.error.classNames;
+			default:
+				return '';
+		}
+	}
+}
diff --git a/src/vs/platform/severityIcon/common/severityIcon.ts b/src/vs/platform/severityIcon/common/severityIcon.ts
deleted file mode 100644
index ab4a30576f4810..00000000000000
--- a/src/vs/platform/severityIcon/common/severityIcon.ts
+++ /dev/null
@@ -1,72 +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 'vs/base/common/codicons';
-import Severity from 'vs/base/common/severity';
-import { problemsErrorIconForeground, problemsInfoIconForeground, problemsWarningIconForeground } from 'vs/platform/theme/common/colorRegistry';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-
-export namespace SeverityIcon {
-
-	export function className(severity: Severity): string {
-		switch (severity) {
-			case Severity.Ignore:
-				return 'severity-ignore ' + Codicon.info.classNames;
-			case Severity.Info:
-				return Codicon.info.classNames;
-			case Severity.Warning:
-				return Codicon.warning.classNames;
-			case Severity.Error:
-				return Codicon.error.classNames;
-			default:
-				return '';
-		}
-	}
-}
-
-registerThemingParticipant((theme, collector) => {
-
-	const errorIconForeground = theme.getColor(problemsErrorIconForeground);
-	if (errorIconForeground) {
-		const errorCodiconSelector = Codicon.error.cssSelector;
-		collector.addRule(`
-			.monaco-editor .zone-widget ${errorCodiconSelector},
-			.markers-panel .marker-icon${errorCodiconSelector},
-			.text-search-provider-messages .providerMessage ${errorCodiconSelector},
-			.extensions-viewlet > .extensions ${errorCodiconSelector} {
-				color: ${errorIconForeground};
-			}
-		`);
-	}
-
-	const warningIconForeground = theme.getColor(problemsWarningIconForeground);
-	if (warningIconForeground) {
-		const warningCodiconSelector = Codicon.warning.cssSelector;
-		collector.addRule(`
-			.monaco-editor .zone-widget ${warningCodiconSelector},
-			.markers-panel .marker-icon${warningCodiconSelector},
-			.extensions-viewlet > .extensions ${warningCodiconSelector},
-			.extension-editor ${warningCodiconSelector},
-			.text-search-provider-messages .providerMessage ${warningCodiconSelector},
-			.preferences-editor ${warningCodiconSelector} {
-				color: ${warningIconForeground};
-			}
-		`);
-	}
-
-	const infoIconForeground = theme.getColor(problemsInfoIconForeground);
-	if (infoIconForeground) {
-		const infoCodiconSelector = Codicon.info.cssSelector;
-		collector.addRule(`
-			.monaco-editor .zone-widget ${infoCodiconSelector},
-			.markers-panel .marker-icon${infoCodiconSelector},
-			.extensions-viewlet > .extensions ${infoCodiconSelector},
-			.text-search-provider-messages .providerMessage ${infoCodiconSelector},
-			.extension-editor ${infoCodiconSelector} {
-				color: ${infoIconForeground};
-			}
-		`);
-	}
-});
diff --git a/src/vs/platform/shell/node/shellEnv.ts b/src/vs/platform/shell/node/shellEnv.ts
index bcda35eac8b96d..e84f86ff9f88e9 100644
--- a/src/vs/platform/shell/node/shellEnv.ts
+++ b/src/vs/platform/shell/node/shellEnv.ts
@@ -8,7 +8,7 @@ import { basename } from 'vs/base/common/path';
 import { localize } from 'vs/nls';
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { canceled, isCancellationError } from 'vs/base/common/errors';
+import { CancellationError, isCancellationError } from 'vs/base/common/errors';
 import { IProcessEnvironment, isWindows, OS } from 'vs/base/common/platform';
 import { generateUuid } from 'vs/base/common/uuid';
 import { getSystemShell } from 'vs/base/node/shell';
@@ -16,13 +16,8 @@ import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
 import { isLaunchedFromCli } from 'vs/platform/environment/node/argvHelper';
 import { ILogService } from 'vs/platform/log/common/log';
 import { Promises } from 'vs/base/common/async';
-
-/**
- * The maximum of time we accept to wait on resolving the shell
- * environment before giving up. This ensures we are not blocking
- * other tasks from running for a too long time period.
- */
-const MAX_SHELL_RESOLVE_TIME = 10000;
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { clamp } from 'vs/base/common/numbers';
 
 let unixShellEnvPromise: Promise<typeof process.env> | undefined = undefined;
 
@@ -34,7 +29,7 @@ let unixShellEnvPromise: Promise<typeof process.env> | undefined = undefined;
  * - we hit a timeout of `MAX_SHELL_RESOLVE_TIME`
  * - any other error from spawning a shell to figure out the environment
  */
-export async function getResolvedShellEnv(logService: ILogService, args: NativeParsedArgs, env: IProcessEnvironment): Promise<typeof process.env> {
+export async function getResolvedShellEnv(configurationService: IConfigurationService, logService: ILogService, args: NativeParsedArgs, env: IProcessEnvironment): Promise<typeof process.env> {
 
 	// Skip if --force-disable-user-env
 	if (args['force-disable-user-env']) {
@@ -72,11 +67,17 @@ export async function getResolvedShellEnv(logService: ILogService, args: NativeP
 			unixShellEnvPromise = Promises.withAsyncBody<NodeJS.ProcessEnv>(async (resolve, reject) => {
 				const cts = new CancellationTokenSource();
 
+				let timeoutValue = 10000; // default to 10 seconds
+				const configuredTimeoutValue = configurationService.getValue<unknown>('application.shellEnvironmentResolutionTimeout');
+				if (typeof configuredTimeoutValue === 'number') {
+					timeoutValue = clamp(configuredTimeoutValue, 1, 120) * 1000 /* convert from seconds */;
+				}
+
 				// Give up resolving shell env after some time
 				const timeout = setTimeout(() => {
 					cts.dispose(true);
-					reject(new Error(localize('resolveShellEnvTimeout', "Unable to resolve your shell environment in a reasonable time. Please review your shell configuration.")));
-				}, MAX_SHELL_RESOLVE_TIME);
+					reject(new Error(localize('resolveShellEnvTimeout', "Unable to resolve your shell environment in a reasonable time. Please review your shell configuration and restart.")));
+				}, timeoutValue);
 
 				// Resolve shell env and handle errors
 				try {
@@ -106,12 +107,13 @@ async function doResolveUnixShellEnv(logService: ILogService, token: Cancellatio
 	logService.trace('getUnixShellEnvironment#noAttach', noAttach);
 
 	const mark = generateUuid().replace(/-/g, '').substr(0, 12);
-	const regex = new RegExp(mark + '(.*)' + mark);
+	const regex = new RegExp(mark + '({.*})' + mark);
 
 	const env = {
 		...process.env,
 		ELECTRON_RUN_AS_NODE: '1',
-		ELECTRON_NO_ATTACH_CONSOLE: '1'
+		ELECTRON_NO_ATTACH_CONSOLE: '1',
+		VSCODE_RESOLVING_ENVIRONMENT: '1'
 	};
 
 	logService.trace('getUnixShellEnvironment#env', env);
@@ -120,7 +122,7 @@ async function doResolveUnixShellEnv(logService: ILogService, token: Cancellatio
 
 	return new Promise<typeof process.env>((resolve, reject) => {
 		if (token.isCancellationRequested) {
-			return reject(canceled());
+			return reject(new CancellationError());
 		}
 
 		// handle popular non-POSIX shells
@@ -153,7 +155,7 @@ async function doResolveUnixShellEnv(logService: ILogService, token: Cancellatio
 		token.onCancellationRequested(() => {
 			child.kill();
 
-			return reject(canceled());
+			return reject(new CancellationError());
 		});
 
 		child.on('error', err => {
@@ -198,6 +200,8 @@ async function doResolveUnixShellEnv(logService: ILogService, token: Cancellatio
 					delete env['ELECTRON_NO_ATTACH_CONSOLE'];
 				}
 
+				delete env['VSCODE_RESOLVING_ENVIRONMENT'];
+
 				// https://github.com/microsoft/vscode/issues/22593#issuecomment-336050758
 				delete env['XDG_RUNTIME_DIR'];
 
diff --git a/src/vs/platform/storage/common/storage.ts b/src/vs/platform/storage/common/storage.ts
index a15b3f2c4f2535..89f781b00b154c 100644
--- a/src/vs/platform/storage/common/storage.ts
+++ b/src/vs/platform/storage/common/storage.ts
@@ -8,7 +8,7 @@ import { Emitter, Event, PauseableEmitter } from 'vs/base/common/event';
 import { Disposable, dispose, MutableDisposable } from 'vs/base/common/lifecycle';
 import { mark } from 'vs/base/common/performance';
 import { isUndefinedOrNull } from 'vs/base/common/types';
-import { InMemoryStorageDatabase, IStorage, Storage } from 'vs/base/parts/storage/common/storage';
+import { InMemoryStorageDatabase, IStorage, Storage, StorageHint } from 'vs/base/parts/storage/common/storage';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { isUserDataProfile, IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
 import { IAnyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
@@ -623,9 +623,9 @@ export function isProfileUsingDefaultStorage(profile: IUserDataProfile): boolean
 
 export class InMemoryStorageService extends AbstractStorageService {
 
-	private readonly applicationStorage = this._register(new Storage(new InMemoryStorageDatabase()));
-	private readonly profileStorage = this._register(new Storage(new InMemoryStorageDatabase()));
-	private readonly workspaceStorage = this._register(new Storage(new InMemoryStorageDatabase()));
+	private readonly applicationStorage = this._register(new Storage(new InMemoryStorageDatabase(), { hint: StorageHint.STORAGE_IN_MEMORY }));
+	private readonly profileStorage = this._register(new Storage(new InMemoryStorageDatabase(), { hint: StorageHint.STORAGE_IN_MEMORY }));
+	private readonly workspaceStorage = this._register(new Storage(new InMemoryStorageDatabase(), { hint: StorageHint.STORAGE_IN_MEMORY }));
 
 	constructor() {
 		super();
diff --git a/src/vs/platform/storage/common/storageIpc.ts b/src/vs/platform/storage/common/storageIpc.ts
index ed0f21baf266d1..07d2ecd4576732 100644
--- a/src/vs/platform/storage/common/storageIpc.ts
+++ b/src/vs/platform/storage/common/storageIpc.ts
@@ -9,7 +9,7 @@ import { UriDto } from 'vs/base/common/uri';
 import { IChannel } from 'vs/base/parts/ipc/common/ipc';
 import { IStorageDatabase, IStorageItemsChangeEvent, IUpdateRequest } from 'vs/base/parts/storage/common/storage';
 import { IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { ISerializedSingleFolderWorkspaceIdentifier, ISerializedWorkspaceIdentifier, IEmptyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import { ISerializedSingleFolderWorkspaceIdentifier, ISerializedWorkspaceIdentifier, IEmptyWorkspaceIdentifier, IAnyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
 
 export type Key = string;
 export type Value = string;
@@ -53,7 +53,7 @@ abstract class BaseStorageDatabaseClient extends Disposable implements IStorageD
 	constructor(
 		protected channel: IChannel,
 		protected profile: UriDto<IUserDataProfile> | undefined,
-		protected workspace: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | IEmptyWorkspaceIdentifier | undefined
+		protected workspace: IAnyWorkspaceIdentifier | undefined
 	) {
 		super();
 	}
@@ -144,7 +144,7 @@ export class WorkspaceStorageDatabaseClient extends BaseStorageDatabaseClient im
 
 	readonly onDidChangeItemsExternal = Event.None; // unsupported for workspace storage because we only ever write from one window
 
-	constructor(channel: IChannel, workspace: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | IEmptyWorkspaceIdentifier) {
+	constructor(channel: IChannel, workspace: IAnyWorkspaceIdentifier) {
 		super(channel, undefined, workspace);
 	}
 
diff --git a/src/vs/platform/storage/electron-main/storageIpc.ts b/src/vs/platform/storage/electron-main/storageIpc.ts
index 2f0725e05fbc73..b645cf318b77d0 100644
--- a/src/vs/platform/storage/electron-main/storageIpc.ts
+++ b/src/vs/platform/storage/electron-main/storageIpc.ts
@@ -12,7 +12,7 @@ import { IBaseSerializableStorageRequest, ISerializableItemsChangeEvent, ISerial
 import { IStorageChangeEvent, IStorageMain } from 'vs/platform/storage/electron-main/storageMain';
 import { IStorageMainService } from 'vs/platform/storage/electron-main/storageMainService';
 import { IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { reviveIdentifier, IEmptyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import { reviveIdentifier, IAnyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
 
 export class StorageDatabaseChannel extends Disposable implements IServerChannel {
 
@@ -137,7 +137,7 @@ export class StorageDatabaseChannel extends Disposable implements IServerChannel
 		}
 	}
 
-	private async withStorageInitialized(profile: IUserDataProfile | undefined, workspace: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | IEmptyWorkspaceIdentifier | undefined): Promise<IStorageMain> {
+	private async withStorageInitialized(profile: IUserDataProfile | undefined, workspace: IAnyWorkspaceIdentifier | undefined): Promise<IStorageMain> {
 		let storage: IStorageMain;
 		if (workspace) {
 			storage = this.storageMainService.workspaceStorage(workspace);
diff --git a/src/vs/platform/storage/electron-main/storageMain.ts b/src/vs/platform/storage/electron-main/storageMain.ts
index 50e93d5d2a418e..0e4b00f5e0a98e 100644
--- a/src/vs/platform/storage/electron-main/storageMain.ts
+++ b/src/vs/platform/storage/electron-main/storageMain.ts
@@ -19,7 +19,7 @@ import { ILogService, LogLevel } from 'vs/platform/log/common/log';
 import { IS_NEW_KEY } from 'vs/platform/storage/common/storage';
 import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
 import { currentSessionDateStorageKey, firstSessionDateStorageKey, lastSessionDateStorageKey } from 'vs/platform/telemetry/common/telemetry';
-import { IEmptyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import { isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IAnyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
 
 export interface IStorageMainOptions {
 
@@ -27,7 +27,7 @@ export interface IStorageMainOptions {
 	 * If enabled, storage will not persist to disk
 	 * but into memory.
 	 */
-	useInMemoryStorage?: boolean;
+	readonly useInMemoryStorage?: boolean;
 }
 
 /**
@@ -91,6 +91,11 @@ export interface IStorageMain extends IDisposable {
 	 */
 	delete(key: string): void;
 
+	/**
+	 * Whether the storage is using in-memory persistence or not.
+	 */
+	isInMemory(): boolean;
+
 	/**
 	 * Close the storage connection.
 	 */
@@ -98,7 +103,7 @@ export interface IStorageMain extends IDisposable {
 }
 
 export interface IStorageChangeEvent {
-	key: string;
+	readonly key: string;
 }
 
 abstract class BaseStorageMain extends Disposable implements IStorageMain {
@@ -111,7 +116,7 @@ abstract class BaseStorageMain extends Disposable implements IStorageMain {
 	private readonly _onDidCloseStorage = this._register(new Emitter<void>());
 	readonly onDidCloseStorage = this._onDidCloseStorage.event;
 
-	private _storage: IStorage = new Storage(new InMemoryStorageDatabase()); // storage is in-memory until initialized
+	private _storage = new Storage(new InMemoryStorageDatabase(), { hint: StorageHint.STORAGE_IN_MEMORY }); // storage is in-memory until initialized
 	get storage(): IStorage { return this._storage; }
 
 	abstract get path(): string | undefined;
@@ -130,6 +135,10 @@ abstract class BaseStorageMain extends Disposable implements IStorageMain {
 		super();
 	}
 
+	isInMemory(): boolean {
+		return this._storage.isInMemory();
+	}
+
 	init(): Promise<void> {
 		if (!this.initializePromise) {
 			this.initializePromise = (async () => {
@@ -188,7 +197,7 @@ abstract class BaseStorageMain extends Disposable implements IStorageMain {
 		return storage.init();
 	}
 
-	protected abstract doCreate(): Promise<IStorage>;
+	protected abstract doCreate(): Promise<Storage>;
 
 	get items(): Map<string, string> { return this._storage.items; }
 
@@ -281,10 +290,10 @@ class BaseProfileAwareStorageMain extends BaseStorageMain {
 		super(logService, fileService);
 	}
 
-	protected async doCreate(): Promise<IStorage> {
+	protected async doCreate(): Promise<Storage> {
 		return new Storage(new SQLiteStorageDatabase(this.path ?? SQLiteStorageDatabase.IN_MEMORY_PATH, {
 			logging: this.createLoggingOptions()
-		}));
+		}), !this.path ? { hint: StorageHint.STORAGE_IN_MEMORY } : undefined);
 	}
 }
 
@@ -350,7 +359,7 @@ export class WorkspaceStorageMain extends BaseStorageMain {
 	}
 
 	constructor(
-		private workspace: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | IEmptyWorkspaceIdentifier,
+		private workspace: IAnyWorkspaceIdentifier,
 		private readonly options: IStorageMainOptions,
 		logService: ILogService,
 		private readonly environmentService: IEnvironmentService,
@@ -359,12 +368,12 @@ export class WorkspaceStorageMain extends BaseStorageMain {
 		super(logService, fileService);
 	}
 
-	protected async doCreate(): Promise<IStorage> {
+	protected async doCreate(): Promise<Storage> {
 		const { storageFilePath, wasCreated } = await this.prepareWorkspaceStorageFolder();
 
 		return new Storage(new SQLiteStorageDatabase(storageFilePath, {
 			logging: this.createLoggingOptions()
-		}), { hint: wasCreated ? StorageHint.STORAGE_DOES_NOT_EXIST : undefined });
+		}), { hint: this.options.useInMemoryStorage ? StorageHint.STORAGE_IN_MEMORY : wasCreated ? StorageHint.STORAGE_DOES_NOT_EXIST : undefined });
 	}
 
 	private async prepareWorkspaceStorageFolder(): Promise<{ storageFilePath: string; wasCreated: boolean }> {
@@ -420,7 +429,7 @@ export class InMemoryStorageMain extends BaseStorageMain {
 		return undefined; // in-memory has no path
 	}
 
-	protected async doCreate(): Promise<IStorage> {
-		return new Storage(new InMemoryStorageDatabase());
+	protected async doCreate(): Promise<Storage> {
+		return new Storage(new InMemoryStorageDatabase(), { hint: StorageHint.STORAGE_IN_MEMORY });
 	}
 }
diff --git a/src/vs/platform/storage/electron-main/storageMainService.ts b/src/vs/platform/storage/electron-main/storageMainService.ts
index ebd6b4029af0f2..1330646ffadb24 100644
--- a/src/vs/platform/storage/electron-main/storageMainService.ts
+++ b/src/vs/platform/storage/electron-main/storageMainService.ts
@@ -17,7 +17,7 @@ import { AbstractStorageService, isProfileUsingDefaultStorage, IStorageService,
 import { ApplicationStorageMain, ProfileStorageMain, InMemoryStorageMain, IStorageMain, IStorageMainOptions, WorkspaceStorageMain, IStorageChangeEvent } from 'vs/platform/storage/electron-main/storageMain';
 import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
 import { IUserDataProfilesMainService } from 'vs/platform/userDataProfile/electron-main/userDataProfile';
-import { IEmptyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import { IAnyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 
 //#region Storage Main Service (intent: make application, profile and workspace storage accessible to windows from main process)
@@ -62,7 +62,7 @@ export interface IStorageMainService {
 	 * Note: DO NOT use this for reading/writing from the main process!
 	 *       This is currently not supported.
 	 */
-	workspaceStorage(workspace: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | IEmptyWorkspaceIdentifier): IStorageMain;
+	workspaceStorage(workspace: IAnyWorkspaceIdentifier): IStorageMain;
 
 	/**
 	 * Checks if the provided path is currently in use for a storage database.
@@ -232,7 +232,7 @@ export class StorageMainService extends Disposable implements IStorageMainServic
 
 	private readonly mapWorkspaceToStorage = new Map<string /* workspace ID */, IStorageMain>();
 
-	workspaceStorage(workspace: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | IEmptyWorkspaceIdentifier): IStorageMain {
+	workspaceStorage(workspace: IAnyWorkspaceIdentifier): IStorageMain {
 		let workspaceStorage = this.mapWorkspaceToStorage.get(workspace.id);
 		if (!workspaceStorage) {
 			this.logService.trace(`StorageMainService: creating workspace storage (${workspace.id})`);
@@ -250,7 +250,7 @@ export class StorageMainService extends Disposable implements IStorageMainServic
 		return workspaceStorage;
 	}
 
-	private createWorkspaceStorage(workspace: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | IEmptyWorkspaceIdentifier): IStorageMain {
+	private createWorkspaceStorage(workspace: IAnyWorkspaceIdentifier): IStorageMain {
 		if (this.shutdownReason === ShutdownReason.KILL) {
 
 			// Workaround for native crashes that we see when
diff --git a/src/vs/platform/storage/electron-sandbox/storageService.ts b/src/vs/platform/storage/electron-sandbox/storageService.ts
index f9a62ccec3d671..70f7b679bb22d4 100644
--- a/src/vs/platform/storage/electron-sandbox/storageService.ts
+++ b/src/vs/platform/storage/electron-sandbox/storageService.ts
@@ -12,7 +12,7 @@ import { IMainProcessService } from 'vs/platform/ipc/electron-sandbox/services';
 import { AbstractStorageService, isProfileUsingDefaultStorage, StorageScope, WillSaveStateReason } from 'vs/platform/storage/common/storage';
 import { ApplicationStorageDatabaseClient, ProfileStorageDatabaseClient, WorkspaceStorageDatabaseClient } from 'vs/platform/storage/common/storageIpc';
 import { isUserDataProfile, IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IAnyWorkspaceIdentifier, IEmptyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import { IAnyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
 
 export class NativeStorageService extends AbstractStorageService {
 
@@ -28,7 +28,7 @@ export class NativeStorageService extends AbstractStorageService {
 	private workspaceStorage = this.createWorkspaceStorage(this.initialWorkspace);
 
 	constructor(
-		private readonly initialWorkspace: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | IEmptyWorkspaceIdentifier | undefined,
+		private readonly initialWorkspace: IAnyWorkspaceIdentifier | undefined,
 		private readonly initialProfiles: { defaultProfile: IUserDataProfile; currentProfile: IUserDataProfile },
 		private readonly mainProcessService: IMainProcessService,
 		private readonly environmentService: IEnvironmentService
@@ -72,9 +72,9 @@ export class NativeStorageService extends AbstractStorageService {
 		return profileStorage;
 	}
 
-	private createWorkspaceStorage(workspace: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | IEmptyWorkspaceIdentifier): IStorage;
-	private createWorkspaceStorage(workspace: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | IEmptyWorkspaceIdentifier | undefined): IStorage | undefined;
-	private createWorkspaceStorage(workspace: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | IEmptyWorkspaceIdentifier | undefined): IStorage | undefined {
+	private createWorkspaceStorage(workspace: IAnyWorkspaceIdentifier): IStorage;
+	private createWorkspaceStorage(workspace: IAnyWorkspaceIdentifier | undefined): IStorage | undefined;
+	private createWorkspaceStorage(workspace: IAnyWorkspaceIdentifier | undefined): IStorage | undefined {
 
 		// First clear any previously associated disposables
 		this.workspaceStorageDisposables.clear();
diff --git a/src/vs/platform/storage/test/electron-main/storageMainService.test.ts b/src/vs/platform/storage/test/electron-main/storageMainService.test.ts
index 3e1fdf56baa07b..1b42e2eafb62b6 100644
--- a/src/vs/platform/storage/test/electron-main/storageMainService.test.ts
+++ b/src/vs/platform/storage/test/electron-main/storageMainService.test.ts
@@ -54,6 +54,7 @@ suite('StorageMainService', function () {
 	}
 
 	async function testStorage(storage: IStorageMain, scope: StorageScope): Promise<void> {
+		strictEqual(storage.isInMemory(), true);
 
 		// Telemetry: added after init unless workspace/profile scoped
 		if (scope === StorageScope.APPLICATION) {
diff --git a/src/vs/platform/telemetry/browser/1dsAppender.ts b/src/vs/platform/telemetry/browser/1dsAppender.ts
index 9efb4452459978..2857c030813eb9 100644
--- a/src/vs/platform/telemetry/browser/1dsAppender.ts
+++ b/src/vs/platform/telemetry/browser/1dsAppender.ts
@@ -17,7 +17,7 @@ export class OneDataSystemWebAppender extends AbstractOneDataSystemAppender {
 
 		// If we cannot fetch the endpoint it means it is down and we should not send any telemetry.
 		// This is most likely due to ad blockers
-		fetch(this.endPointUrl, { method: 'POST' }).catch(err => {
+		fetch(this.endPointHealthUrl, { method: 'GET' }).catch(err => {
 			this._aiCoreOrKey = undefined;
 		});
 	}
diff --git a/src/vs/platform/telemetry/common/1dsAppender.ts b/src/vs/platform/telemetry/common/1dsAppender.ts
index e0c2c963a40add..5fe46b464b1310 100644
--- a/src/vs/platform/telemetry/common/1dsAppender.ts
+++ b/src/vs/platform/telemetry/common/1dsAppender.ts
@@ -18,6 +18,7 @@ export interface IAppInsightsCore {
 }
 
 const endpointUrl = 'https://mobile.events.data.microsoft.com/OneCollector/1.0';
+const endpointHealthUrl = 'https://mobile.events.data.microsoft.com/ping';
 
 async function getClient(instrumentationKey: string, addInternalFlag?: boolean, xhrOverride?: IXHROverride): Promise<IAppInsightsCore> {
 	const oneDs = await import('@microsoft/1ds-core-js');
@@ -68,6 +69,7 @@ export abstract class AbstractOneDataSystemAppender implements ITelemetryAppende
 	protected _aiCoreOrKey: IAppInsightsCore | string | undefined;
 	private _asyncAiCore: Promise<IAppInsightsCore> | null;
 	protected readonly endPointUrl = endpointUrl;
+	protected readonly endPointHealthUrl = endpointHealthUrl;
 
 	constructor(
 		private readonly _isInternalTelemetry: boolean,
diff --git a/src/vs/platform/telemetry/electron-main/telemetryUtils.ts b/src/vs/platform/telemetry/electron-main/telemetryUtils.ts
new file mode 100644
index 00000000000000..35304508a9be5a
--- /dev/null
+++ b/src/vs/platform/telemetry/electron-main/telemetryUtils.ts
@@ -0,0 +1,15 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IStateMainService } from 'vs/platform/state/electron-main/state';
+import { machineIdKey } from 'vs/platform/telemetry/common/telemetry';
+import { resolveMachineId as resolveNodeMachineId } from 'vs/platform/telemetry/node/telemetryUtils';
+
+export async function resolveMachineId(stateService: IStateMainService) {
+	// Call the node layers implementation to avoid code duplication
+	const machineId = await resolveNodeMachineId(stateService);
+	stateService.setItem(machineIdKey, machineId);
+	return machineId;
+}
diff --git a/src/vs/platform/telemetry/node/telemetryUtils.ts b/src/vs/platform/telemetry/node/telemetryUtils.ts
new file mode 100644
index 00000000000000..23731cd95b42b8
--- /dev/null
+++ b/src/vs/platform/telemetry/node/telemetryUtils.ts
@@ -0,0 +1,21 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { isMacintosh } from 'vs/base/common/platform';
+import { getMachineId } from 'vs/base/node/id';
+import { IStateService } from 'vs/platform/state/node/state';
+import { machineIdKey } from 'vs/platform/telemetry/common/telemetry';
+
+
+export async function resolveMachineId(stateService: IStateService) {
+	// We cache the machineId for faster lookups
+	// and resolve it only once initially if not cached or we need to replace the macOS iBridge device
+	let machineId = stateService.getItem<string>(machineIdKey);
+	if (typeof machineId !== 'string' || (isMacintosh && machineId === '6c9d2bc8f91b89624add29c0abeae7fb42bf539fa1cdb2e3e57cd668fa9bcead')) {
+		machineId = await getMachineId();
+	}
+
+	return machineId;
+}
diff --git a/src/vs/platform/telemetry/test/browser/telemetryService.test.ts b/src/vs/platform/telemetry/test/browser/telemetryService.test.ts
index 286dfa85de6886..e2fdbb3805f641 100644
--- a/src/vs/platform/telemetry/test/browser/telemetryService.test.ts
+++ b/src/vs/platform/telemetry/test/browser/telemetryService.test.ts
@@ -499,6 +499,10 @@ 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.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);
@@ -544,32 +548,6 @@ suite('TelemetryService', () => {
 		}
 	}));
 
-	test('Uncaught Error Telemetry removes PII but preserves Code file path', sinonTestFn(async function (this: any) {
-		const errorStub = sinon.stub();
-		window.onerror = errorStub;
-		const settings = new ErrorTestingSettings();
-		const testAppender = new TestTelemetryAppender();
-		const service = new JoinableTelemetryService({ appenders: [testAppender] });
-		const errorTelemetry = new ErrorTelemetry(service);
-
-		const dangerousPathWithImportantInfoError: any = new Error('dangerousPathWithImportantInfo');
-		dangerousPathWithImportantInfoError.stack = settings.stack;
-		(<any>window.onerror)(settings.dangerousPathWithImportantInfo, 'test.js', 2, 42, dangerousPathWithImportantInfoError);
-		this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
-		await service.join();
-
-		assert.strictEqual(errorStub.callCount, 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.nodeModuleAsarPathToRetain), -1);
-		assert.notStrictEqual(testAppender.events[0].data.callstack.indexOf('(/' + settings.nodeModulePathToRetain), -1);
-
-		errorTelemetry.dispose();
-		service.dispose();
-	}));
-
-
 	test('Unexpected Error Telemetry removes PII but preserves Code file path when PIIPath is configured', sinonTestFn(async function (this: any) {
 
 		const origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler();
diff --git a/src/vs/platform/terminal/common/capabilities/bufferMarkCapability.ts b/src/vs/platform/terminal/common/capabilities/bufferMarkCapability.ts
index b2399be1ea6533..229702af9d61e0 100644
--- a/src/vs/platform/terminal/common/capabilities/bufferMarkCapability.ts
+++ b/src/vs/platform/terminal/common/capabilities/bufferMarkCapability.ts
@@ -18,7 +18,7 @@ export class BufferMarkCapability implements IBufferMarkCapability {
 	readonly type = TerminalCapability.BufferMarkDetection;
 
 	private _idToMarkerMap: Map<string, IMarker> = new Map();
-	private _anonymousMarkers: IMarker[] = [];
+	private _anonymousMarkers: Map<number, IMarker> = new Map();
 
 	private readonly _onMarkAdded = new Emitter<IMarkProperties>();
 	readonly onMarkAdded = this._onMarkAdded.event;
@@ -32,7 +32,7 @@ export class BufferMarkCapability implements IBufferMarkCapability {
 		for (const m of this._idToMarkerMap.values()) {
 			yield m;
 		}
-		for (const m of this._anonymousMarkers) {
+		for (const m of this._anonymousMarkers.values()) {
 			yield m;
 		}
 	}
@@ -47,8 +47,8 @@ export class BufferMarkCapability implements IBufferMarkCapability {
 			this._idToMarkerMap.set(id, marker);
 			marker.onDispose(() => this._idToMarkerMap.delete(id));
 		} else {
-			this._anonymousMarkers.push(marker);
-			marker.onDispose(() => this._anonymousMarkers.filter(m => m !== marker));
+			this._anonymousMarkers.set(marker.id, marker);
+			marker.onDispose(() => this._anonymousMarkers.delete(marker.id));
 		}
 		this._onMarkAdded.fire({ marker, id, hidden: properties?.hidden, hoverMessage: properties?.hoverMessage });
 	}
diff --git a/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts b/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
index 2841bb18602fa6..e7da8ff417755f 100644
--- a/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
+++ b/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
@@ -649,7 +649,7 @@ function getOutputForCommand(executedMarker: IMarker | undefined, endMarker: IMa
 	return output === '' ? undefined : output;
 }
 
-export function getOutputMatchForCommand(executedMarker: IMarker | undefined, endMarker: IMarker | undefined, buffer: IBuffer, cols: number, outputMatcher: ITerminalOutputMatcher): ITerminalOutputMatch | undefined {
+function getOutputMatchForCommand(executedMarker: IMarker | undefined, endMarker: IMarker | undefined, buffer: IBuffer, cols: number, outputMatcher: ITerminalOutputMatcher): ITerminalOutputMatch | undefined {
 	if (!executedMarker || !endMarker) {
 		return undefined;
 	}
@@ -674,9 +674,6 @@ export function getOutputMatchForCommand(executedMarker: IMarker | undefined, en
 			}
 			if (!match) {
 				match = lines.join('\n').match(matcher);
-				if (!outputMatcher.multipleMatches && match) {
-					return { regexMatch: match };
-				}
 			}
 		}
 	} else {
@@ -693,9 +690,6 @@ export function getOutputMatchForCommand(executedMarker: IMarker | undefined, en
 			}
 			if (!match) {
 				match = lines.join('\n').match(matcher);
-				if (!outputMatcher.multipleMatches && match) {
-					return { regexMatch: match };
-				}
 			}
 		}
 	}
diff --git a/src/vs/platform/terminal/common/terminal.ts b/src/vs/platform/terminal/common/terminal.ts
index 08a233e2e01b96..4c8f56247288e5 100644
--- a/src/vs/platform/terminal/common/terminal.ts
+++ b/src/vs/platform/terminal/common/terminal.ts
@@ -172,6 +172,7 @@ export interface IPtyHostAttachTarget {
 	hideFromUser?: boolean;
 	isFeatureTerminal?: boolean;
 	type?: TerminalType;
+	hasChildProcesses: boolean;
 }
 
 export interface IReconnectionProperties {
@@ -326,7 +327,7 @@ export interface IPtyService extends IPtyHostController {
 	getDefaultSystemShell(osOverride?: OperatingSystem): Promise<string>;
 	getProfiles?(workspaceId: string, profiles: unknown, defaultProfile: unknown, includeDetectedProfiles?: boolean): Promise<ITerminalProfile[]>;
 	getEnvironment(): Promise<IProcessEnvironment>;
-	getWslPath(original: string): Promise<string>;
+	getWslPath(original: string, direction: 'unix-to-win' | 'win-to-unix'): Promise<string>;
 	getRevivedPtyNewId(id: number): Promise<number | undefined>;
 	setTerminalLayoutInfo(args: ISetTerminalLayoutInfoArgs): Promise<void>;
 	getTerminalLayoutInfo(args: IGetTerminalLayoutInfoArgs): Promise<ITerminalsLayoutInfo | undefined>;
diff --git a/src/vs/platform/terminal/common/terminalProcess.ts b/src/vs/platform/terminal/common/terminalProcess.ts
index d3cae34efcc5a2..bd8b2e7d667965 100644
--- a/src/vs/platform/terminal/common/terminalProcess.ts
+++ b/src/vs/platform/terminal/common/terminalProcess.ts
@@ -65,6 +65,7 @@ export interface IProcessDetails {
 	hideFromUser?: boolean;
 	isFeatureTerminal?: boolean;
 	type?: TerminalType;
+	hasChildProcesses: boolean;
 }
 
 export type ITerminalTabLayoutInfoDto = IRawTerminalTabLayoutInfo<IProcessDetails>;
diff --git a/src/vs/platform/terminal/common/terminalRecorder.ts b/src/vs/platform/terminal/common/terminalRecorder.ts
index 9abe15b7027b9d..d8fcb0269484bb 100644
--- a/src/vs/platform/terminal/common/terminalRecorder.ts
+++ b/src/vs/platform/terminal/common/terminalRecorder.ts
@@ -6,7 +6,9 @@
 import { IPtyHostProcessReplayEvent } from 'vs/platform/terminal/common/capabilities/capabilities';
 import { ReplayEntry } from 'vs/platform/terminal/common/terminalProcess';
 
-const MAX_RECORDER_DATA_SIZE = 1024 * 1024; // 1MB
+const enum Constants {
+	MaxRecorderDataSize = 1024 * 1024 // 1MB
+}
 
 interface RecorderEntry {
 	cols: number;
@@ -58,9 +60,9 @@ export class TerminalRecorder {
 		lastEntry.data.push(data);
 
 		this._totalDataLength += data.length;
-		while (this._totalDataLength > MAX_RECORDER_DATA_SIZE) {
+		while (this._totalDataLength > Constants.MaxRecorderDataSize) {
 			const firstEntry = this._entries[0];
-			const remainingToDelete = this._totalDataLength - MAX_RECORDER_DATA_SIZE;
+			const remainingToDelete = this._totalDataLength - Constants.MaxRecorderDataSize;
 			if (remainingToDelete >= firstEntry.data[0].length) {
 				// the first data piece must be deleted
 				this._totalDataLength -= firstEntry.data[0].length;
diff --git a/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts b/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
index f2b68ddaa49b57..f7d8697a7e149d 100644
--- a/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
+++ b/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
@@ -513,16 +513,12 @@ export class ShellIntegrationAddon extends Disposable implements IShellIntegrati
 }
 
 export function deserializeMessage(message: string): string {
-	let result = message.replace(/\\\\/g, '\\');
-	const deserializeRegex = /\\x([0-9a-f]{2})/i;
-	while (true) {
-		const match = result.match(deserializeRegex);
-		if (!match?.index || match.length < 2) {
-			break;
-		}
-		result = result.slice(0, match.index) + String.fromCharCode(parseInt(match[1], 16)) + result.slice(match.index + 4);
-	}
-	return result;
+	return message.replaceAll(
+		// Backslash ('\') followed by an escape operator: either another '\', or 'x' and two hex chars.
+		/\\(\\|x([0-9a-f]{2}))/gi,
+		// If it's a hex value, parse it to a character.
+		// Otherwise the operator is '\', which we return literally, now unescaped.
+		(_match: string, op: string, hex?: string) => hex ? String.fromCharCode(parseInt(hex, 16)) : op);
 }
 
 export function parseKeyValueAssignment(message: string): { key: string; value: string | undefined } {
diff --git a/src/vs/platform/terminal/common/xterm/terminalQuickFix.ts b/src/vs/platform/terminal/common/xterm/terminalQuickFix.ts
index 7d353a1345c529..aa8ce275226b55 100644
--- a/src/vs/platform/terminal/common/xterm/terminalQuickFix.ts
+++ b/src/vs/platform/terminal/common/xterm/terminalQuickFix.ts
@@ -6,9 +6,15 @@
 
 import { IAction } from 'vs/base/common/actions';
 import { CancellationToken } from 'vs/base/common/cancellation';
-import { UriComponents } from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { ITerminalCommand } from 'vs/platform/terminal/common/capabilities/capabilities';
 
+export enum TerminalQuickFixType {
+	Command = 0,
+	Opener = 1,
+	Port = 2
+}
+
 export interface ITerminalCommandSelector {
 	id: string;
 	commandLineMatcher: string | RegExp;
@@ -22,30 +28,30 @@ export interface ITerminalQuickFixOptions {
 	id: string;
 	commandLineMatcher: string | RegExp;
 	outputMatcher?: ITerminalOutputMatcher;
-	exitStatus: boolean;
+	commandExitResult: 'success' | 'error';
 }
 
 export interface ITerminalQuickFix {
-	type: 'command' | 'opener';
+	type: TerminalQuickFixType;
 	id: string;
 	source: string;
 }
 
 export interface ITerminalQuickFixCommandAction extends ITerminalQuickFix {
-	type: 'command';
+	type: TerminalQuickFixType.Command;
 	terminalCommand: string;
 	// TODO: Should this depend on whether alt is held?
 	addNewLine?: boolean;
 }
 export interface ITerminalQuickFixOpenerAction extends ITerminalQuickFix {
-	type: 'opener';
-	uri: UriComponents;
+	type: TerminalQuickFixType.Opener;
+	uri: URI;
 }
 
 export interface ITerminalCommandSelector {
 	commandLineMatcher: string | RegExp;
 	outputMatcher?: ITerminalOutputMatcher;
-	exitStatus: boolean;
+	commandExitResult: 'success' | 'error';
 }
 
 export type TerminalQuickFixActionInternal = IAction | ITerminalQuickFixCommandAction | ITerminalQuickFixOpenerAction;
@@ -69,7 +75,7 @@ export interface ITerminalCommandMatchResult {
 
 export interface ITerminalOutputMatch {
 	regexMatch: RegExpMatchArray;
-	outputLines?: string[];
+	outputLines: string[];
 }
 
 export interface IInternalOptions extends ITerminalQuickFixOptions {
diff --git a/src/vs/platform/terminal/node/ptyHostService.ts b/src/vs/platform/terminal/node/ptyHostService.ts
index ac1e390de91882..00e92dab86762b 100644
--- a/src/vs/platform/terminal/node/ptyHostService.ts
+++ b/src/vs/platform/terminal/node/ptyHostService.ts
@@ -123,7 +123,7 @@ export class PtyHostService extends Disposable implements IPtyService {
 		}
 
 		try {
-			return await getResolvedShellEnv(this._logService, { _: [] }, process.env);
+			return await getResolvedShellEnv(this._configurationService, this._logService, { _: [] }, process.env);
 		} catch (error) {
 			this._logService.error('ptyHost was unable to resolve shell environment', error);
 
@@ -293,8 +293,8 @@ export class PtyHostService extends Disposable implements IPtyService {
 	getEnvironment(): Promise<IProcessEnvironment> {
 		return this._proxy.getEnvironment();
 	}
-	getWslPath(original: string): Promise<string> {
-		return this._proxy.getWslPath(original);
+	getWslPath(original: string, direction: 'unix-to-win' | 'win-to-unix'): Promise<string> {
+		return this._proxy.getWslPath(original, direction);
 	}
 
 	getRevivedPtyNewId(id: number): Promise<number | undefined> {
diff --git a/src/vs/platform/terminal/node/ptyService.ts b/src/vs/platform/terminal/node/ptyService.ts
index 325a911670ce36..a116038d6f259c 100644
--- a/src/vs/platform/terminal/node/ptyService.ts
+++ b/src/vs/platform/terminal/node/ptyService.ts
@@ -29,6 +29,7 @@ import { ShellIntegrationAddon } from 'vs/platform/terminal/common/xterm/shellIn
 import { formatMessageForTerminal } from 'vs/platform/terminal/common/terminalStrings';
 import { IPtyHostProcessReplayEvent } from 'vs/platform/terminal/common/capabilities/capabilities';
 import { IProductService } from 'vs/platform/product/common/productService';
+import { join } from 'path';
 
 type WorkspaceId = string;
 
@@ -350,19 +351,56 @@ export class PtyService extends Disposable implements IPtyService {
 		return { ...process.env };
 	}
 
-	async getWslPath(original: string): Promise<string> {
-		if (!isWindows) {
-			return original;
+	async getWslPath(original: string, direction: 'unix-to-win' | 'win-to-unix' | unknown): Promise<string> {
+		if (direction === 'win-to-unix') {
+			if (!isWindows) {
+				return original;
+			}
+			if (getWindowsBuildNumber() < 17063) {
+				return original.replace(/\\/g, '/');
+			}
+			const wslExecutable = this._getWSLExecutablePath();
+			if (!wslExecutable) {
+				return original;
+			}
+			return new Promise<string>(c => {
+				const proc = execFile(wslExecutable, ['-e', 'wslpath', original], {}, (error, stdout, stderr) => {
+					c(escapeNonWindowsPath(stdout.trim()));
+				});
+				proc.stdin!.end();
+			});
+		}
+		if (direction === 'unix-to-win') {
+			// The backend is Windows, for example a local Windows workspace with a wsl session in
+			// the terminal.
+			if (isWindows) {
+				if (getWindowsBuildNumber() < 17063) {
+					return original;
+				}
+				const wslExecutable = this._getWSLExecutablePath();
+				if (!wslExecutable) {
+					return original;
+				}
+				return new Promise<string>(c => {
+					const proc = execFile(wslExecutable, ['-e', 'wslpath', '-w', original], {}, (error, stdout, stderr) => {
+						c(stdout.trim());
+					});
+					proc.stdin!.end();
+				});
+			}
 		}
-		if (getWindowsBuildNumber() < 17063) {
-			return original.replace(/\\/g, '/');
+		// Fallback just in case
+		return original;
+	}
+
+	private _getWSLExecutablePath(): string | undefined {
+		const useWSLexe = getWindowsBuildNumber() >= 16299;
+		const is32ProcessOn64Windows = process.env.hasOwnProperty('PROCESSOR_ARCHITEW6432');
+		const systemRoot = process.env['SystemRoot'];
+		if (systemRoot) {
+			return join(systemRoot, is32ProcessOn64Windows ? 'Sysnative' : 'System32', useWSLexe ? 'wsl.exe' : 'bash.exe');
 		}
-		return new Promise<string>(c => {
-			const proc = execFile('bash.exe', ['-c', `wslpath ${escapeNonWindowsPath(original)}`], {}, (error, stdout, stderr) => {
-				c(escapeNonWindowsPath(stdout.trim()));
-			});
-			proc.stdin!.end();
-		});
+		return undefined;
 	}
 
 	async getRevivedPtyNewId(id: number): Promise<number | undefined> {
@@ -443,7 +481,8 @@ export class PtyService extends Disposable implements IPtyService {
 			waitOnExit: persistentProcess.shellLaunchConfig.waitOnExit,
 			hideFromUser: persistentProcess.shellLaunchConfig.hideFromUser,
 			isFeatureTerminal: persistentProcess.shellLaunchConfig.isFeatureTerminal,
-			type: persistentProcess.shellLaunchConfig.type
+			type: persistentProcess.shellLaunchConfig.type,
+			hasChildProcesses: persistentProcess.hasChildProcesses
 		};
 	}
 
@@ -465,7 +504,7 @@ const enum InteractionState {
 	Session = 'Session'
 }
 
-export class PersistentTerminalProcess extends Disposable {
+class PersistentTerminalProcess extends Disposable {
 
 	private readonly _bufferer: TerminalDataBufferer;
 	private readonly _autoReplies: Map<string, TerminalAutoResponder> = new Map();
@@ -513,6 +552,7 @@ export class PersistentTerminalProcess extends Disposable {
 	get icon(): TerminalIcon | undefined { return this._icon; }
 	get color(): string | undefined { return this._color; }
 	get fixedDimensions(): IFixedTerminalDimensions | undefined { return this._fixedDimensions; }
+	get hasChildProcesses(): boolean { return this._terminalProcess.hasChildProcesses; }
 
 	setTitle(title: string, titleSource: TitleEventSource): void {
 		if (titleSource === TitleEventSource.Api) {
@@ -951,7 +991,7 @@ function printTime(ms: number): string {
 	return `${_h}${_m}${_s}${_ms}`;
 }
 
-export interface ITerminalSerializer {
+interface ITerminalSerializer {
 	handleData(data: string): void;
 	freeRawReviveBuffer(): void;
 	handleResize(cols: number, rows: number): void;
diff --git a/src/vs/platform/terminal/node/terminalEnvironment.ts b/src/vs/platform/terminal/node/terminalEnvironment.ts
index d6df50d970581a..ba2ce5d1314819 100644
--- a/src/vs/platform/terminal/node/terminalEnvironment.ts
+++ b/src/vs/platform/terminal/node/terminalEnvironment.ts
@@ -160,6 +160,14 @@ export function getShellIntegrationInjection(
 			newArgs[newArgs.length - 1] = format(newArgs[newArgs.length - 1], appRoot);
 			return { newArgs, envMixin };
 		}
+		case 'fish': {
+			// The injection mechanism used for fish is to add a custom dir to $XDG_DATA_DIRS which
+			// is similar to $ZDOTDIR in zsh but contains a list of directories to run from.
+			const oldDataDirs = env?.XDG_DATA_DIRS ?? '/usr/local/share:/usr/share';
+			const newDataDir = path.join(appRoot, 'out/vs/workbench/contrib/xdg_data');
+			envMixin['XDG_DATA_DIRS'] = `${oldDataDirs}:${newDataDir}`;
+			return { newArgs: undefined, envMixin };
+		}
 		case 'pwsh': {
 			if (!originalArgs || arePwshImpliedArgs(originalArgs)) {
 				newArgs = shellIntegrationArgs.get(ShellIntegrationExecutable.Pwsh);
@@ -188,7 +196,13 @@ export function getShellIntegrationInjection(
 			newArgs[newArgs.length - 1] = format(newArgs[newArgs.length - 1], appRoot);
 
 			// Move .zshrc into $ZDOTDIR as the way to activate the script
-			const zdotdir = path.join(os.tmpdir(), `${os.userInfo().username}-${productService.applicationName}-zsh`);
+			let username: string;
+			try {
+				username = os.userInfo().username;
+			} catch {
+				username = 'unknown';
+			}
+			const zdotdir = path.join(os.tmpdir(), `${username}-${productService.applicationName}-zsh`);
 			envMixin['ZDOTDIR'] = zdotdir;
 			const userZdotdir = env?.ZDOTDIR ?? os.homedir() ?? `~`;
 			envMixin['USER_ZDOTDIR'] = userZdotdir;
@@ -216,7 +230,7 @@ export function getShellIntegrationInjection(
 	return undefined;
 }
 
-export enum ShellIntegrationExecutable {
+enum ShellIntegrationExecutable {
 	WindowsPwsh = 'windows-pwsh',
 	WindowsPwshLogin = 'windows-pwsh-login',
 	Pwsh = 'pwsh',
@@ -226,7 +240,7 @@ export enum ShellIntegrationExecutable {
 	Bash = 'bash'
 }
 
-export const shellIntegrationArgs: Map<ShellIntegrationExecutable, string[]> = new Map();
+const shellIntegrationArgs: Map<ShellIntegrationExecutable, string[]> = new Map();
 // The try catch swallows execution policy errors in the case of the archive distributable
 shellIntegrationArgs.set(ShellIntegrationExecutable.WindowsPwsh, ['-noexit', '-command', 'try { . \"{0}\\out\\vs\\workbench\\contrib\\terminal\\browser\\media\\shellIntegration.ps1\" } catch {}{1}']);
 shellIntegrationArgs.set(ShellIntegrationExecutable.WindowsPwshLogin, ['-l', '-noexit', '-command', 'try { . \"{0}\\out\\vs\\workbench\\contrib\\terminal\\browser\\media\\shellIntegration.ps1\" } catch {}{1}']);
diff --git a/src/vs/platform/terminal/node/terminalProcess.ts b/src/vs/platform/terminal/node/terminalProcess.ts
index 9a670fda3e81e1..396ef15fb25f00 100644
--- a/src/vs/platform/terminal/node/terminalProcess.ts
+++ b/src/vs/platform/terminal/node/terminalProcess.ts
@@ -123,6 +123,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 
 	get currentTitle(): string { return this._windowsShellHelper?.shellTitle || this._currentTitle; }
 	get shellType(): TerminalShellType { return isWindows ? this._windowsShellHelper?.shellType : posixShellTypeMap.get(this._currentTitle); }
+	get hasChildProcesses(): boolean { return this._childProcessMonitor?.hasChildProcesses || false; }
 
 	private readonly _onProcessData = this._register(new Emitter<string>());
 	readonly onProcessData = this._onProcessData.event;
diff --git a/src/vs/platform/terminal/node/terminalProfiles.ts b/src/vs/platform/terminal/node/terminalProfiles.ts
index cbb1dfe65e2a31..f658cc437b9397 100644
--- a/src/vs/platform/terminal/node/terminalProfiles.ts
+++ b/src/vs/platform/terminal/node/terminalProfiles.ts
@@ -365,10 +365,6 @@ export interface IFsProvider {
 	readFile(path: string): Promise<Buffer>;
 }
 
-export interface IProfileVariableResolver {
-	resolve(text: string[]): Promise<string[]>;
-}
-
 interface IPotentialTerminalProfile {
 	profileName: string;
 	paths: string[];
diff --git a/src/vs/platform/terminal/test/node/terminalEnvironment.test.ts b/src/vs/platform/terminal/test/node/terminalEnvironment.test.ts
index 3ddda6e00d7c36..50242fb83da4cd 100644
--- a/src/vs/platform/terminal/test/node/terminalEnvironment.test.ts
+++ b/src/vs/platform/terminal/test/node/terminalEnvironment.test.ts
@@ -109,10 +109,10 @@ suite('platform - terminalEnvironment', () => {
 					const expectedDir = new RegExp(`.+\/${username}-vscode-zsh`);
 					const customZdotdir = '/custom/zsh/dotdir';
 					const expectedDests = [
-						new RegExp(`.+\/${username}-vscode-zsh\/\.zshrc`),
-						new RegExp(`.+\/${username}-vscode-zsh\/\.zprofile`),
-						new RegExp(`.+\/${username}-vscode-zsh\/\.zshenv`),
-						new RegExp(`.+\/${username}-vscode-zsh\/\.zlogin`)
+						new RegExp(`.+\\/${username}-vscode-zsh\\/\\.zshrc`),
+						new RegExp(`.+\\/${username}-vscode-zsh\\/\\.zprofile`),
+						new RegExp(`.+\\/${username}-vscode-zsh\\/\\.zshenv`),
+						new RegExp(`.+\\/${username}-vscode-zsh\\/\\.zlogin`)
 					];
 					const expectedSources = [
 						/.+\/out\/vs\/workbench\/contrib\/terminal\/browser\/media\/shellIntegration-rc.zsh/,
diff --git a/src/vs/platform/theme/browser/defaultStyles.ts b/src/vs/platform/theme/browser/defaultStyles.ts
index c3e3070951400a..90d1c7f63d1e37 100644
--- a/src/vs/platform/theme/browser/defaultStyles.ts
+++ b/src/vs/platform/theme/browser/defaultStyles.ts
@@ -4,12 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 import { IButtonStyles } from 'vs/base/browser/ui/button/button';
 import { IKeybindingLabelStyles } from 'vs/base/browser/ui/keybindingLabel/keybindingLabel';
-import { ColorIdentifier, keybindingLabelBackground, keybindingLabelBorder, keybindingLabelBottomBorder, keybindingLabelForeground, asCssValue, widgetShadow, buttonForeground, buttonSeparator, buttonBackground, buttonHoverBackground, buttonSecondaryForeground, buttonSecondaryBackground, buttonSecondaryHoverBackground, buttonBorder, progressBarBackground, inputActiveOptionBorder, inputActiveOptionForeground, inputActiveOptionBackground, editorWidgetBackground, editorWidgetForeground, contrastBorder, checkboxBorder, checkboxBackground, checkboxForeground, problemsErrorIconForeground, problemsWarningIconForeground, problemsInfoIconForeground, inputBackground, inputForeground, inputBorder, textLinkForeground, inputValidationInfoBorder, inputValidationInfoBackground, inputValidationInfoForeground, inputValidationWarningBorder, inputValidationWarningBackground, inputValidationWarningForeground, inputValidationErrorBorder, inputValidationErrorBackground, inputValidationErrorForeground, listFilterWidgetBackground, listFilterWidgetNoMatchesOutline, listFilterWidgetOutline, listFilterWidgetShadow } from 'vs/platform/theme/common/colorRegistry';
+import { ColorIdentifier, keybindingLabelBackground, keybindingLabelBorder, keybindingLabelBottomBorder, keybindingLabelForeground, asCssValue, widgetShadow, buttonForeground, buttonSeparator, buttonBackground, buttonHoverBackground, buttonSecondaryForeground, buttonSecondaryBackground, buttonSecondaryHoverBackground, buttonBorder, progressBarBackground, inputActiveOptionBorder, inputActiveOptionForeground, inputActiveOptionBackground, editorWidgetBackground, editorWidgetForeground, contrastBorder, checkboxBorder, checkboxBackground, checkboxForeground, problemsErrorIconForeground, problemsWarningIconForeground, problemsInfoIconForeground, inputBackground, inputForeground, inputBorder, textLinkForeground, inputValidationInfoBorder, inputValidationInfoBackground, inputValidationInfoForeground, inputValidationWarningBorder, inputValidationWarningBackground, inputValidationWarningForeground, inputValidationErrorBorder, inputValidationErrorBackground, inputValidationErrorForeground, listFilterWidgetBackground, listFilterWidgetNoMatchesOutline, listFilterWidgetOutline, listFilterWidgetShadow, badgeBackground, badgeForeground, breadcrumbsBackground, breadcrumbsForeground, breadcrumbsFocusForeground, breadcrumbsActiveSelectionForeground } from 'vs/platform/theme/common/colorRegistry';
 import { IProgressBarStyles } from 'vs/base/browser/ui/progressbar/progressbar';
 import { ICheckboxStyles, IToggleStyles } from 'vs/base/browser/ui/toggle/toggle';
 import { IDialogStyles } from 'vs/base/browser/ui/dialog/dialog';
 import { IInputBoxStyles } from 'vs/base/browser/ui/inputbox/inputBox';
 import { IFindWidgetStyles } from 'vs/base/browser/ui/tree/abstractTree';
+import { ICountBadgeStyles } from 'vs/base/browser/ui/countBadge/countBadge';
+import { IBreadcrumbsWidgetStyles } from 'vs/base/browser/ui/breadcrumbs/breadcrumbsWidget';
 
 export type IStyleOverride<T> = {
 	[P in keyof T]?: ColorIdentifier;
@@ -69,8 +71,6 @@ export function getCheckboxStyles(override: IStyleOverride<ICheckboxStyles>): IC
 	};
 }
 
-export type IDialogStyleOverrides = IStyleOverride<IDialogStyles>;
-
 export const defaultDialogStyles = getDialogStyle({});
 
 export function getDialogStyle(override: IStyleOverride<IDialogStyles>): IDialogStyles {
@@ -113,3 +113,25 @@ export const defaultFindWidgetStyles: IFindWidgetStyles = {
 	inputBoxStyles: defaultInputBoxStyles,
 	toggleStyles: defaultToggleStyles
 };
+
+export const defaultCountBadgeStyles = getCountBadgeStyle({});
+
+export function getCountBadgeStyle(override: IStyleOverride<ICountBadgeStyles>): ICountBadgeStyles {
+	return {
+		badgeBackground: asCssValue(override.badgeBackground ?? badgeBackground),
+		badgeForeground: asCssValue(override.badgeForeground ?? badgeForeground),
+		badgeBorder: asCssValue(contrastBorder)
+	};
+}
+
+export const defaultBreadcrumbsWidgetStyles = getBreadcrumbsWidgetStyles({});
+
+export function getBreadcrumbsWidgetStyles(override: IStyleOverride<IBreadcrumbsWidgetStyles>): IBreadcrumbsWidgetStyles {
+	return {
+		breadcrumbsBackground: asCssValue(override.breadcrumbsBackground ?? breadcrumbsBackground),
+		breadcrumbsForeground: asCssValue(override.breadcrumbsForeground ?? breadcrumbsForeground),
+		breadcrumbsHoverForeground: asCssValue(override.breadcrumbsFocusForeground ?? breadcrumbsFocusForeground),
+		breadcrumbsFocusForeground: asCssValue(override.breadcrumbsFocusForeground ?? breadcrumbsFocusForeground),
+		breadcrumbsFocusAndSelectionForeground: asCssValue(override.breadcrumbsFocusAndSelectionForeground ?? breadcrumbsActiveSelectionForeground)
+	};
+}
diff --git a/src/vs/platform/theme/common/colorRegistry.ts b/src/vs/platform/theme/common/colorRegistry.ts
index 203b79689b4021..e6a1dd85d1590a 100644
--- a/src/vs/platform/theme/common/colorRegistry.ts
+++ b/src/vs/platform/theme/common/colorRegistry.ts
@@ -221,7 +221,7 @@ export const errorForeground = registerColor('errorForeground', { dark: '#F48771
 export const descriptionForeground = registerColor('descriptionForeground', { light: '#717171', dark: transparent(foreground, 0.7), hcDark: transparent(foreground, 0.7), hcLight: transparent(foreground, 0.7) }, nls.localize('descriptionForeground', "Foreground color for description text providing additional information, for example for a label."));
 export const iconForeground = registerColor('icon.foreground', { dark: '#C5C5C5', light: '#424242', hcDark: '#FFFFFF', hcLight: '#292929' }, nls.localize('iconForeground', "The default color for icons in the workbench."));
 
-export const focusBorder = registerColor('focusBorder', { dark: '#007FD4', light: '#0090F1', hcDark: '#F38518', hcLight: '#0F4A85' }, nls.localize('focusBorder', "Overall border color for focused elements. This color is only used if not overridden by a component."));
+export const focusBorder = registerColor('focusBorder', { dark: '#007FD4', light: '#0090F1', hcDark: '#F38518', hcLight: '#006BBD' }, nls.localize('focusBorder', "Overall border color for focused elements. This color is only used if not overridden by a component."));
 
 export const contrastBorder = registerColor('contrastBorder', { light: null, dark: null, hcDark: '#6FC3DF', hcLight: '#0F4A85' }, nls.localize('contrastBorder', "An extra border around elements to separate them from others for greater contrast."));
 export const activeContrastBorder = registerColor('contrastActiveBorder', { light: null, dark: null, hcDark: focusBorder, hcLight: focusBorder }, nls.localize('activeContrastBorder', "An extra border around active elements to separate them from others for greater contrast."));
@@ -240,11 +240,12 @@ export const textCodeBlockBackground = registerColor('textCodeBlock.background',
 
 // ----- widgets
 export const widgetShadow = registerColor('widget.shadow', { dark: transparent(Color.black, .36), light: transparent(Color.black, .16), hcDark: null, hcLight: null }, nls.localize('widgetShadow', 'Shadow color of widgets such as find/replace inside the editor.'));
+export const widgetBorder = registerColor('widget.border', { dark: null, light: null, hcDark: contrastBorder, hcLight: contrastBorder }, nls.localize('widgetBorder', 'Border color of widgets such as find/replace inside the editor.'));
 
 export const inputBackground = registerColor('input.background', { dark: '#3C3C3C', light: Color.white, hcDark: Color.black, hcLight: Color.white }, nls.localize('inputBoxBackground', "Input box background."));
 export const inputForeground = registerColor('input.foreground', { dark: foreground, light: foreground, hcDark: foreground, hcLight: foreground }, nls.localize('inputBoxForeground', "Input box foreground."));
 export const inputBorder = registerColor('input.border', { dark: null, light: null, hcDark: contrastBorder, hcLight: contrastBorder }, nls.localize('inputBoxBorder', "Input box border."));
-export const inputActiveOptionBorder = registerColor('inputOption.activeBorder', { dark: '#007ACC00', light: '#007ACC00', hcDark: contrastBorder, hcLight: contrastBorder }, nls.localize('inputBoxActiveOptionBorder', "Border color of activated options in input fields."));
+export const inputActiveOptionBorder = registerColor('inputOption.activeBorder', { dark: '#007ACC', light: '#007ACC', hcDark: contrastBorder, hcLight: contrastBorder }, nls.localize('inputBoxActiveOptionBorder', "Border color of activated options in input fields."));
 export const inputActiveOptionHoverBackground = registerColor('inputOption.hoverBackground', { dark: '#5a5d5e80', light: '#b8b8b850', hcDark: null, hcLight: null }, nls.localize('inputOption.hoverBackground', "Background color of activated options in input fields."));
 export const inputActiveOptionBackground = registerColor('inputOption.activeBackground', { dark: transparent(focusBorder, 0.4), light: transparent(focusBorder, 0.2), hcDark: Color.transparent, hcLight: Color.transparent }, nls.localize('inputOption.activeBackground', "Background hover color of options in input fields."));
 export const inputActiveOptionForeground = registerColor('inputOption.activeForeground', { dark: Color.white, light: Color.black, hcDark: foreground, hcLight: foreground }, nls.localize('inputOption.activeForeground', "Foreground color of activated options in input fields."));
@@ -262,7 +263,7 @@ export const inputValidationErrorBorder = registerColor('inputValidation.errorBo
 
 export const selectBackground = registerColor('dropdown.background', { dark: '#3C3C3C', light: Color.white, hcDark: Color.black, hcLight: Color.white }, nls.localize('dropdownBackground', "Dropdown background."));
 export const selectListBackground = registerColor('dropdown.listBackground', { dark: null, light: null, hcDark: Color.black, hcLight: Color.white }, nls.localize('dropdownListBackground', "Dropdown list background."));
-export const selectForeground = registerColor('dropdown.foreground', { dark: '#F0F0F0', light: null, hcDark: Color.white, hcLight: foreground }, nls.localize('dropdownForeground', "Dropdown foreground."));
+export const selectForeground = registerColor('dropdown.foreground', { dark: '#F0F0F0', light: foreground, hcDark: Color.white, hcLight: foreground }, nls.localize('dropdownForeground', "Dropdown foreground."));
 export const selectBorder = registerColor('dropdown.border', { dark: selectBackground, light: '#CECECE', hcDark: contrastBorder, hcLight: contrastBorder }, nls.localize('dropdownBorder', "Dropdown border."));
 
 export const buttonForeground = registerColor('button.foreground', { dark: Color.white, light: Color.white, hcDark: Color.white, hcLight: Color.white }, nls.localize('buttonForeground', "Button foreground color."));
@@ -479,7 +480,7 @@ export const quickInputListFocusBackground = registerColor('quickInputList.focus
  * Menu colors
  */
 export const menuBorder = registerColor('menu.border', { dark: null, light: null, hcDark: contrastBorder, hcLight: contrastBorder }, nls.localize('menuBorder', "Border color of menus."));
-export const menuForeground = registerColor('menu.foreground', { dark: selectForeground, light: foreground, hcDark: selectForeground, hcLight: selectForeground }, nls.localize('menuForeground', "Foreground color of menu items."));
+export const menuForeground = registerColor('menu.foreground', { dark: selectForeground, light: selectForeground, hcDark: selectForeground, hcLight: selectForeground }, nls.localize('menuForeground', "Foreground color of menu items."));
 export const menuBackground = registerColor('menu.background', { dark: selectBackground, light: selectBackground, hcDark: selectBackground, hcLight: selectBackground }, nls.localize('menuBackground', "Background color of menu items."));
 export const menuSelectionForeground = registerColor('menu.selectionForeground', { dark: listActiveSelectionForeground, light: listActiveSelectionForeground, hcDark: listActiveSelectionForeground, hcLight: listActiveSelectionForeground }, nls.localize('menuSelectionForeground', "Foreground color of the selected menu item in menus."));
 export const menuSelectionBackground = registerColor('menu.selectionBackground', { dark: listActiveSelectionBackground, light: listActiveSelectionBackground, hcDark: listActiveSelectionBackground, hcLight: listActiveSelectionBackground }, nls.localize('menuSelectionBackground', "Background color of the selected menu item in menus."));
diff --git a/src/vs/platform/theme/common/styler.ts b/src/vs/platform/theme/common/styler.ts
index 503c803501c6c4..610d4e7c9b8959 100644
--- a/src/vs/platform/theme/common/styler.ts
+++ b/src/vs/platform/theme/common/styler.ts
@@ -7,8 +7,8 @@ import { Color } from 'vs/base/common/color';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { IThemable, styleFn } from 'vs/base/common/styler';
 import {
-	activeContrastBorder, badgeBackground, badgeForeground, breadcrumbsActiveSelectionForeground, breadcrumbsBackground, breadcrumbsFocusForeground, breadcrumbsForeground,
-	ColorIdentifier, ColorTransform, ColorValue, contrastBorder, editorWidgetBorder, focusBorder, inputActiveOptionBackground, inputActiveOptionBorder, inputActiveOptionForeground,
+	activeContrastBorder,
+	ColorIdentifier, ColorValue, editorWidgetBorder, focusBorder, inputActiveOptionBackground, inputActiveOptionBorder, inputActiveOptionForeground,
 	inputBackground, inputBorder, inputForeground, inputValidationErrorBackground, inputValidationErrorBorder, inputValidationErrorForeground, inputValidationInfoBackground,
 	inputValidationInfoBorder, inputValidationInfoForeground, inputValidationWarningBackground, inputValidationWarningBorder, inputValidationWarningForeground,
 	listActiveSelectionBackground, listActiveSelectionForeground, listActiveSelectionIconForeground, listDropBackground,
@@ -62,19 +62,6 @@ export function attachStyler<T extends IColorMapping>(themeService: IThemeServic
 	return themeService.onDidColorThemeChange(applyStyles);
 }
 
-export interface IBadgeStyleOverrides extends IStyleOverrides {
-	badgeBackground?: ColorIdentifier;
-	badgeForeground?: ColorIdentifier;
-}
-
-export function attachBadgeStyler(widget: IThemable, themeService: IThemeService, style?: IBadgeStyleOverrides): IDisposable {
-	return attachStyler(themeService, {
-		badgeBackground: style?.badgeBackground || badgeBackground,
-		badgeForeground: style?.badgeForeground || badgeForeground,
-		badgeBorder: contrastBorder
-	} as IBadgeStyleOverrides, widget);
-}
-
 export interface ISelectBoxStyleOverrides extends IStyleOverrides, IListStyleOverrides {
 	selectBackground?: ColorIdentifier;
 	selectListBackground?: ColorIdentifier;
@@ -173,31 +160,10 @@ export const defaultListStyles: IColorMapping = {
 	inputValidationErrorBorder,
 };
 
-
 export function attachStylerCallback(themeService: IThemeService, colors: { [name: string]: ColorIdentifier }, callback: styleFn): IDisposable {
 	return attachStyler(themeService, colors, callback);
 }
 
-export interface IBreadcrumbsWidgetStyleOverrides extends IColorMapping {
-	breadcrumbsBackground?: ColorIdentifier | ColorTransform;
-	breadcrumbsForeground?: ColorIdentifier;
-	breadcrumbsHoverForeground?: ColorIdentifier;
-	breadcrumbsFocusForeground?: ColorIdentifier;
-	breadcrumbsFocusAndSelectionForeground?: ColorIdentifier;
-}
-
-export const defaultBreadcrumbsStyles = <IBreadcrumbsWidgetStyleOverrides>{
-	breadcrumbsBackground: breadcrumbsBackground,
-	breadcrumbsForeground: breadcrumbsForeground,
-	breadcrumbsHoverForeground: breadcrumbsFocusForeground,
-	breadcrumbsFocusForeground: breadcrumbsFocusForeground,
-	breadcrumbsFocusAndSelectionForeground: breadcrumbsActiveSelectionForeground,
-};
-
-export function attachBreadcrumbsStyler(widget: IThemable, themeService: IThemeService, style?: IBreadcrumbsWidgetStyleOverrides): IDisposable {
-	return attachStyler(themeService, { ...defaultBreadcrumbsStyles, ...style }, widget);
-}
-
 export interface IMenuStyleOverrides extends IColorMapping {
 	shadowColor?: ColorIdentifier;
 	borderColor?: ColorIdentifier;
diff --git a/src/vs/platform/theme/common/themeService.ts b/src/vs/platform/theme/common/themeService.ts
index 29ccbcf07f9fb0..f982cf4006f01a 100644
--- a/src/vs/platform/theme/common/themeService.ts
+++ b/src/vs/platform/theme/common/themeService.ts
@@ -276,6 +276,7 @@ export class Themable extends Disposable {
 }
 
 export interface IPartsSplash {
+	zoomLevel: number | undefined;
 	baseTheme: string;
 	colorInfo: {
 		background: string;
diff --git a/src/vs/platform/uriIdentity/test/common/uriIdentityService.test.ts b/src/vs/platform/uriIdentity/test/common/uriIdentityService.test.ts
index 82076e97ac3598..caea0117d08d60 100644
--- a/src/vs/platform/uriIdentity/test/common/uriIdentityService.test.ts
+++ b/src/vs/platform/uriIdentity/test/common/uriIdentityService.test.ts
@@ -34,7 +34,7 @@ suite('URI Identity', function () {
 	setup(function () {
 		_service = new UriIdentityService(new FakeFileService(new Map([
 			['bar', FileSystemProviderCapabilities.PathCaseSensitive],
-			['foo', 0]
+			['foo', FileSystemProviderCapabilities.None]
 		])));
 	});
 
diff --git a/src/vs/platform/userDataProfile/common/userDataProfile.ts b/src/vs/platform/userDataProfile/common/userDataProfile.ts
index 7db402af89e296..a8d3c445baa969 100644
--- a/src/vs/platform/userDataProfile/common/userDataProfile.ts
+++ b/src/vs/platform/userDataProfile/common/userDataProfile.ts
@@ -13,13 +13,14 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
 import { IFileService } from 'vs/platform/files/common/files';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vs/platform/log/common/log';
-import { ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import { IAnyWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
 import { ResourceMap } from 'vs/base/common/map';
 import { IStringDictionary } from 'vs/base/common/collections';
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 import { Promises } from 'vs/base/common/async';
 import { generateUuid } from 'vs/base/common/uuid';
 import { escapeRegExpCharacters } from 'vs/base/common/strings';
+import { isString } from 'vs/base/common/types';
 
 /**
  * Flags to indicate whether to use the default profile or not.
@@ -68,9 +69,6 @@ export function isUserDataProfile(thing: unknown): thing is IUserDataProfile {
 
 export const PROFILES_ENABLEMENT_CONFIG = 'workbench.experimental.settingsProfiles.enabled';
 
-export type EmptyWindowWorkspaceIdentifier = 'empty-window';
-export type WorkspaceIdentifier = ISingleFolderWorkspaceIdentifier | IWorkspaceIdentifier | EmptyWindowWorkspaceIdentifier;
-
 export type DidChangeProfilesEvent = { readonly added: readonly IUserDataProfile[]; readonly removed: readonly IUserDataProfile[]; readonly updated: readonly IUserDataProfile[]; readonly all: readonly IUserDataProfile[] };
 
 export type WillCreateProfileEvent = {
@@ -106,13 +104,13 @@ export interface IUserDataProfilesService {
 	readonly onDidResetWorkspaces: Event<void>;
 
 	isEnabled(): boolean;
-	createNamedProfile(name: string, options?: IUserDataProfileOptions, workspaceIdentifier?: WorkspaceIdentifier): Promise<IUserDataProfile>;
-	createTransientProfile(workspaceIdentifier?: WorkspaceIdentifier): Promise<IUserDataProfile>;
-	createProfile(id: string, name: string, options?: IUserDataProfileOptions, workspaceIdentifier?: WorkspaceIdentifier): Promise<IUserDataProfile>;
+	createNamedProfile(name: string, options?: IUserDataProfileOptions, workspaceIdentifier?: IAnyWorkspaceIdentifier): Promise<IUserDataProfile>;
+	createTransientProfile(workspaceIdentifier?: IAnyWorkspaceIdentifier): Promise<IUserDataProfile>;
+	createProfile(id: string, name: string, options?: IUserDataProfileOptions, workspaceIdentifier?: IAnyWorkspaceIdentifier): Promise<IUserDataProfile>;
 	updateProfile(profile: IUserDataProfile, options?: IUserDataProfileUpdateOptions,): Promise<IUserDataProfile>;
 	removeProfile(profile: IUserDataProfile): Promise<void>;
 
-	setProfileForWorkspace(workspaceIdentifier: WorkspaceIdentifier, profile: IUserDataProfile): Promise<void>;
+	setProfileForWorkspace(workspaceIdentifier: IAnyWorkspaceIdentifier, profile: IUserDataProfile): Promise<void>;
 	resetWorkspaces(): Promise<void>;
 
 	cleanUp(): Promise<void>;
@@ -158,7 +156,7 @@ export function toUserDataProfile(id: string, name: string, location: URI, optio
 export type UserDataProfilesObject = {
 	profiles: IUserDataProfile[];
 	workspaces: ResourceMap<IUserDataProfile>;
-	emptyWindow?: IUserDataProfile;
+	emptyWindows: Map<string, IUserDataProfile>;
 };
 
 export type StoredUserDataProfile = {
@@ -170,7 +168,7 @@ export type StoredUserDataProfile = {
 
 export type StoredProfileAssociations = {
 	workspaces?: IStringDictionary<string>;
-	emptyWindow?: string;
+	emptyWindows?: IStringDictionary<string>;
 };
 
 export class UserDataProfilesService extends Disposable implements IUserDataProfilesService {
@@ -202,7 +200,8 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 
 	protected readonly transientProfilesObject: UserDataProfilesObject = {
 		profiles: [],
-		workspaces: new ResourceMap()
+		workspaces: new ResourceMap(),
+		emptyWindows: new Map()
 	};
 
 	constructor(
@@ -229,15 +228,24 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 	protected _profilesObject: UserDataProfilesObject | undefined;
 	protected get profilesObject(): UserDataProfilesObject {
 		if (!this._profilesObject) {
-			const profiles = this.enabled ? this.getStoredProfiles().map<IUserDataProfile>(storedProfile => toUserDataProfile(basename(storedProfile.location), storedProfile.name, storedProfile.location, { shortName: storedProfile.shortName, useDefaultFlags: storedProfile.useDefaultFlags })) : [];
-			let emptyWindow: IUserDataProfile | undefined;
+			const profiles = [];
+			if (this.enabled) {
+				for (const storedProfile of this.getStoredProfiles()) {
+					if (!storedProfile.name || !isString(storedProfile.name) || !storedProfile.location) {
+						this.logService.warn('Skipping the invalid stored profile', storedProfile.location || storedProfile.name);
+						continue;
+					}
+					profiles.push(toUserDataProfile(basename(storedProfile.location), storedProfile.name, storedProfile.location, { shortName: storedProfile.shortName, useDefaultFlags: storedProfile.useDefaultFlags }));
+				}
+			}
 			const workspaces = new ResourceMap<IUserDataProfile>();
+			const emptyWindows = new Map<string, IUserDataProfile>();
 			const defaultProfile = toUserDataProfile(hash(this.environmentService.userRoamingDataHome.path).toString(16), localize('defaultProfile', "Default"), this.environmentService.userRoamingDataHome);
 			profiles.unshift({ ...defaultProfile, extensionsResource: this.getDefaultProfileExtensionsLocation() ?? defaultProfile.extensionsResource, isDefault: true });
 			if (profiles.length) {
-				const profileAssicaitions = this.getStoredProfileAssociations();
-				if (profileAssicaitions.workspaces) {
-					for (const [workspacePath, profilePath] of Object.entries(profileAssicaitions.workspaces)) {
+				const profileAssociaitions = this.getStoredProfileAssociations();
+				if (profileAssociaitions.workspaces) {
+					for (const [workspacePath, profilePath] of Object.entries(profileAssociaitions.workspaces)) {
 						const workspace = URI.parse(workspacePath);
 						const profileLocation = URI.parse(profilePath);
 						const profile = profiles.find(p => this.uriIdentityService.extUri.isEqual(p.location, profileLocation));
@@ -246,17 +254,22 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 						}
 					}
 				}
-				if (profileAssicaitions.emptyWindow) {
-					const emptyWindowProfileLocation = URI.parse(profileAssicaitions.emptyWindow);
-					emptyWindow = profiles.find(p => this.uriIdentityService.extUri.isEqual(p.location, emptyWindowProfileLocation));
+				if (profileAssociaitions.emptyWindows) {
+					for (const [windowId, profilePath] of Object.entries(profileAssociaitions.emptyWindows)) {
+						const profileLocation = URI.parse(profilePath);
+						const profile = profiles.find(p => this.uriIdentityService.extUri.isEqual(p.location, profileLocation));
+						if (profile) {
+							emptyWindows.set(windowId, profile);
+						}
+					}
 				}
 			}
-			this._profilesObject = { profiles, workspaces, emptyWindow };
+			this._profilesObject = { profiles, workspaces, emptyWindows };
 		}
 		return this._profilesObject;
 	}
 
-	async createTransientProfile(workspaceIdentifier?: WorkspaceIdentifier): Promise<IUserDataProfile> {
+	async createTransientProfile(workspaceIdentifier?: IAnyWorkspaceIdentifier): Promise<IUserDataProfile> {
 		const namePrefix = `Temp`;
 		const nameRegEx = new RegExp(`${escapeRegExpCharacters(namePrefix)}\\s(\\d+)`);
 		let nameIndex = 0;
@@ -269,11 +282,11 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 		return this.createProfile(hash(generateUuid()).toString(16), name, { transient: true }, workspaceIdentifier);
 	}
 
-	async createNamedProfile(name: string, options?: IUserDataProfileOptions, workspaceIdentifier?: WorkspaceIdentifier): Promise<IUserDataProfile> {
+	async createNamedProfile(name: string, options?: IUserDataProfileOptions, workspaceIdentifier?: IAnyWorkspaceIdentifier): Promise<IUserDataProfile> {
 		return this.createProfile(hash(generateUuid()).toString(16), name, options, workspaceIdentifier);
 	}
 
-	async createProfile(id: string, name: string, options?: IUserDataProfileOptions, workspaceIdentifier?: WorkspaceIdentifier): Promise<IUserDataProfile> {
+	async createProfile(id: string, name: string, options?: IUserDataProfileOptions, workspaceIdentifier?: IAnyWorkspaceIdentifier): Promise<IUserDataProfile> {
 		if (!this.enabled) {
 			throw new Error(`Profiles are disabled. Enable them via the '${PROFILES_ENABLEMENT_CONFIG}' setting.`);
 		}
@@ -288,6 +301,9 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 	}
 
 	private async doCreateProfile(id: string, name: string, options?: IUserDataProfileOptions): Promise<IUserDataProfile> {
+		if (!isString(name) || !name) {
+			throw new Error('Name of the profile is mandatory and must be of type `string`');
+		}
 		let profileCreationPromise = this.profileCreationPromises.get(name);
 		if (!profileCreationPromise) {
 			profileCreationPromise = (async () => {
@@ -362,8 +378,10 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 			this.logService.error(error);
 		}
 
-		if (profile.id === this.profilesObject.emptyWindow?.id) {
-			this.profilesObject.emptyWindow = undefined;
+		for (const windowId of [...this.profilesObject.emptyWindows.keys()]) {
+			if (profile.id === this.profilesObject.emptyWindows.get(windowId)?.id) {
+				this.profilesObject.emptyWindows.delete(windowId);
+			}
 		}
 		for (const workspace of [...this.profilesObject.workspaces.keys()]) {
 			if (profile.id === this.profilesObject.workspaces.get(workspace)?.id) {
@@ -385,28 +403,7 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 		}
 	}
 
-	getOrSetProfileForWorkspace(workspaceIdentifier: WorkspaceIdentifier, profileToSet: IUserDataProfile = this.defaultProfile): IUserDataProfile {
-		if (!this.enabled) {
-			return this.defaultProfile;
-		}
-
-		let profile = this.getProfileForWorkspace(workspaceIdentifier);
-		if (!profile) {
-			profile = profileToSet;
-			// Associate the profile to workspace only if there are user profiles
-			// If there are no profiles, workspaces are associated to default profile by default
-			if (this.profiles.length > 1) {
-				this.setProfileForWorkspaceSync(workspaceIdentifier, profile);
-			}
-		}
-		return profile;
-	}
-
-	async setProfileForWorkspace(workspaceIdentifier: WorkspaceIdentifier, profileToSet: IUserDataProfile): Promise<void> {
-		this.setProfileForWorkspaceSync(workspaceIdentifier, profileToSet);
-	}
-
-	setProfileForWorkspaceSync(workspaceIdentifier: WorkspaceIdentifier, profileToSet: IUserDataProfile): void {
+	async setProfileForWorkspace(workspaceIdentifier: IAnyWorkspaceIdentifier, profileToSet: IUserDataProfile): Promise<void> {
 		if (!this.enabled) {
 			throw new Error(`Profiles are disabled. Enable them via the '${PROFILES_ENABLEMENT_CONFIG}' setting.`);
 		}
@@ -419,7 +416,7 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 		this.updateWorkspaceAssociation(workspaceIdentifier, profile);
 	}
 
-	unsetWorkspace(workspaceIdentifier: WorkspaceIdentifier, transient?: boolean): void {
+	unsetWorkspace(workspaceIdentifier: IAnyWorkspaceIdentifier, transient?: boolean): void {
 		if (!this.enabled) {
 			throw new Error(`Profiles are disabled. Enable them via the '${PROFILES_ENABLEMENT_CONFIG}' setting.`);
 		}
@@ -429,9 +426,9 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 
 	async resetWorkspaces(): Promise<void> {
 		this.transientProfilesObject.workspaces.clear();
-		this.transientProfilesObject.emptyWindow = undefined;
+		this.transientProfilesObject.emptyWindows.clear();
 		this.profilesObject.workspaces.clear();
-		this.profilesObject.emptyWindow = undefined;
+		this.profilesObject.emptyWindows.clear();
 		this.updateStoredProfileAssociations();
 		this._onDidResetWorkspaces.fire();
 	}
@@ -456,29 +453,29 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 		await Promise.allSettled(unAssociatedTransientProfiles.map(p => this.removeProfile(p)));
 	}
 
-	private getProfileForWorkspace(workspaceIdentifier: WorkspaceIdentifier): IUserDataProfile | undefined {
+	getProfileForWorkspace(workspaceIdentifier: IAnyWorkspaceIdentifier): IUserDataProfile | undefined {
 		const workspace = this.getWorkspace(workspaceIdentifier);
-		return URI.isUri(workspace) ? this.transientProfilesObject.workspaces.get(workspace) ?? this.profilesObject.workspaces.get(workspace) : this.transientProfilesObject.emptyWindow ?? this.profilesObject.emptyWindow;
+		return URI.isUri(workspace) ? this.transientProfilesObject.workspaces.get(workspace) ?? this.profilesObject.workspaces.get(workspace) : this.transientProfilesObject.emptyWindows.get(workspace) ?? this.profilesObject.emptyWindows.get(workspace);
 	}
 
-	protected getWorkspace(workspaceIdentifier: WorkspaceIdentifier): URI | EmptyWindowWorkspaceIdentifier {
+	protected getWorkspace(workspaceIdentifier: IAnyWorkspaceIdentifier): URI | string {
 		if (isSingleFolderWorkspaceIdentifier(workspaceIdentifier)) {
 			return workspaceIdentifier.uri;
 		}
 		if (isWorkspaceIdentifier(workspaceIdentifier)) {
 			return workspaceIdentifier.configPath;
 		}
-		return 'empty-window';
+		return workspaceIdentifier.id;
 	}
 
 	private isProfileAssociatedToWorkspace(profile: IUserDataProfile): boolean {
-		if (this.uriIdentityService.extUri.isEqual(this.transientProfilesObject.emptyWindow?.location, profile.location)) {
+		if ([...this.transientProfilesObject.emptyWindows.values()].some(windowProfile => this.uriIdentityService.extUri.isEqual(windowProfile.location, profile.location))) {
 			return true;
 		}
 		if ([...this.transientProfilesObject.workspaces.values()].some(workspaceProfile => this.uriIdentityService.extUri.isEqual(workspaceProfile.location, profile.location))) {
 			return true;
 		}
-		if (this.uriIdentityService.extUri.isEqual(this.profilesObject.emptyWindow?.location, profile.location)) {
+		if ([...this.profilesObject.emptyWindows.values()].some(windowProfile => this.uriIdentityService.extUri.isEqual(windowProfile.location, profile.location))) {
 			return true;
 		}
 		if ([...this.profilesObject.workspaces.values()].some(workspaceProfile => this.uriIdentityService.extUri.isEqual(workspaceProfile.location, profile.location))) {
@@ -514,7 +511,7 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 		this._onDidChangeProfiles.fire({ added, removed, updated, all: this.profiles });
 	}
 
-	private updateWorkspaceAssociation(workspaceIdentifier: WorkspaceIdentifier, newProfile?: IUserDataProfile, transient?: boolean): void {
+	private updateWorkspaceAssociation(workspaceIdentifier: IAnyWorkspaceIdentifier, newProfile?: IUserDataProfile, transient?: boolean): void {
 		// Force transient if the new profile to associate is transient
 		transient = newProfile?.isTransient ? true : transient;
 
@@ -535,7 +532,10 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 		}
 		// Empty Window
 		else {
-			profilesObject.emptyWindow = newProfile;
+			profilesObject.emptyWindows.delete(workspace);
+			if (newProfile) {
+				profilesObject.emptyWindows.set(workspace, newProfile);
+			}
 		}
 
 		if (!transient) {
@@ -548,8 +548,11 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 		for (const [workspace, profile] of this.profilesObject.workspaces.entries()) {
 			workspaces[workspace.toString()] = profile.location.toString();
 		}
-		const emptyWindow = this.profilesObject.emptyWindow?.location.toString();
-		this.saveStoredProfileAssociations({ workspaces, emptyWindow });
+		const emptyWindows: IStringDictionary<string> = {};
+		for (const [windowId, profile] of this.profilesObject.emptyWindows.entries()) {
+			emptyWindows[windowId.toString()] = profile.location.toString();
+		}
+		this.saveStoredProfileAssociations({ workspaces, emptyWindows });
 		this._profilesObject = undefined;
 	}
 
diff --git a/src/vs/platform/userDataProfile/electron-main/userDataProfile.ts b/src/vs/platform/userDataProfile/electron-main/userDataProfile.ts
index c947e37ca2813b..1f286fbd939c5e 100644
--- a/src/vs/platform/userDataProfile/electron-main/userDataProfile.ts
+++ b/src/vs/platform/userDataProfile/electron-main/userDataProfile.ts
@@ -11,15 +11,16 @@ import { refineServiceDecorator } from 'vs/platform/instantiation/common/instant
 import { ILogService } from 'vs/platform/log/common/log';
 import { IStateMainService } from 'vs/platform/state/electron-main/state';
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IUserDataProfilesService, WorkspaceIdentifier, StoredUserDataProfile, StoredProfileAssociations, WillCreateProfileEvent, WillRemoveProfileEvent, IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { IUserDataProfilesService, StoredUserDataProfile, StoredProfileAssociations, WillCreateProfileEvent, WillRemoveProfileEvent, IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
 import { UserDataProfilesService } from 'vs/platform/userDataProfile/node/userDataProfile';
 import { IStringDictionary } from 'vs/base/common/collections';
+import { IAnyWorkspaceIdentifier, IEmptyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
 
 export const IUserDataProfilesMainService = refineServiceDecorator<IUserDataProfilesService, IUserDataProfilesMainService>(IUserDataProfilesService);
 export interface IUserDataProfilesMainService extends IUserDataProfilesService {
-	getOrSetProfileForWorkspace(workspaceIdentifier: WorkspaceIdentifier, profileToSet?: IUserDataProfile): IUserDataProfile;
-	setProfileForWorkspaceSync(workspaceIdentifier: WorkspaceIdentifier, profileToSet: IUserDataProfile): void;
-	unsetWorkspace(workspaceIdentifier: WorkspaceIdentifier, transient?: boolean): void;
+	getProfileForWorkspace(workspaceIdentifier: IAnyWorkspaceIdentifier): IUserDataProfile | undefined;
+	unsetWorkspace(workspaceIdentifier: IAnyWorkspaceIdentifier, transient?: boolean): void;
+	getAssociatedEmptyWindows(): IEmptyWorkspaceIdentifier[];
 	readonly onWillCreateProfile: Event<WillCreateProfileEvent>;
 	readonly onWillRemoveProfile: Event<WillRemoveProfileEvent>;
 }
@@ -45,6 +46,14 @@ export class UserDataProfilesMainService extends UserDataProfilesService impleme
 		}
 	}
 
+	getAssociatedEmptyWindows(): IEmptyWorkspaceIdentifier[] {
+		const emptyWindows: IEmptyWorkspaceIdentifier[] = [];
+		for (const id of this.profilesObject.emptyWindows.keys()) {
+			emptyWindows.push({ id });
+		}
+		return emptyWindows;
+	}
+
 	protected override saveStoredProfiles(storedProfiles: StoredUserDataProfile[]): void {
 		if (storedProfiles.length) {
 			this.stateMainService.setItem(UserDataProfilesMainService.PROFILES_KEY, storedProfiles);
@@ -54,7 +63,7 @@ export class UserDataProfilesMainService extends UserDataProfilesService impleme
 	}
 
 	protected override saveStoredProfileAssociations(storedProfileAssociations: StoredProfileAssociations): void {
-		if (storedProfileAssociations.emptyWindow || storedProfileAssociations.workspaces) {
+		if (storedProfileAssociations.emptyWindows || storedProfileAssociations.workspaces) {
 			this.stateMainService.setItem(UserDataProfilesMainService.PROFILE_ASSOCIATIONS_KEY, storedProfileAssociations);
 		} else {
 			this.stateMainService.removeItem(UserDataProfilesMainService.PROFILE_ASSOCIATIONS_KEY);
diff --git a/src/vs/platform/userDataProfile/electron-main/userDataProfilesHandler.ts b/src/vs/platform/userDataProfile/electron-main/userDataProfilesHandler.ts
new file mode 100644
index 00000000000000..4fdd18f6dc7b47
--- /dev/null
+++ b/src/vs/platform/userDataProfile/electron-main/userDataProfilesHandler.ts
@@ -0,0 +1,60 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 'vs/base/common/lifecycle';
+import { ILifecycleMainService, } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
+import { ICodeWindow, LoadReason } from 'vs/platform/window/electron-main/window';
+import { IUserDataProfilesMainService } from 'vs/platform/userDataProfile/electron-main/userDataProfile';
+import { IAnyWorkspaceIdentifier, isEmptyWorkspaceIdentifier, toWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import { RunOnceScheduler } from 'vs/base/common/async';
+import { IWindowsMainService } from 'vs/platform/windows/electron-main/windows';
+
+export class UserDataProfilesHandler extends Disposable {
+
+	constructor(
+		@ILifecycleMainService lifecycleMainService: ILifecycleMainService,
+		@IUserDataProfilesMainService private readonly userDataProfilesService: IUserDataProfilesMainService,
+		@IWindowsMainService private readonly windowsMainService: IWindowsMainService,
+	) {
+		super();
+		this._register(lifecycleMainService.onWillLoadWindow(e => {
+			if (e.reason === LoadReason.LOAD) {
+				this.unsetProfileForWorkspace(e.window);
+			}
+		}));
+		this._register(lifecycleMainService.onBeforeCloseWindow(window => this.unsetProfileForWorkspace(window)));
+		this._register(new RunOnceScheduler(() => this.cleanUpEmptyWindowAssociations(), 30 * 1000 /* after 30s */)).schedule();
+	}
+
+	private async unsetProfileForWorkspace(window: ICodeWindow): Promise<void> {
+		const workspace = this.getWorkspace(window);
+		const profile = this.userDataProfilesService.getProfileForWorkspace(workspace);
+		if (profile && (isEmptyWorkspaceIdentifier(workspace) || profile.isTransient)) {
+			this.userDataProfilesService.unsetWorkspace(workspace, profile.isTransient);
+			if (profile.isTransient) {
+				await this.userDataProfilesService.cleanUpTransientProfiles();
+			}
+		}
+	}
+
+	private getWorkspace(window: ICodeWindow): IAnyWorkspaceIdentifier {
+		return window.openedWorkspace ?? toWorkspaceIdentifier(window.backupPath, window.isExtensionDevelopmentHost);
+	}
+
+	private cleanUpEmptyWindowAssociations(): void {
+		const associatedEmptyWindows = this.userDataProfilesService.getAssociatedEmptyWindows();
+		if (associatedEmptyWindows.length === 0) {
+			return;
+		}
+		const openedWorkspaces = this.windowsMainService.getWindows().map(window => this.getWorkspace(window));
+		for (const associatedEmptyWindow of associatedEmptyWindows) {
+			if (openedWorkspaces.some(openedWorkspace => openedWorkspace.id === associatedEmptyWindow.id)) {
+				continue;
+			}
+			this.userDataProfilesService.unsetWorkspace(associatedEmptyWindow, false);
+		}
+	}
+
+}
diff --git a/src/vs/platform/userDataProfile/electron-main/userDataTransientProfilesHandler.ts b/src/vs/platform/userDataProfile/electron-main/userDataTransientProfilesHandler.ts
deleted file mode 100644
index 8eef8ef44e4a15..00000000000000
--- a/src/vs/platform/userDataProfile/electron-main/userDataTransientProfilesHandler.ts
+++ /dev/null
@@ -1,35 +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 { WorkspaceIdentifier } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ILifecycleMainService, } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
-import { LoadReason } from 'vs/platform/window/electron-main/window';
-import { IUserDataProfilesMainService } from 'vs/platform/userDataProfile/electron-main/userDataProfile';
-
-export class UserDataTransientProfilesHandler extends Disposable {
-
-	constructor(
-		@ILifecycleMainService lifecycleMainService: ILifecycleMainService,
-		@IUserDataProfilesMainService private readonly userDataProfilesService: IUserDataProfilesMainService,
-	) {
-		super();
-		this._register(lifecycleMainService.onWillLoadWindow(e => {
-			if (e.reason === LoadReason.LOAD) {
-				this.unsetTransientProfileForWorkspace(e.window.openedWorkspace ?? 'empty-window');
-			}
-		}));
-		this._register(lifecycleMainService.onBeforeCloseWindow(window => this.unsetTransientProfileForWorkspace(window.openedWorkspace ?? 'empty-window')));
-	}
-
-	private async unsetTransientProfileForWorkspace(workspace: WorkspaceIdentifier): Promise<void> {
-		const profile = this.userDataProfilesService.getOrSetProfileForWorkspace(workspace);
-		if (profile.isTransient) {
-			this.userDataProfilesService.unsetWorkspace(workspace, true);
-			await this.userDataProfilesService.cleanUpTransientProfiles();
-		}
-	}
-
-}
diff --git a/src/vs/platform/userDataProfile/electron-sandbox/userDataProfile.ts b/src/vs/platform/userDataProfile/electron-sandbox/userDataProfile.ts
index 6bcd8ab1c3e275..60767bf59efbfe 100644
--- a/src/vs/platform/userDataProfile/electron-sandbox/userDataProfile.ts
+++ b/src/vs/platform/userDataProfile/electron-sandbox/userDataProfile.ts
@@ -10,7 +10,8 @@ import { URI, UriDto } from 'vs/base/common/uri';
 import { IChannel } from 'vs/base/parts/ipc/common/ipc';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IMainProcessService } from 'vs/platform/ipc/electron-sandbox/services';
-import { DidChangeProfilesEvent, IUserDataProfile, IUserDataProfileOptions, IUserDataProfilesService, IUserDataProfileUpdateOptions, reviveProfile, WorkspaceIdentifier } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { DidChangeProfilesEvent, IUserDataProfile, IUserDataProfileOptions, IUserDataProfilesService, IUserDataProfileUpdateOptions, reviveProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { IAnyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
 
 export class UserDataProfilesNativeService extends Disposable implements IUserDataProfilesService {
 
@@ -58,22 +59,22 @@ export class UserDataProfilesNativeService extends Disposable implements IUserDa
 		return this.enabled;
 	}
 
-	async createNamedProfile(name: string, options?: IUserDataProfileOptions, workspaceIdentifier?: WorkspaceIdentifier): Promise<IUserDataProfile> {
+	async createNamedProfile(name: string, options?: IUserDataProfileOptions, workspaceIdentifier?: IAnyWorkspaceIdentifier): Promise<IUserDataProfile> {
 		const result = await this.channel.call<UriDto<IUserDataProfile>>('createNamedProfile', [name, options, workspaceIdentifier]);
 		return reviveProfile(result, this.profilesHome.scheme);
 	}
 
-	async createProfile(id: string, name: string, options?: IUserDataProfileOptions, workspaceIdentifier?: WorkspaceIdentifier): Promise<IUserDataProfile> {
+	async createProfile(id: string, name: string, options?: IUserDataProfileOptions, workspaceIdentifier?: IAnyWorkspaceIdentifier): Promise<IUserDataProfile> {
 		const result = await this.channel.call<UriDto<IUserDataProfile>>('createProfile', [id, name, options, workspaceIdentifier]);
 		return reviveProfile(result, this.profilesHome.scheme);
 	}
 
-	async createTransientProfile(workspaceIdentifier?: WorkspaceIdentifier): Promise<IUserDataProfile> {
+	async createTransientProfile(workspaceIdentifier?: IAnyWorkspaceIdentifier): Promise<IUserDataProfile> {
 		const result = await this.channel.call<UriDto<IUserDataProfile>>('createTransientProfile', [workspaceIdentifier]);
 		return reviveProfile(result, this.profilesHome.scheme);
 	}
 
-	async setProfileForWorkspace(workspaceIdentifier: WorkspaceIdentifier, profile: IUserDataProfile): Promise<void> {
+	async setProfileForWorkspace(workspaceIdentifier: IAnyWorkspaceIdentifier, profile: IUserDataProfile): Promise<void> {
 		await this.channel.call<UriDto<IUserDataProfile>>('setProfileForWorkspace', [workspaceIdentifier, profile]);
 	}
 
diff --git a/src/vs/platform/userDataProfile/node/userDataProfile.ts b/src/vs/platform/userDataProfile/node/userDataProfile.ts
index c930777f93343b..5207b9fdfcdb62 100644
--- a/src/vs/platform/userDataProfile/node/userDataProfile.ts
+++ b/src/vs/platform/userDataProfile/node/userDataProfile.ts
@@ -12,18 +12,36 @@ import { IStateService } from 'vs/platform/state/node/state';
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 import { IUserDataProfilesService, UserDataProfilesService as BaseUserDataProfilesService, StoredUserDataProfile, StoredProfileAssociations } from 'vs/platform/userDataProfile/common/userDataProfile';
 
-export class UserDataProfilesService extends BaseUserDataProfilesService implements IUserDataProfilesService {
+export class ServerUserDataProfilesService extends BaseUserDataProfilesService implements IUserDataProfilesService {
 
 	constructor(
-		@IStateService private readonly stateService: IStateService,
 		@IUriIdentityService uriIdentityService: IUriIdentityService,
-		@INativeEnvironmentService private readonly nativeEnvironmentService: INativeEnvironmentService,
+		@INativeEnvironmentService protected readonly nativeEnvironmentService: INativeEnvironmentService,
 		@IFileService fileService: IFileService,
 		@ILogService logService: ILogService,
 	) {
 		super(nativeEnvironmentService, fileService, uriIdentityService, logService);
 	}
 
+	protected override getDefaultProfileExtensionsLocation(): URI {
+		return this.uriIdentityService.extUri.joinPath(URI.file(this.nativeEnvironmentService.extensionsPath).with({ scheme: this.profilesHome.scheme }), 'extensions.json');
+	}
+
+}
+
+
+export class UserDataProfilesService extends ServerUserDataProfilesService implements IUserDataProfilesService {
+
+	constructor(
+		@IStateService private readonly stateService: IStateService,
+		@IUriIdentityService uriIdentityService: IUriIdentityService,
+		@INativeEnvironmentService nativeEnvironmentService: INativeEnvironmentService,
+		@IFileService fileService: IFileService,
+		@ILogService logService: ILogService,
+	) {
+		super(uriIdentityService, nativeEnvironmentService, fileService, logService);
+	}
+
 	protected override getStoredProfiles(): StoredUserDataProfile[] {
 		return revive(this.stateService.getItem<UriDto<StoredUserDataProfile>[]>(UserDataProfilesService.PROFILES_KEY, []));
 	}
diff --git a/src/vs/platform/userDataProfile/test/electron-main/userDataProfileMainService.test.ts b/src/vs/platform/userDataProfile/test/electron-main/userDataProfileMainService.test.ts
index b0a0e384e55c11..d184f77020d854 100644
--- a/src/vs/platform/userDataProfile/test/electron-main/userDataProfileMainService.test.ts
+++ b/src/vs/platform/userDataProfile/test/electron-main/userDataProfileMainService.test.ts
@@ -70,4 +70,39 @@ suite('UserDataProfileMainService', () => {
 		assert.strictEqual(testObject.defaultProfile.isDefault, true);
 	});
 
+	test('when no profile is set', async () => {
+		await testObject.createNamedProfile('profile1');
+
+		assert.equal(testObject.getProfileForWorkspace({ id: 'id' }), undefined);
+		assert.equal(testObject.getProfileForWorkspace({ id: 'id', configPath: environmentService.userRoamingDataHome }), undefined);
+		assert.equal(testObject.getProfileForWorkspace({ id: 'id', uri: environmentService.userRoamingDataHome }), undefined);
+	});
+
+	test('set profile to a workspace', async () => {
+		const workspace = { id: 'id', configPath: environmentService.userRoamingDataHome };
+		const profile = await testObject.createNamedProfile('profile1');
+
+		testObject.setProfileForWorkspace(workspace, profile);
+
+		assert.deepStrictEqual(testObject.getProfileForWorkspace(workspace), profile);
+	});
+
+	test('set profile to a folder', async () => {
+		const workspace = { id: 'id', uri: environmentService.userRoamingDataHome };
+		const profile = await testObject.createNamedProfile('profile1');
+
+		testObject.setProfileForWorkspace(workspace, profile);
+
+		assert.deepStrictEqual(testObject.getProfileForWorkspace(workspace), profile);
+	});
+
+	test('set profile to a window', async () => {
+		const workspace = { id: 'id' };
+		const profile = await testObject.createNamedProfile('profile1');
+
+		testObject.setProfileForWorkspace(workspace, profile);
+
+		assert.deepStrictEqual(testObject.getProfileForWorkspace(workspace), profile);
+	});
+
 });
diff --git a/src/vs/platform/userDataSync/common/abstractSynchronizer.ts b/src/vs/platform/userDataSync/common/abstractSynchronizer.ts
index befcc81a01aedd..383f9c746ab779 100644
--- a/src/vs/platform/userDataSync/common/abstractSynchronizer.ts
+++ b/src/vs/platform/userDataSync/common/abstractSynchronizer.ts
@@ -20,7 +20,7 @@ import { IHeaders } from 'vs/base/parts/request/common/request';
 import { localize } from 'vs/nls';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { FileChangesEvent, FileOperationError, FileOperationResult, IFileContent, IFileService } from 'vs/platform/files/common/files';
+import { FileChangesEvent, FileOperationError, FileOperationResult, IFileContent, IFileService, toFileOperationResult } from 'vs/platform/files/common/files';
 import { ILogService } from 'vs/platform/log/common/log';
 import { getServiceMachineId } from 'vs/platform/externalServices/common/serviceMachineId';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
@@ -540,8 +540,10 @@ export abstract class AbstractSynchroniser extends Disposable implements IUserDa
 		this.storageService.remove(this.lastSyncUserDataStateKey, StorageScope.APPLICATION);
 		try {
 			await this.fileService.del(this.lastSyncResource);
-		} catch (e) {
-			this.logService.error(e);
+		} catch (error) {
+			if (toFileOperationResult(error) !== FileOperationResult.FILE_NOT_FOUND) {
+				this.logService.error(error);
+			}
 		}
 	}
 
diff --git a/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts b/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts
index 681285f15a22d9..999b74dc3e256b 100644
--- a/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts
+++ b/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts
@@ -24,15 +24,15 @@ import { IUserDataSyncMachinesService } from 'vs/platform/userDataSync/common/us
 type AutoSyncClassification = {
 	owner: 'sandy081';
 	comment: 'Information about the sources triggering auto sync';
-	sources: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Source that triggered auto sync' };
-	providerId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Auth provider id used for sync' };
+	sources: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Source that triggered auto sync' };
+	providerId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Auth provider id used for sync' };
 };
 
 type AutoSyncErrorClassification = {
 	owner: 'sandy081';
 	comment: 'Information about the error that causes auto sync to fail';
 	code: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'error code' };
-	service: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Settings sync service for which this error has occurred' };
+	service: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Settings sync service for which this error has occurred' };
 };
 
 const disableMachineEventuallyKey = 'sync.disableMachineEventually';
@@ -267,6 +267,12 @@ export class UserDataAutoSyncService extends Disposable implements IUserDataAuto
 			this.logService.info('Auto Sync: Turned off sync because of making too many requests to server');
 		}
 
+		// Method Not Found
+		else if (userDataSyncError.code === UserDataSyncErrorCode.MethodNotFound) {
+			await this.turnOff(false, true /* force soft turnoff on error */);
+			this.logService.info('Auto Sync: Turned off sync because current client is making requests to server that are not supported');
+		}
+
 		// Upgrade Required or Gone
 		else if (userDataSyncError.code === UserDataSyncErrorCode.UpgradeRequired || userDataSyncError.code === UserDataSyncErrorCode.Gone) {
 			await this.turnOff(false, true /* force soft turnoff on error */,
@@ -458,87 +464,103 @@ class AutoSync extends Disposable {
 	private async doSync(reason: string, disableCache: boolean, token: CancellationToken): Promise<void> {
 		this.logService.info(`Auto Sync: Triggered by ${reason}`);
 		this._onDidStartSync.fire();
+
 		let error: Error | undefined;
 		try {
-			this.syncTask = await this.userDataSyncService.createSyncTask(this.manifest, disableCache);
-			if (token.isCancellationRequested) {
-				return;
-			}
-			this.manifest = this.syncTask.manifest;
-
-			// Server has no data but this machine was synced before
-			if (this.manifest === null && await this.userDataSyncService.hasPreviouslySynced()) {
-				if (this.hasSyncServiceChanged()) {
-					if (await this.hasDefaultServiceChanged()) {
-						throw new UserDataAutoSyncError(localize('default service changed', "Cannot sync because default service has changed"), UserDataSyncErrorCode.DefaultServiceChanged);
-					} else {
-						throw new UserDataAutoSyncError(localize('service changed', "Cannot sync because sync service has changed"), UserDataSyncErrorCode.ServiceChanged);
-					}
-				} else {
-					// Sync was turned off in the cloud
-					throw new UserDataAutoSyncError(localize('turned off', "Cannot sync because syncing is turned off in the cloud"), UserDataSyncErrorCode.TurnedOff);
+			await this.createAndRunSyncTask(disableCache, token);
+		} catch (e) {
+			this.logService.error(e);
+			error = e;
+			if (UserDataSyncError.toUserDataSyncError(e).code === UserDataSyncErrorCode.MethodNotFound) {
+				try {
+					this.logService.info('Auto Sync: Client is making invalid requests. Cleaning up data...');
+					await this.userDataSyncService.cleanUpRemoteData();
+					this.logService.info('Auto Sync: Retrying sync...');
+					await this.createAndRunSyncTask(disableCache, token);
+					error = undefined;
+				} catch (e1) {
+					this.logService.error(e1);
+					error = e1;
 				}
 			}
+		}
 
-			const sessionId = this.storageService.get(sessionIdKey, StorageScope.APPLICATION);
-			// Server session is different from client session
-			if (sessionId && this.manifest && sessionId !== this.manifest.session) {
-				if (this.hasSyncServiceChanged()) {
-					if (await this.hasDefaultServiceChanged()) {
-						throw new UserDataAutoSyncError(localize('default service changed', "Cannot sync because default service has changed"), UserDataSyncErrorCode.DefaultServiceChanged);
-					} else {
-						throw new UserDataAutoSyncError(localize('service changed', "Cannot sync because sync service has changed"), UserDataSyncErrorCode.ServiceChanged);
-					}
+		this._onDidFinishSync.fire(error);
+	}
+
+	private async createAndRunSyncTask(disableCache: boolean, token: CancellationToken): Promise<void> {
+		this.syncTask = await this.userDataSyncService.createSyncTask(this.manifest, disableCache);
+		if (token.isCancellationRequested) {
+			return;
+		}
+		this.manifest = this.syncTask.manifest;
+
+		// Server has no data but this machine was synced before
+		if (this.manifest === null && await this.userDataSyncService.hasPreviouslySynced()) {
+			if (this.hasSyncServiceChanged()) {
+				if (await this.hasDefaultServiceChanged()) {
+					throw new UserDataAutoSyncError(localize('default service changed', "Cannot sync because default service has changed"), UserDataSyncErrorCode.DefaultServiceChanged);
 				} else {
-					throw new UserDataAutoSyncError(localize('session expired', "Cannot sync because current session is expired"), UserDataSyncErrorCode.SessionExpired);
+					throw new UserDataAutoSyncError(localize('service changed', "Cannot sync because sync service has changed"), UserDataSyncErrorCode.ServiceChanged);
 				}
+			} else {
+				// Sync was turned off in the cloud
+				throw new UserDataAutoSyncError(localize('turned off', "Cannot sync because syncing is turned off in the cloud"), UserDataSyncErrorCode.TurnedOff);
 			}
+		}
 
-			const machines = await this.userDataSyncMachinesService.getMachines(this.manifest || undefined);
-			// Return if cancellation is requested
-			if (token.isCancellationRequested) {
-				return;
-			}
-
-			const currentMachine = machines.find(machine => machine.isCurrent);
-			// Check if sync was turned off from other machine
-			if (currentMachine?.disabled) {
-				// Throw TurnedOff error
-				throw new UserDataAutoSyncError(localize('turned off machine', "Cannot sync because syncing is turned off on this machine from another machine."), UserDataSyncErrorCode.TurnedOff);
+		const sessionId = this.storageService.get(sessionIdKey, StorageScope.APPLICATION);
+		// Server session is different from client session
+		if (sessionId && this.manifest && sessionId !== this.manifest.session) {
+			if (this.hasSyncServiceChanged()) {
+				if (await this.hasDefaultServiceChanged()) {
+					throw new UserDataAutoSyncError(localize('default service changed', "Cannot sync because default service has changed"), UserDataSyncErrorCode.DefaultServiceChanged);
+				} else {
+					throw new UserDataAutoSyncError(localize('service changed', "Cannot sync because sync service has changed"), UserDataSyncErrorCode.ServiceChanged);
+				}
+			} else {
+				throw new UserDataAutoSyncError(localize('session expired', "Cannot sync because current session is expired"), UserDataSyncErrorCode.SessionExpired);
 			}
+		}
 
-			await this.syncTask.run();
+		const machines = await this.userDataSyncMachinesService.getMachines(this.manifest || undefined);
+		// Return if cancellation is requested
+		if (token.isCancellationRequested) {
+			return;
+		}
 
-			// After syncing, get the manifest if it was not available before
-			if (this.manifest === null) {
-				try {
-					this.manifest = await this.userDataSyncStoreService.manifest(null);
-				} catch (error) {
-					throw new UserDataAutoSyncError(toErrorMessage(error), error instanceof UserDataSyncError ? error.code : UserDataSyncErrorCode.Unknown);
-				}
-			}
+		const currentMachine = machines.find(machine => machine.isCurrent);
+		// Check if sync was turned off from other machine
+		if (currentMachine?.disabled) {
+			// Throw TurnedOff error
+			throw new UserDataAutoSyncError(localize('turned off machine', "Cannot sync because syncing is turned off on this machine from another machine."), UserDataSyncErrorCode.TurnedOff);
+		}
 
-			// Update local session id
-			if (this.manifest && this.manifest.session !== sessionId) {
-				this.storageService.store(sessionIdKey, this.manifest.session, StorageScope.APPLICATION, StorageTarget.MACHINE);
-			}
+		await this.syncTask.run();
 
-			// Return if cancellation is requested
-			if (token.isCancellationRequested) {
-				return;
+		// After syncing, get the manifest if it was not available before
+		if (this.manifest === null) {
+			try {
+				this.manifest = await this.userDataSyncStoreService.manifest(null);
+			} catch (error) {
+				throw new UserDataAutoSyncError(toErrorMessage(error), error instanceof UserDataSyncError ? error.code : UserDataSyncErrorCode.Unknown);
 			}
+		}
 
-			// Add current machine
-			if (!currentMachine) {
-				await this.userDataSyncMachinesService.addCurrentMachine(this.manifest || undefined);
-			}
+		// Update local session id
+		if (this.manifest && this.manifest.session !== sessionId) {
+			this.storageService.store(sessionIdKey, this.manifest.session, StorageScope.APPLICATION, StorageTarget.MACHINE);
+		}
 
-		} catch (e) {
-			this.logService.error(e);
-			error = e;
+		// Return if cancellation is requested
+		if (token.isCancellationRequested) {
+			return;
 		}
 
-		this._onDidFinishSync.fire(error);
+		// Add current machine
+		if (!currentMachine) {
+			await this.userDataSyncMachinesService.addCurrentMachine(this.manifest || undefined);
+		}
 	}
 
 	register<T extends IDisposable>(t: T): T {
diff --git a/src/vs/platform/userDataSync/common/userDataProfilesManifestMerge.ts b/src/vs/platform/userDataSync/common/userDataProfilesManifestMerge.ts
index 79212c98d02e3c..341d9af8660e72 100644
--- a/src/vs/platform/userDataSync/common/userDataProfilesManifestMerge.ts
+++ b/src/vs/platform/userDataSync/common/userDataProfilesManifestMerge.ts
@@ -20,26 +20,20 @@ interface IUserDataProfileInfo {
 }
 
 export function merge(local: IUserDataProfile[], remote: ISyncUserDataProfile[] | null, lastSync: ISyncUserDataProfile[] | null, ignored: string[]): IMergeResult {
-	const result: IRelaxedMergeResult = {
-		local: {
-			added: [],
-			removed: [],
-			updated: [],
-		}, remote: {
-			added: [],
-			removed: [],
-			updated: [],
-		}
-	};
+	const localResult: { added: ISyncUserDataProfile[]; removed: IUserDataProfile[]; updated: ISyncUserDataProfile[] } = { added: [], removed: [], updated: [] };
+	let remoteResult: { added: IUserDataProfile[]; removed: ISyncUserDataProfile[]; updated: IUserDataProfile[] } | null = { added: [], removed: [], updated: [] };
 
 	if (!remote) {
 		const added = local.filter(({ id }) => !ignored.includes(id));
 		if (added.length) {
-			result.remote!.added = added;
+			remoteResult.added = added;
 		} else {
-			result.remote = null;
+			remoteResult = null;
 		}
-		return result;
+		return {
+			local: localResult,
+			remote: remoteResult
+		};
 	}
 
 	const localToRemote = compare(local, remote, ignored);
@@ -52,7 +46,7 @@ export function merge(local: IUserDataProfile[], remote: ISyncUserDataProfile[]
 		for (const id of baseToRemote.removed) {
 			const e = local.find(profile => profile.id === id);
 			if (e) {
-				result.local.removed.push(e);
+				localResult.removed.push(e);
 			}
 		}
 
@@ -64,24 +58,24 @@ export function merge(local: IUserDataProfile[], remote: ISyncUserDataProfile[]
 				// Is different from local to remote
 				if (localToRemote.updated.includes(id)) {
 					// Remote wins always
-					result.local.updated.push(remoteProfile);
+					localResult.updated.push(remoteProfile);
 				}
 			} else {
-				result.local.added.push(remoteProfile);
+				localResult.added.push(remoteProfile);
 			}
 		}
 
 		// Remotely updated profiles
 		for (const id of baseToRemote.updated) {
 			// Remote wins always
-			result.local.updated.push(remote.find(profile => profile.id === id)!);
+			localResult.updated.push(remote.find(profile => profile.id === id)!);
 		}
 
 		// Locally added profiles
 		for (const id of baseToLocal.added) {
 			// Not there in remote
 			if (!baseToRemote.added.includes(id)) {
-				result.remote!.added.push(local.find(profile => profile.id === id)!);
+				remoteResult.added.push(local.find(profile => profile.id === id)!);
 			}
 		}
 
@@ -94,21 +88,24 @@ export function merge(local: IUserDataProfile[], remote: ISyncUserDataProfile[]
 
 			// If not updated in remote
 			if (!baseToRemote.updated.includes(id)) {
-				result.remote!.updated.push(local.find(profile => profile.id === id)!);
+				remoteResult.updated.push(local.find(profile => profile.id === id)!);
 			}
 		}
 
 		// Locally removed profiles
 		for (const id of baseToLocal.removed) {
-			result.remote!.removed.push(remote.find(profile => profile.id === id)!);
+			const removedProfile = remote.find(profile => profile.id === id);
+			if (removedProfile) {
+				remoteResult.removed.push(removedProfile);
+			}
 		}
 	}
 
-	if (result.remote!.added.length === 0 && result.remote!.removed.length === 0 && result.remote!.updated.length === 0) {
-		result.remote = null;
+	if (remoteResult.added.length === 0 && remoteResult.removed.length === 0 && remoteResult.updated.length === 0) {
+		remoteResult = null;
 	}
 
-	return result;
+	return { local: localResult, remote: remoteResult };
 }
 
 function compare(from: IUserDataProfileInfo[] | null, to: IUserDataProfileInfo[], ignoredProfiles: string[]): { added: string[]; removed: string[]; updated: string[] } {
diff --git a/src/vs/platform/userDataSync/common/userDataProfilesManifestSync.ts b/src/vs/platform/userDataSync/common/userDataProfilesManifestSync.ts
index 6336caec04208e..bfb6b5dbd86085 100644
--- a/src/vs/platform/userDataSync/common/userDataProfilesManifestSync.ts
+++ b/src/vs/platform/userDataSync/common/userDataProfilesManifestSync.ts
@@ -179,6 +179,11 @@ export class UserDataProfilesManifestSynchroniser extends AbstractSynchroniser i
 			this.logService.info(`${this.syncResourceLogLabel}: No changes found during synchronizing profiles.`);
 		}
 
+		const remoteProfiles = resourcePreviews[0][0].remoteProfiles || [];
+		if (remoteProfiles.length + (remote?.added.length ?? 0) - (remote?.removed.length ?? 0) > 20) {
+			throw new UserDataSyncError('Too many profiles to sync. Please remove some profiles and try again.', UserDataSyncErrorCode.LocalTooManyProfiles);
+		}
+
 		if (localChange !== Change.None) {
 			await this.backupLocal(stringifyLocalProfiles(this.getLocalUserDataProfiles(), false));
 			const promises: Promise<any>[] = [];
@@ -212,11 +217,17 @@ export class UserDataProfilesManifestSynchroniser extends AbstractSynchroniser i
 		}
 
 		if (remoteChange !== Change.None) {
-			const remoteProfiles = resourcePreviews[0][0].remoteProfiles || [];
 			this.logService.trace(`${this.syncResourceLogLabel}: Updating remote profiles...`);
-			for (const profile of remote?.added || []) {
-				const collection = await this.userDataSyncStoreService.createCollection(this.syncHeaders);
-				remoteProfiles.push({ id: profile.id, name: profile.name, collection, shortName: profile.shortName });
+			const addedCollections: string[] = [];
+			const canAddRemoteProfiles = remoteProfiles.length + (remote?.added.length ?? 0) <= 20;
+			if (canAddRemoteProfiles) {
+				for (const profile of remote?.added || []) {
+					const collection = await this.userDataSyncStoreService.createCollection(this.syncHeaders);
+					addedCollections.push(collection);
+					remoteProfiles.push({ id: profile.id, name: profile.name, collection, shortName: profile.shortName });
+				}
+			} else {
+				this.logService.info(`${this.syncResourceLogLabel}: Could not create remote profiles as there are too many profiles.`);
 			}
 			for (const profile of remote?.removed || []) {
 				remoteProfiles.splice(remoteProfiles.findIndex(({ id }) => profile.id === id), 1);
@@ -227,8 +238,19 @@ export class UserDataProfilesManifestSynchroniser extends AbstractSynchroniser i
 					remoteProfiles.splice(remoteProfiles.indexOf(profileToBeUpdated), 1, { id: profile.id, name: profile.name, collection: profileToBeUpdated.collection, shortName: profile.shortName });
 				}
 			}
-			remoteUserData = await this.updateRemoteUserData(this.stringifyRemoteProfiles(remoteProfiles), force ? null : remoteUserData.ref);
-			this.logService.info(`${this.syncResourceLogLabel}: Updated remote profiles.${remote?.added.length ? ` Added: ${JSON.stringify(remote.added.map(e => e.name))}.` : ''}${remote?.updated.length ? ` Updated: ${JSON.stringify(remote.updated.map(e => e.name))}.` : ''}${remote?.removed.length ? ` Removed: ${JSON.stringify(remote.removed.map(e => e.name))}.` : ''}`);
+
+			try {
+				remoteUserData = await this.updateRemoteProfiles(remoteProfiles, force ? null : remoteUserData.ref);
+				this.logService.info(`${this.syncResourceLogLabel}: Updated remote profiles.${canAddRemoteProfiles && remote?.added.length ? ` Added: ${JSON.stringify(remote.added.map(e => e.name))}.` : ''}${remote?.updated.length ? ` Updated: ${JSON.stringify(remote.updated.map(e => e.name))}.` : ''}${remote?.removed.length ? ` Removed: ${JSON.stringify(remote.removed.map(e => e.name))}.` : ''}`);
+			} catch (error) {
+				if (addedCollections.length) {
+					this.logService.info(`${this.syncResourceLogLabel}: Failed to update remote profiles. Cleaning up added collections...`);
+					for (const collection of addedCollections) {
+						await this.userDataSyncStoreService.deleteCollection(collection, this.syncHeaders);
+					}
+				}
+				throw error;
+			}
 
 			for (const profile of remote?.removed || []) {
 				await this.userDataSyncStoreService.deleteCollection(profile.collection, this.syncHeaders);
@@ -243,6 +265,10 @@ export class UserDataProfilesManifestSynchroniser extends AbstractSynchroniser i
 		}
 	}
 
+	async updateRemoteProfiles(profiles: ISyncUserDataProfile[], ref: string | null): Promise<IRemoteUserData> {
+		return this.updateRemoteUserData(this.stringifyRemoteProfiles(profiles), ref);
+	}
+
 	async hasLocalData(): Promise<boolean> {
 		return this.getLocalUserDataProfiles().length > 0;
 	}
diff --git a/src/vs/platform/userDataSync/common/userDataSync.ts b/src/vs/platform/userDataSync/common/userDataSync.ts
index f9c2aa24687054..940aee143cf7e6 100644
--- a/src/vs/platform/userDataSync/common/userDataSync.ts
+++ b/src/vs/platform/userDataSync/common/userDataSync.ts
@@ -238,6 +238,7 @@ export const enum UserDataSyncErrorCode {
 	// Client Errors (>= 400 )
 	Unauthorized = 'Unauthorized', /* 401 */
 	NotFound = 'NotFound', /* 404 */
+	MethodNotFound = 'MethodNotFound', /* 405 */
 	Conflict = 'Conflict', /* 409 */
 	Gone = 'Gone', /* 410 */
 	PreconditionFailed = 'PreconditionFailed', /* 412 */
@@ -261,6 +262,7 @@ export const enum UserDataSyncErrorCode {
 	SessionExpired = 'SessionExpired',
 	ServiceChanged = 'ServiceChanged',
 	DefaultServiceChanged = 'DefaultServiceChanged',
+	LocalTooManyProfiles = 'LocalTooManyProfiles',
 	LocalTooManyRequests = 'LocalTooManyRequests',
 	LocalPreconditionFailed = 'LocalPreconditionFailed',
 	LocalInvalidContent = 'LocalInvalidContent',
@@ -509,6 +511,7 @@ export interface IUserDataSyncService {
 
 	reset(): Promise<void>;
 	resetRemote(): Promise<void>;
+	cleanUpRemoteData(): Promise<void>;
 	resetLocal(): Promise<void>;
 	hasLocalData(): Promise<boolean>;
 	hasPreviouslySynced(): Promise<boolean>;
diff --git a/src/vs/platform/userDataSync/common/userDataSyncService.ts b/src/vs/platform/userDataSync/common/userDataSyncService.ts
index 6ded0fde8eb441..9358953629d777 100644
--- a/src/vs/platform/userDataSync/common/userDataSyncService.ts
+++ b/src/vs/platform/userDataSync/common/userDataSyncService.ts
@@ -14,10 +14,8 @@ import { isBoolean, isUndefined } from 'vs/base/common/types';
 import { URI } from 'vs/base/common/uri';
 import { generateUuid } from 'vs/base/common/uuid';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IProductService } from 'vs/platform/product/common/productService';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
@@ -91,8 +89,6 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
 		@IStorageService private readonly storageService: IStorageService,
 		@IUserDataSyncEnablementService private readonly userDataSyncEnablementService: IUserDataSyncEnablementService,
 		@IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService,
-		@IProductService private readonly productService: IProductService,
-		@IEnvironmentService private readonly environmentService: IEnvironmentService,
 		@IUserDataSyncResourceProviderService private readonly userDataSyncResourceProviderService: IUserDataSyncResourceProviderService,
 	) {
 		super();
@@ -171,7 +167,23 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
 				return that.sync(manifest, true, executionId, cancellableToken.token);
 			},
 			async apply(): Promise<void> {
-				await that.applyManualSync(manifest, executionId, cancellableToken.token);
+				try {
+					try {
+						await that.applyManualSync(manifest, executionId, cancellableToken.token);
+					} catch (error) {
+						if (UserDataSyncError.toUserDataSyncError(error).code === UserDataSyncErrorCode.MethodNotFound) {
+							that.logService.info('Client is making invalid requests. Cleaning up data...');
+							await that.cleanUpRemoteData();
+							that.logService.info('Applying manual sync again...');
+							await that.applyManualSync(manifest, executionId, cancellableToken.token);
+						} else {
+							throw error;
+						}
+					}
+				} catch (error) {
+					that.logService.error(error);
+					throw error;
+				}
 				that.logService.info(`Sync done. Took ${new Date().getTime() - startTime}ms`);
 				that.updateLastSyncTime();
 			},
@@ -399,6 +411,29 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
 		this.logService.info('Did reset the local sync state.');
 	}
 
+	async cleanUpRemoteData(): Promise<void> {
+		const remoteProfiles = await this.userDataSyncResourceProviderService.getRemoteSyncedProfiles();
+		const remoteProfileCollections = remoteProfiles.map(profile => profile.collection);
+		const allCollections = await this.userDataSyncStoreService.getAllCollections();
+		const redundantCollections = allCollections.filter(c => !remoteProfileCollections.includes(c));
+		if (redundantCollections.length) {
+			this.logService.info(`Deleting ${redundantCollections.length} redundant collections on server`);
+			await Promise.allSettled(redundantCollections.map(collectionId => this.userDataSyncStoreService.deleteCollection(collectionId)));
+			this.logService.info(`Deleted redundant collections on server`);
+		}
+		const updatedRemoteProfiles = remoteProfiles.filter(profile => allCollections.includes(profile.collection));
+		if (updatedRemoteProfiles.length !== remoteProfiles.length) {
+			this.logService.info(`Updating remote profiles with invalid collections on server`);
+			const profileManifestSynchronizer = this.instantiationService.createInstance(UserDataProfilesManifestSynchroniser, this.userDataProfilesService.defaultProfile, undefined);
+			try {
+				await profileManifestSynchronizer.updateRemoteProfiles(updatedRemoteProfiles, null);
+				this.logService.info(`Updated remote profiles on server`);
+			} finally {
+				profileManifestSynchronizer.dispose();
+			}
+		}
+	}
+
 	private async performAction<T>(profile: IUserDataProfile, action: (synchroniser: IUserDataSynchroniser) => Promise<T | undefined>): Promise<T | null> {
 		const disposables = new DisposableStore();
 		try {
@@ -418,10 +453,6 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
 				return null;
 			}
 
-			if (this.environmentService.isBuilt && (!this.productService.enableSyncingProfiles || isEqual(this.userDataSyncStoreManagementService.userDataSyncStore?.url, this.userDataSyncStoreManagementService.userDataSyncStore?.stableUrl))) {
-				return null;
-			}
-
 			const userDataProfileManifestSynchronizer = disposables.add(this.instantiationService.createInstance(UserDataProfilesManifestSynchroniser, profile, undefined));
 			const manifest = await this.userDataSyncStoreService.manifest(null);
 			const syncProfiles = (await userDataProfileManifestSynchronizer.getRemoteSyncedProfiles(manifest?.latest ?? null)) || [];
@@ -546,10 +577,8 @@ class ProfileSynchronizer extends Disposable {
 		@IUserDataSyncStoreManagementService private readonly userDataSyncStoreManagementService: IUserDataSyncStoreManagementService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IUserDataSyncLogService private readonly logService: IUserDataSyncLogService,
-		@IProductService private readonly productService: IProductService,
 		@IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IEnvironmentService private readonly environmentService: IEnvironmentService,
 	) {
 		super();
 		this._register(userDataSyncEnablementService.onDidChangeResourceEnablement(([syncResource, enablement]) => this.onDidChangeResourceEnablement(syncResource, enablement)));
@@ -584,10 +613,6 @@ class ProfileSynchronizer extends Disposable {
 			if (!this.userDataProfilesService.isEnabled()) {
 				return;
 			}
-			if (this.environmentService.isBuilt && (!this.productService.enableSyncingProfiles || isEqual(this.userDataSyncStoreManagementService.userDataSyncStore?.url, this.userDataSyncStoreManagementService.userDataSyncStore?.stableUrl))) {
-				this.logService.debug('Skipping profiles sync');
-				return;
-			}
 		}
 		const disposables = new DisposableStore();
 		const synchronizer = disposables.add(this.createSynchronizer(syncResource));
@@ -770,13 +795,13 @@ class ProfileSynchronizer extends Disposable {
 
 	private getOrder(syncResource: SyncResource): number {
 		switch (syncResource) {
-			case SyncResource.Profiles: return 0;
-			case SyncResource.Settings: return 1;
-			case SyncResource.Keybindings: return 2;
-			case SyncResource.Snippets: return 3;
-			case SyncResource.Tasks: return 4;
-			case SyncResource.GlobalState: return 5;
-			case SyncResource.Extensions: return 6;
+			case SyncResource.Settings: return 0;
+			case SyncResource.Keybindings: return 1;
+			case SyncResource.Snippets: return 2;
+			case SyncResource.Tasks: return 3;
+			case SyncResource.GlobalState: return 4;
+			case SyncResource.Extensions: return 5;
+			case SyncResource.Profiles: return 6;
 		}
 	}
 
@@ -785,10 +810,12 @@ class ProfileSynchronizer extends Disposable {
 function canBailout(e: any): boolean {
 	if (e instanceof UserDataSyncError) {
 		switch (e.code) {
+			case UserDataSyncErrorCode.MethodNotFound:
 			case UserDataSyncErrorCode.TooLarge:
 			case UserDataSyncErrorCode.TooManyRequests:
 			case UserDataSyncErrorCode.TooManyRequestsAndRetryAfter:
 			case UserDataSyncErrorCode.LocalTooManyRequests:
+			case UserDataSyncErrorCode.LocalTooManyProfiles:
 			case UserDataSyncErrorCode.Gone:
 			case UserDataSyncErrorCode.UpgradeRequired:
 			case UserDataSyncErrorCode.IncompatibleRemoteContent:
diff --git a/src/vs/platform/userDataSync/common/userDataSyncServiceIpc.ts b/src/vs/platform/userDataSync/common/userDataSyncServiceIpc.ts
index 7f5cd49c9587ff..a1125027b471b6 100644
--- a/src/vs/platform/userDataSync/common/userDataSyncServiceIpc.ts
+++ b/src/vs/platform/userDataSync/common/userDataSyncServiceIpc.ts
@@ -82,6 +82,7 @@ export class UserDataSyncChannel implements IServerChannel {
 			case 'replace': return this.service.replace(reviewSyncResourceHandle(args[0]));
 			case 'getAssociatedResources': return this.service.getAssociatedResources(reviewSyncResourceHandle(args[0]));
 			case 'getMachineId': return this.service.getMachineId(reviewSyncResourceHandle(args[0]));
+			case 'cleanUpRemoteData': return this.service.cleanUpRemoteData();
 
 			case 'createManualSyncTask': return this.createManualSyncTask();
 		}
@@ -95,7 +96,7 @@ export class UserDataSyncChannel implements IServerChannel {
 
 			switch (manualSyncTaskCommand) {
 				case 'merge': return manualSyncTask.merge();
-				case 'apply': return manualSyncTask.apply().finally(() => this.manualSyncTasks.delete(this.createKey(manualSyncTask.id)));
+				case 'apply': return manualSyncTask.apply().then(() => this.manualSyncTasks.delete(this.createKey(manualSyncTask.id)));
 				case 'stop': return manualSyncTask.stop().finally(() => this.manualSyncTasks.delete(this.createKey(manualSyncTask.id)));
 			}
 		}
@@ -246,6 +247,10 @@ export class UserDataSyncChannelClient extends Disposable implements IUserDataSy
 		return this.channel.call<string | undefined>('getMachineId', [syncResourceHandle]);
 	}
 
+	cleanUpRemoteData(): Promise<void> {
+		return this.channel.call('cleanUpRemoteData');
+	}
+
 	replace(syncResourceHandle: ISyncResourceHandle): Promise<void> {
 		return this.channel.call('replace', [syncResourceHandle]);
 	}
diff --git a/src/vs/platform/userDataSync/common/userDataSyncStoreService.ts b/src/vs/platform/userDataSync/common/userDataSyncStoreService.ts
index 8c3ef72ade5fc5..f98497b991076a 100644
--- a/src/vs/platform/userDataSync/common/userDataSyncStoreService.ts
+++ b/src/vs/platform/userDataSync/common/userDataSyncStoreService.ts
@@ -20,7 +20,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IFileService } from 'vs/platform/files/common/files';
 import { IProductService } from 'vs/platform/product/common/productService';
-import { asJson, asTextOrError, IRequestService, isSuccess as isSuccessContext } from 'vs/platform/request/common/request';
+import { asJson, asText, asTextOrError, IRequestService, isSuccess as isSuccessContext } from 'vs/platform/request/common/request';
 import { getServiceMachineId } from 'vs/platform/externalServices/common/serviceMachineId';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { CONFIGURATION_SYNC_STORE_KEY, HEADER_EXECUTION_ID, HEADER_OPERATION_ID, IAuthenticationProvider, IResourceRefHandle, IUserData, IUserDataManifest, IUserDataSyncLogService, IUserDataSyncStore, IUserDataSyncStoreManagementService, IUserDataSyncStoreService, ServerResource, SYNC_SERVICE_URL_TYPE, UserDataSyncErrorCode, UserDataSyncStoreError, UserDataSyncStoreType } from 'vs/platform/userDataSync/common/userDataSync';
@@ -243,7 +243,7 @@ export class UserDataSyncStoreClient extends Disposable {
 
 		const context = await this.request(url, { type: 'GET', headers }, [], CancellationToken.None);
 
-		return (await asJson<string[]>(context)) || [];
+		return (await asJson<{ id: string }[]>(context))?.map(({ id }) => id) || [];
 	}
 
 	async createCollection(headers: IHeaders = {}): Promise<string> {
@@ -448,8 +448,8 @@ export class UserDataSyncStoreClient extends Disposable {
 			throw new Error('No settings sync store url configured.');
 		}
 
-		await this.deleteResources();
 		await this.deleteCollection();
+		await this.deleteResources();
 
 		// clear cached session.
 		this.clearSession();
@@ -529,10 +529,12 @@ export class UserDataSyncStoreClient extends Disposable {
 		const operationId = context.res.headers[HEADER_OPERATION_ID];
 		const requestInfo = { url, status: context.res.statusCode, 'execution-id': options.headers[HEADER_EXECUTION_ID], 'operation-id': operationId };
 		const isSuccess = isSuccessContext(context) || (context.res.statusCode && successCodes.indexOf(context.res.statusCode) !== -1);
+		let failureMessage = '';
 		if (isSuccess) {
 			this.logService.trace('Request succeeded', requestInfo);
 		} else {
 			this.logService.info('Request failed', requestInfo);
+			failureMessage = await asText(context) || '';
 		}
 
 		if (context.res.statusCode === 401) {
@@ -547,6 +549,10 @@ export class UserDataSyncStoreClient extends Disposable {
 			throw new UserDataSyncStoreError(`${options.type} request '${url}' failed because the requested resource is not found (404).`, url, UserDataSyncErrorCode.NotFound, context.res.statusCode, operationId);
 		}
 
+		if (context.res.statusCode === 405) {
+			throw new UserDataSyncStoreError(`${options.type} request '${url}' failed because the requested endpoint is not found (405). ${failureMessage}`, url, UserDataSyncErrorCode.MethodNotFound, context.res.statusCode, operationId);
+		}
+
 		if (context.res.statusCode === 409) {
 			throw new UserDataSyncStoreError(`${options.type} request '${url}' failed because of Conflict (409). There is new data for this resource. Make the request again with latest data.`, url, UserDataSyncErrorCode.Conflict, context.res.statusCode, operationId);
 		}
diff --git a/src/vs/platform/userDataSync/test/common/userDataAutoSyncService.test.ts b/src/vs/platform/userDataSync/test/common/userDataAutoSyncService.test.ts
index bc31f2612dddd6..db82505fc6d986 100644
--- a/src/vs/platform/userDataSync/test/common/userDataAutoSyncService.test.ts
+++ b/src/vs/platform/userDataSync/test/common/userDataAutoSyncService.test.ts
@@ -149,8 +149,6 @@ suite('UserDataAutoSyncService', () => {
 				{ type: 'GET', url: `${target.url}/v1/manifest`, headers: {} },
 				// Machines
 				{ type: 'GET', url: `${target.url}/v1/resource/machines/latest`, headers: {} },
-				// Profiles
-				{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
 				// Settings
 				{ type: 'GET', url: `${target.url}/v1/resource/settings/latest`, headers: {} },
 				{ type: 'POST', url: `${target.url}/v1/resource/settings`, headers: { 'If-Match': '0' } },
@@ -168,6 +166,8 @@ suite('UserDataAutoSyncService', () => {
 				{ type: 'POST', url: `${target.url}/v1/resource/globalState`, headers: { 'If-Match': '0' } },
 				// Extensions
 				{ type: 'GET', url: `${target.url}/v1/resource/extensions/latest`, headers: {} },
+				// Profiles
+				{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
 				// Manifest
 				{ type: 'GET', url: `${target.url}/v1/manifest`, headers: {} },
 				// Machines
diff --git a/src/vs/platform/userDataSync/test/common/userDataProfilesManifestMerge.test.ts b/src/vs/platform/userDataSync/test/common/userDataProfilesManifestMerge.test.ts
index 8f8e65eb38f251..8366dd2182043b 100644
--- a/src/vs/platform/userDataSync/test/common/userDataProfilesManifestMerge.test.ts
+++ b/src/vs/platform/userDataSync/test/common/userDataProfilesManifestMerge.test.ts
@@ -173,4 +173,24 @@ suite('UserDataProfilesManifestMerge', () => {
 		assert.strictEqual(actual.remote, null);
 	});
 
+	test('merge when profile is removed locally, but not exists in remote', () => {
+		const localProfiles: IUserDataProfile[] = [
+			toUserDataProfile('1', '1', URI.file('1')),
+		];
+		const base: ISyncUserDataProfile[] = [
+			{ id: '1', name: '1', collection: '1' },
+			{ id: '2', name: '2', collection: '2' },
+		];
+		const remoteProfiles: ISyncUserDataProfile[] = [
+			{ id: '1', name: '3', collection: '1' },
+		];
+
+		const actual = merge(localProfiles, remoteProfiles, base, []);
+
+		assert.deepStrictEqual(actual.local.added, []);
+		assert.deepStrictEqual(actual.local.removed, []);
+		assert.deepStrictEqual(actual.local.updated, remoteProfiles);
+		assert.strictEqual(actual.remote, null);
+	});
+
 });
diff --git a/src/vs/platform/userDataSync/test/common/userDataSyncService.test.ts b/src/vs/platform/userDataSync/test/common/userDataSyncService.test.ts
index e58af651890702..5c450eec8b0c4b 100644
--- a/src/vs/platform/userDataSync/test/common/userDataSyncService.test.ts
+++ b/src/vs/platform/userDataSync/test/common/userDataSyncService.test.ts
@@ -32,8 +32,6 @@ suite('UserDataSyncService', () => {
 		assert.deepStrictEqual(target.requests, [
 			// Manifest
 			{ type: 'GET', url: `${target.url}/v1/manifest`, headers: {} },
-			// Profiles
-			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
 			// Settings
 			{ type: 'GET', url: `${target.url}/v1/resource/settings/latest`, headers: {} },
 			{ type: 'POST', url: `${target.url}/v1/resource/settings`, headers: { 'If-Match': '0' } },
@@ -51,6 +49,8 @@ suite('UserDataSyncService', () => {
 			{ type: 'POST', url: `${target.url}/v1/resource/globalState`, headers: { 'If-Match': '0' } },
 			// Extensions
 			{ type: 'GET', url: `${target.url}/v1/resource/extensions/latest`, headers: {} },
+			// Profiles
+			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
 		]);
 
 	});
@@ -69,8 +69,6 @@ suite('UserDataSyncService', () => {
 		assert.deepStrictEqual(target.requests, [
 			// Manifest
 			{ type: 'GET', url: `${target.url}/v1/manifest`, headers: {} },
-			// Profiles
-			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
 			// Keybindings
 			{ type: 'GET', url: `${target.url}/v1/resource/keybindings/latest`, headers: {} },
 			{ type: 'POST', url: `${target.url}/v1/resource/keybindings`, headers: { 'If-Match': '0' } },
@@ -85,6 +83,8 @@ suite('UserDataSyncService', () => {
 			{ type: 'POST', url: `${target.url}/v1/resource/globalState`, headers: { 'If-Match': '0' } },
 			// Extensions
 			{ type: 'GET', url: `${target.url}/v1/resource/extensions/latest`, headers: {} },
+			// Profiles
+			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
 		]);
 
 	});
@@ -102,8 +102,6 @@ suite('UserDataSyncService', () => {
 		assert.deepStrictEqual(target.requests, [
 			// Manifest
 			{ type: 'GET', url: `${target.url}/v1/manifest`, headers: {} },
-			// Profiles
-			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
 			// Settings
 			{ type: 'GET', url: `${target.url}/v1/resource/settings/latest`, headers: {} },
 			// Keybindings
@@ -116,6 +114,8 @@ suite('UserDataSyncService', () => {
 			{ type: 'GET', url: `${target.url}/v1/resource/globalState/latest`, headers: {} },
 			// Extensions
 			{ type: 'GET', url: `${target.url}/v1/resource/extensions/latest`, headers: {} },
+			// Profiles
+			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
 		]);
 
 	});
@@ -139,13 +139,13 @@ suite('UserDataSyncService', () => {
 
 		assert.deepStrictEqual(target.requests, [
 			{ type: 'GET', url: `${target.url}/v1/manifest`, headers: {} },
-			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/resource/settings/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/resource/keybindings/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/resource/snippets/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/resource/tasks/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/resource/globalState/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/resource/extensions/latest`, headers: {} },
+			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
 		]);
 
 	});
@@ -177,7 +177,6 @@ suite('UserDataSyncService', () => {
 
 		assert.deepStrictEqual(target.requests, [
 			{ type: 'GET', url: `${target.url}/v1/manifest`, headers: {} },
-			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/resource/settings/latest`, headers: {} },
 			{ type: 'POST', url: `${target.url}/v1/resource/settings`, headers: { 'If-Match': '1' } },
 			{ type: 'GET', url: `${target.url}/v1/resource/keybindings/latest`, headers: {} },
@@ -187,6 +186,7 @@ suite('UserDataSyncService', () => {
 			{ type: 'GET', url: `${target.url}/v1/resource/tasks/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/resource/globalState/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/resource/extensions/latest`, headers: {} },
+			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
 		]);
 
 	});
@@ -219,9 +219,6 @@ suite('UserDataSyncService', () => {
 
 		assert.deepStrictEqual(target.requests, [
 			{ type: 'GET', url: `${target.url}/v1/manifest`, headers: {} },
-			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
-			{ type: 'POST', url: `${target.url}/v1/collection`, headers: {} },
-			{ type: 'POST', url: `${target.url}/v1/resource/profiles`, headers: { 'If-Match': '0' } },
 			{ type: 'GET', url: `${target.url}/v1/resource/settings/latest`, headers: {} },
 			{ type: 'POST', url: `${target.url}/v1/resource/settings`, headers: { 'If-Match': '1' } },
 			{ type: 'GET', url: `${target.url}/v1/resource/keybindings/latest`, headers: {} },
@@ -231,6 +228,9 @@ suite('UserDataSyncService', () => {
 			{ type: 'GET', url: `${target.url}/v1/resource/tasks/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/resource/globalState/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/resource/extensions/latest`, headers: {} },
+			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
+			{ type: 'POST', url: `${target.url}/v1/collection`, headers: {} },
+			{ type: 'POST', url: `${target.url}/v1/resource/profiles`, headers: { 'If-Match': '0' } },
 			{ type: 'GET', url: `${target.url}/v1/collection/1/resource/settings/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/collection/1/resource/keybindings/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/collection/1/resource/snippets/latest`, headers: {} },
@@ -322,9 +322,6 @@ suite('UserDataSyncService', () => {
 		assert.deepStrictEqual(target.requests, [
 			// Manifest
 			{ type: 'GET', url: `${target.url}/v1/manifest`, headers: {} },
-			// Profiles
-			{ type: 'POST', url: `${target.url}/v1/collection`, headers: {} },
-			{ type: 'POST', url: `${target.url}/v1/resource/profiles`, headers: { 'If-Match': '0' } },
 			// Settings
 			{ type: 'POST', url: `${target.url}/v1/resource/settings`, headers: { 'If-Match': '1' } },
 			// Keybindings
@@ -333,6 +330,9 @@ suite('UserDataSyncService', () => {
 			{ type: 'POST', url: `${target.url}/v1/resource/snippets`, headers: { 'If-Match': '1' } },
 			// Global state
 			{ type: 'POST', url: `${target.url}/v1/resource/globalState`, headers: { 'If-Match': '1' } },
+			// Profiles
+			{ type: 'POST', url: `${target.url}/v1/collection`, headers: {} },
+			{ type: 'POST', url: `${target.url}/v1/resource/profiles`, headers: { 'If-Match': '0' } },
 			{ type: 'GET', url: `${target.url}/v1/collection/1/resource/settings/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/collection/1/resource/keybindings/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/collection/1/resource/snippets/latest`, headers: {} },
@@ -452,8 +452,6 @@ suite('UserDataSyncService', () => {
 		assert.deepStrictEqual(target.requests, [
 			// Manifest
 			{ type: 'GET', url: `${target.url}/v1/manifest`, headers: {} },
-			// Profiles
-			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: { 'If-None-Match': '0' } },
 			// Settings
 			{ type: 'GET', url: `${target.url}/v1/resource/settings/latest`, headers: { 'If-None-Match': '1' } },
 			// Keybindings
@@ -462,6 +460,8 @@ suite('UserDataSyncService', () => {
 			{ type: 'GET', url: `${target.url}/v1/resource/snippets/latest`, headers: { 'If-None-Match': '1' } },
 			// Global state
 			{ type: 'GET', url: `${target.url}/v1/resource/globalState/latest`, headers: { 'If-None-Match': '1' } },
+			// Profiles
+			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: { 'If-None-Match': '0' } },
 			{ type: 'GET', url: `${target.url}/v1/collection/1/resource/settings/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/collection/1/resource/keybindings/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/collection/1/resource/snippets/latest`, headers: {} },
@@ -487,8 +487,8 @@ suite('UserDataSyncService', () => {
 
 		assert.deepStrictEqual(target.requests, [
 			// Manifest
-			{ type: 'DELETE', url: `${target.url}/v1/resource`, headers: {} },
 			{ type: 'DELETE', url: `${target.url}/v1/collection`, headers: {} },
+			{ type: 'DELETE', url: `${target.url}/v1/resource`, headers: {} },
 		]);
 
 	});
@@ -512,8 +512,6 @@ suite('UserDataSyncService', () => {
 		assert.deepStrictEqual(target.requests, [
 			// Manifest
 			{ type: 'GET', url: `${target.url}/v1/manifest`, headers: {} },
-			// Profiles
-			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
 			// Settings
 			{ type: 'GET', url: `${target.url}/v1/resource/settings/latest`, headers: {} },
 			{ type: 'POST', url: `${target.url}/v1/resource/settings`, headers: { 'If-Match': '0' } },
@@ -531,6 +529,8 @@ suite('UserDataSyncService', () => {
 			{ type: 'POST', url: `${target.url}/v1/resource/globalState`, headers: { 'If-Match': '0' } },
 			// Extensions
 			{ type: 'GET', url: `${target.url}/v1/resource/extensions/latest`, headers: {} },
+			// Profiles
+			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
 		]);
 
 	});
diff --git a/src/vs/platform/window/electron-main/window.ts b/src/vs/platform/window/electron-main/window.ts
index 65175b993fc12c..8330d6f39a568a 100644
--- a/src/vs/platform/window/electron-main/window.ts
+++ b/src/vs/platform/window/electron-main/window.ts
@@ -124,7 +124,7 @@ export interface IWindowState {
 	x?: number;
 	y?: number;
 	mode?: WindowMode;
-	display?: number;
+	readonly display?: number;
 }
 
 export const defaultWindowState = function (mode = WindowMode.Normal): IWindowState {
@@ -143,8 +143,8 @@ export const enum WindowMode {
 }
 
 export interface ILoadEvent {
-	workspace: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | undefined;
-	reason: LoadReason;
+	readonly workspace: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | undefined;
+	readonly reason: LoadReason;
 }
 
 export const enum WindowError {
diff --git a/src/vs/platform/windows/electron-main/windowImpl.ts b/src/vs/platform/windows/electron-main/windowImpl.ts
index e589de5217b23e..5bd02e2f0dfb4c 100644
--- a/src/vs/platform/windows/electron-main/windowImpl.ts
+++ b/src/vs/platform/windows/electron-main/windowImpl.ts
@@ -30,12 +30,12 @@ import { IProductService } from 'vs/platform/product/common/productService';
 import { IProtocolMainService } from 'vs/platform/protocol/electron-main/protocol';
 import { resolveMarketplaceHeaders } from 'vs/platform/externalServices/common/marketplace';
 import { IApplicationStorageMainService, IStorageMainService } from 'vs/platform/storage/electron-main/storageMainService';
-import { ITelemetryService, machineIdKey } from 'vs/platform/telemetry/common/telemetry';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { IThemeMainService } from 'vs/platform/theme/electron-main/themeMainService';
 import { getMenuBarVisibility, getTitleBarStyle, IFolderToOpen, INativeWindowConfiguration, IWindowSettings, IWorkspaceToOpen, MenuBarVisibility, useWindowControlsOverlay, WindowMinimumSize, zoomLevelToZoomFactor } from 'vs/platform/window/common/window';
 import { IWindowsMainService, OpenContext } from 'vs/platform/windows/electron-main/windows';
-import { ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import { ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, toWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
 import { IWorkspacesManagementMainService } from 'vs/platform/workspaces/electron-main/workspacesManagementMainService';
 import { IWindowState, ICodeWindow, ILoadEvent, WindowMode, WindowError, LoadReason, defaultWindowState } from 'vs/platform/window/electron-main/window';
 import { Color } from 'vs/base/common/color';
@@ -49,20 +49,21 @@ import { ITelemetryServiceConfig, TelemetryService } from 'vs/platform/telemetry
 import { getPiiPathsFromEnvironment, isInternalTelemetry, ITelemetryAppender, supportsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
 import { resolveCommonProperties } from 'vs/platform/telemetry/common/commonProperties';
 import { hostname, release } from 'os';
+import { resolveMachineId } from 'vs/platform/telemetry/electron-main/telemetryUtils';
 
 export interface IWindowCreationOptions {
-	state: IWindowState;
-	extensionDevelopmentPath?: string[];
-	isExtensionTestHost?: boolean;
+	readonly state: IWindowState;
+	readonly extensionDevelopmentPath?: string[];
+	readonly isExtensionTestHost?: boolean;
 }
 
 interface ITouchBarSegment extends SegmentedControlSegment {
-	id: string;
+	readonly id: string;
 }
 
 interface ILoadOptions {
-	isReload?: boolean;
-	disableExtensions?: boolean;
+	readonly isReload?: boolean;
+	readonly disableExtensions?: boolean;
 }
 
 const enum ReadyState {
@@ -129,8 +130,16 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 	get openedWorkspace(): IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | undefined { return this._config?.workspace; }
 
 	get profile(): IUserDataProfile | undefined {
-		return this.config ? this.userDataProfilesService.profiles.find(profile => profile.id === this.config?.profiles.profile.id) ??
-			this.userDataProfilesService.getOrSetProfileForWorkspace(this.config.workspace ?? 'empty-window', this.userDataProfilesService.defaultProfile) : undefined;
+		if (!this.config) {
+			return undefined;
+		}
+
+		const profile = this.userDataProfilesService.profiles.find(profile => profile.id === this.config?.profiles.profile.id);
+		if (this.isExtensionDevelopmentHost && profile) {
+			return profile;
+		}
+
+		return this.userDataProfilesService.getProfileForWorkspace(this.config.workspace ?? toWorkspaceIdentifier(this.backupPath, this.isExtensionDevelopmentHost)) ?? this.userDataProfilesService.defaultProfile;
 	}
 
 	get remoteAuthority(): string | undefined { return this._config?.remoteAuthority; }
@@ -752,11 +761,15 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 							title: this.productService.nameLong,
 							type: 'warning',
 							buttons: [
-								mnemonicButtonLabel(localize({ key: 'reopen', comment: ['&& denotes a mnemonic'] }, "&&Reopen")),
+								this._config?.workspace ?
+									mnemonicButtonLabel(localize({ key: 'reopen', comment: ['&& denotes a mnemonic'] }, "&&Reopen")) :
+									mnemonicButtonLabel(localize({ key: 'newWindow', comment: ['&& denotes a mnemonic'] }, "&&New Window")),
 								mnemonicButtonLabel(localize({ key: 'close', comment: ['&& denotes a mnemonic'] }, "&&Close"))
 							],
 							message,
-							detail: localize('appGoneDetail', "We are sorry for the inconvenience. You can reopen the window to continue where you left off."),
+							detail: this._config?.workspace ?
+								localize('appGoneDetailWorkspace', "We are sorry for the inconvenience. You can reopen the window to continue where you left off.") :
+								localize('appGoneDetailEmptyWindow', "We are sorry for the inconvenience. You can open a new empty window to start again."),
 							noLink: true,
 							defaultId: 0,
 							checkboxLabel: this._config?.workspace ? localize('doNotRestoreEditors', "Don't restore editors") : undefined
@@ -782,11 +795,12 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 			}
 
 			const { installSourcePath } = this.environmentMainService;
+			const machineId = await resolveMachineId(this.stateMainService);
 
 			const config: ITelemetryServiceConfig = {
 				appenders,
 				sendErrorTelemetry: false,
-				commonProperties: resolveCommonProperties(this.fileService, release(), hostname(), process.arch, this.productService.commit, this.productService.version, this.stateMainService.getItem<string>(machineIdKey), isInternal, installSourcePath),
+				commonProperties: resolveCommonProperties(this.fileService, release(), hostname(), process.arch, this.productService.commit, this.productService.version, machineId, isInternal, installSourcePath),
 				piiPaths: getPiiPathsFromEnvironment(this.environmentMainService)
 			};
 
@@ -806,18 +820,23 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 		}
 
 		// Inform user
-		await this.dialogMainService.showMessageBox({
+		const result = await this.dialogMainService.showMessageBox({
 			title: this.productService.nameLong,
 			type: 'error',
 			buttons: [
+				mnemonicButtonLabel(localize({ key: 'learnMore', comment: ['&& denotes a mnemonic'] }, "&&Learn More")),
 				mnemonicButtonLabel(localize({ key: 'close', comment: ['&& denotes a mnemonic'] }, "&&Close"))
 			],
-			message: localize('appGoneAdminMessage', "Running as administrator is not supported"),
-			detail: localize('appGoneAdminDetail', "Please try again without administrator privileges.", this.productService.nameLong),
+			message: localize('appGoneAdminMessage', "Running as administrator is not supported in your environment"),
+			detail: localize('appGoneAdminDetail', "We are sorry for the inconvenience. Please try again without administrator privileges.", this.productService.nameLong),
 			noLink: true,
 			defaultId: 0
 		}, this._win);
 
+		if (result.response === 0) {
+			await this.nativeHostMainService.openExternal(undefined, 'https://go.microsoft.com/fwlink/?linkid=2220179');
+		}
+
 		// Ensure to await flush telemetry
 		await Promise.all(appenders.map(appender => appender.flush()));
 
@@ -1057,6 +1076,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 			configuration['extensions-dir'] = cli['extensions-dir'];
 		}
 
+		configuration.accessibilitySupport = app.isAccessibilitySupportEnabled();
 		configuration.isInitialStartup = false; // since this is a reload
 		configuration.policiesData = this.policyService.serialize(); // set policies data again
 		configuration.continueOn = this.environmentMainService.continueOn;
diff --git a/src/vs/platform/windows/electron-main/windowsMainService.ts b/src/vs/platform/windows/electron-main/windowsMainService.ts
index 64ce04f5d003d8..5117c5d7acbfc8 100644
--- a/src/vs/platform/windows/electron-main/windowsMainService.ts
+++ b/src/vs/platform/windows/electron-main/windowsMainService.ts
@@ -44,7 +44,7 @@ import { IOpenConfiguration, IOpenEmptyConfiguration, IWindowsCountChangedEvent,
 import { findWindowOnExtensionDevelopmentPath, findWindowOnFile, findWindowOnWorkspaceOrFolder } from 'vs/platform/windows/electron-main/windowsFinder';
 import { IWindowState, WindowsStateHandler } from 'vs/platform/windows/electron-main/windowsStateHandler';
 import { IRecent } from 'vs/platform/workspaces/common/workspaces';
-import { hasWorkspaceFileExtension, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import { hasWorkspaceFileExtension, IAnyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IWorkspaceIdentifier, toWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
 import { createEmptyWorkspaceIdentifier, getSingleFolderWorkspaceIdentifier, getWorkspaceIdentifier } from 'vs/platform/workspaces/node/workspaces';
 import { IWorkspacesHistoryMainService } from 'vs/platform/workspaces/electron-main/workspacesHistoryMainService';
 import { IWorkspacesManagementMainService } from 'vs/platform/workspaces/electron-main/workspacesManagementMainService';
@@ -1350,7 +1350,10 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 
 			profiles: {
 				all: this.userDataProfilesMainService.profiles,
-				profile: window?.isExtensionDevelopmentHost && window?.profile ? window.profile : await this.resolveProfileForBrowserWindow(options)
+				// Set to default profile first and resolve and update the profile
+				// only after the workspace-backup is registered.
+				// Because, workspace identifier of an empty window is known only then.
+				profile: this.userDataProfilesMainService.defaultProfile
 			},
 
 			homeDir: this.environmentMainService.userHome.fsPath,
@@ -1453,19 +1456,19 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		// first and only load the new configuration if that was
 		// not vetoed
 		if (window.isReady) {
-			this.lifecycleMainService.unload(window, UnloadReason.LOAD).then(veto => {
+			this.lifecycleMainService.unload(window, UnloadReason.LOAD).then(async veto => {
 				if (!veto) {
-					this.doOpenInBrowserWindow(window!, configuration, options);
+					await this.doOpenInBrowserWindow(window!, configuration, options);
 				}
 			});
 		} else {
-			this.doOpenInBrowserWindow(window, configuration, options);
+			await this.doOpenInBrowserWindow(window, configuration, options);
 		}
 
 		return window;
 	}
 
-	private doOpenInBrowserWindow(window: ICodeWindow, configuration: INativeWindowConfiguration, options: IOpenBrowserWindowOptions): void {
+	private async doOpenInBrowserWindow(window: ICodeWindow, configuration: INativeWindowConfiguration, options: IOpenBrowserWindowOptions): Promise<void> {
 
 		// Register window for backups unless the window
 		// is for extension development, where we do not
@@ -1498,27 +1501,34 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 			}
 		}
 
+		if (this.userDataProfilesMainService.isEnabled()) {
+			const workspace = configuration.workspace ?? toWorkspaceIdentifier(configuration.backupPath, false);
+			const profilePromise = this.resolveProfileForBrowserWindow(options, workspace);
+			const profile = profilePromise instanceof Promise ? await profilePromise : profilePromise;
+			configuration.profiles.profile = profile;
+
+			if (!configuration.extensionDevelopmentPath) {
+				// Associate the configured profile to the workspace
+				// unless the window is for extension development,
+				// where we do not persist the associations
+				await this.userDataProfilesMainService.setProfileForWorkspace(workspace, profile);
+			}
+		}
+
 		// Load it
 		window.load(configuration);
 	}
 
-	private async resolveProfileForBrowserWindow(options: IOpenBrowserWindowOptions): Promise<IUserDataProfile> {
-		let profile: IUserDataProfile | undefined;
-		if (this.userDataProfilesMainService.isEnabled()) {
-			if (options.forceProfile) {
-				profile = this.userDataProfilesMainService.profiles.find(p => p.name === options.forceProfile) ?? await this.userDataProfilesMainService.createNamedProfile(options.forceProfile);
-			} else if (options.forceTempProfile) {
-				profile = await this.userDataProfilesMainService.createTransientProfile();
-			}
+	private resolveProfileForBrowserWindow(options: IOpenBrowserWindowOptions, workspace: IAnyWorkspaceIdentifier): Promise<IUserDataProfile> | IUserDataProfile {
+		if (options.forceProfile) {
+			return this.userDataProfilesMainService.profiles.find(p => p.name === options.forceProfile) ?? this.userDataProfilesMainService.createNamedProfile(options.forceProfile);
 		}
-		if (profile) {
-			if (!options.cli?.extensionDevelopmentPath) {
-				this.userDataProfilesMainService.setProfileForWorkspaceSync(options.workspace ?? 'empty-window', profile);
-			}
-		} else {
-			profile = this.userDataProfilesMainService.getOrSetProfileForWorkspace(options.workspace ?? 'empty-window', (options.windowToUse ?? this.getLastActiveWindow())?.profile ?? this.userDataProfilesMainService.defaultProfile);
+
+		if (options.forceTempProfile) {
+			return this.userDataProfilesMainService.createTransientProfile();
 		}
-		return profile;
+
+		return this.userDataProfilesMainService.getProfileForWorkspace(workspace) ?? this.userDataProfilesMainService.defaultProfile;
 	}
 
 	private onWindowClosed(window: ICodeWindow): void {
diff --git a/src/vs/platform/windows/electron-main/windowsStateHandler.ts b/src/vs/platform/windows/electron-main/windowsStateHandler.ts
index 15e669871becd5..a4de6b2bb81d1c 100644
--- a/src/vs/platform/windows/electron-main/windowsStateHandler.ts
+++ b/src/vs/platform/windows/electron-main/windowsStateHandler.ts
@@ -18,7 +18,7 @@ import { defaultWindowState, ICodeWindow, IWindowState as IWindowUIState, Window
 import { isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
 
 export interface IWindowState {
-	windowId?: number;
+	readonly windowId?: number;
 	workspace?: IWorkspaceIdentifier;
 	folderUri?: URI;
 	backupPath?: string;
diff --git a/src/vs/platform/workspace/common/workspace.ts b/src/vs/platform/workspace/common/workspace.ts
index d8052dfb673739..fe97d4be92ed03 100644
--- a/src/vs/platform/workspace/common/workspace.ts
+++ b/src/vs/platform/workspace/common/workspace.ts
@@ -140,11 +140,19 @@ export function isSingleFolderWorkspaceIdentifier(obj: unknown): obj is ISingleF
 	return typeof singleFolderIdentifier?.id === 'string' && URI.isUri(singleFolderIdentifier.uri);
 }
 
+export function isEmptyWorkspaceIdentifier(obj: unknown): obj is IEmptyWorkspaceIdentifier {
+	const emptyWorkspaceIdentifier = obj as IEmptyWorkspaceIdentifier | undefined;
+	return typeof emptyWorkspaceIdentifier?.id === 'string'
+		&& !isSingleFolderWorkspaceIdentifier(obj)
+		&& !isWorkspaceIdentifier(obj);
+}
+
 export const EXTENSION_DEVELOPMENT_EMPTY_WINDOW_WORKSPACE: IEmptyWorkspaceIdentifier = { id: 'ext-dev' };
+export const UNKNOWN_EMPTY_WINDOW_WORKSPACE: IEmptyWorkspaceIdentifier = { id: 'empty-window' };
 
-export function toWorkspaceIdentifier(workspace: IWorkspace): IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | undefined;
+export function toWorkspaceIdentifier(workspace: IWorkspace): IAnyWorkspaceIdentifier;
 export function toWorkspaceIdentifier(backupPath: string | undefined, isExtensionDevelopment: boolean): IEmptyWorkspaceIdentifier;
-export function toWorkspaceIdentifier(arg0: IWorkspace | string | undefined, isExtensionDevelopment?: boolean): IAnyWorkspaceIdentifier | undefined {
+export function toWorkspaceIdentifier(arg0: IWorkspace | string | undefined, isExtensionDevelopment?: boolean): IAnyWorkspaceIdentifier {
 
 	// Empty workspace
 	if (typeof arg0 === 'string' || typeof arg0 === 'undefined') {
@@ -163,7 +171,7 @@ export function toWorkspaceIdentifier(arg0: IWorkspace | string | undefined, isE
 			return EXTENSION_DEVELOPMENT_EMPTY_WINDOW_WORKSPACE;
 		}
 
-		return undefined;
+		return UNKNOWN_EMPTY_WINDOW_WORKSPACE;
 	}
 
 	// Multi root
@@ -183,7 +191,10 @@ export function toWorkspaceIdentifier(arg0: IWorkspace | string | undefined, isE
 		};
 	}
 
-	return undefined;
+	// Empty window
+	return {
+		id: workspace.id
+	};
 }
 
 export function isWorkspaceIdentifier(obj: unknown): obj is IWorkspaceIdentifier {
@@ -204,8 +215,8 @@ export function reviveIdentifier(identifier: undefined): undefined;
 export function reviveIdentifier(identifier: ISerializedWorkspaceIdentifier): IWorkspaceIdentifier;
 export function reviveIdentifier(identifier: ISerializedSingleFolderWorkspaceIdentifier): ISingleFolderWorkspaceIdentifier;
 export function reviveIdentifier(identifier: IEmptyWorkspaceIdentifier): IEmptyWorkspaceIdentifier;
-export function reviveIdentifier(identifier: ISerializedWorkspaceIdentifier | ISerializedSingleFolderWorkspaceIdentifier | IEmptyWorkspaceIdentifier | undefined): IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | IEmptyWorkspaceIdentifier | undefined;
-export function reviveIdentifier(identifier: ISerializedWorkspaceIdentifier | ISerializedSingleFolderWorkspaceIdentifier | IEmptyWorkspaceIdentifier | undefined): IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | IEmptyWorkspaceIdentifier | undefined {
+export function reviveIdentifier(identifier: ISerializedWorkspaceIdentifier | ISerializedSingleFolderWorkspaceIdentifier | IEmptyWorkspaceIdentifier | undefined): IAnyWorkspaceIdentifier | undefined;
+export function reviveIdentifier(identifier: ISerializedWorkspaceIdentifier | ISerializedSingleFolderWorkspaceIdentifier | IEmptyWorkspaceIdentifier | undefined): IAnyWorkspaceIdentifier | undefined {
 
 	// Single Folder
 	const singleFolderIdentifierCandidate = identifier as ISerializedSingleFolderWorkspaceIdentifier | undefined;
diff --git a/src/vs/platform/workspaces/electron-main/workspacesManagementMainService.ts b/src/vs/platform/workspaces/electron-main/workspacesManagementMainService.ts
index de73f7f5572ebe..26b3b2fb1caf7e 100644
--- a/src/vs/platform/workspaces/electron-main/workspacesManagementMainService.ts
+++ b/src/vs/platform/workspaces/electron-main/workspacesManagementMainService.ts
@@ -31,8 +31,8 @@ import { getWorkspaceIdentifier } from 'vs/platform/workspaces/node/workspaces';
 export const IWorkspacesManagementMainService = createDecorator<IWorkspacesManagementMainService>('workspacesManagementMainService');
 
 export interface IWorkspaceEnteredEvent {
-	window: ICodeWindow;
-	workspace: IWorkspaceIdentifier;
+	readonly window: ICodeWindow;
+	readonly workspace: IWorkspaceIdentifier;
 }
 
 export interface IWorkspacesManagementMainService {
diff --git a/src/vs/platform/workspaces/test/common/workspaces.test.ts b/src/vs/platform/workspaces/test/common/workspaces.test.ts
index 892c3232635d94..374ac0657f2745 100644
--- a/src/vs/platform/workspaces/test/common/workspaces.test.ts
+++ b/src/vs/platform/workspaces/test/common/workspaces.test.ts
@@ -5,7 +5,7 @@
 
 import * as assert from 'assert';
 import { URI } from 'vs/base/common/uri';
-import { ISerializedSingleFolderWorkspaceIdentifier, ISerializedWorkspaceIdentifier, reviveIdentifier, hasWorkspaceFileExtension, isWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, IEmptyWorkspaceIdentifier, toWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import { ISerializedSingleFolderWorkspaceIdentifier, ISerializedWorkspaceIdentifier, reviveIdentifier, hasWorkspaceFileExtension, isWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, IEmptyWorkspaceIdentifier, toWorkspaceIdentifier, isEmptyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
 
 suite('Workspaces', () => {
 
@@ -31,8 +31,9 @@ suite('Workspaces', () => {
 
 	test('toWorkspaceIdentifier', () => {
 		let identifier = toWorkspaceIdentifier({ id: 'id', folders: [] });
-		assert.ok(!identifier);
-		assert.ok(!isSingleFolderWorkspaceIdentifier(identifier));
+		assert.ok(identifier);
+		assert.ok(isEmptyWorkspaceIdentifier(identifier));
+		assert.ok(!isWorkspaceIdentifier(identifier));
 		assert.ok(!isWorkspaceIdentifier(identifier));
 
 		identifier = toWorkspaceIdentifier({ id: 'id', folders: [{ index: 0, name: 'test', toResource: () => URI.file('test'), uri: URI.file('test') }] });
diff --git a/src/vs/server/node/extensionHostConnection.ts b/src/vs/server/node/extensionHostConnection.ts
index 3336c1ec2ce18c..3fd3e32d3cfcc7 100644
--- a/src/vs/server/node/extensionHostConnection.ts
+++ b/src/vs/server/node/extensionHostConnection.ts
@@ -21,14 +21,15 @@ import { removeDangerousEnvVariables } from 'vs/base/common/processes';
 import { IExtensionHostStatusService } from 'vs/server/node/extensionHostStatusService';
 import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
 import { IPCExtHostConnection, writeExtHostConnection, SocketExtHostConnection } from 'vs/workbench/services/extensions/common/extensionHostEnv';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 
-export async function buildUserEnvironment(startParamsEnv: { [key: string]: string | null } = {}, withUserShellEnvironment: boolean, language: string, environmentService: IServerEnvironmentService, logService: ILogService): Promise<IProcessEnvironment> {
+export async function buildUserEnvironment(startParamsEnv: { [key: string]: string | null } = {}, withUserShellEnvironment: boolean, language: string, environmentService: IServerEnvironmentService, logService: ILogService, configurationService: IConfigurationService): Promise<IProcessEnvironment> {
 	const nlsConfig = await getNLSConfiguration(language, environmentService.userDataPath);
 
 	let userShellEnv: typeof process.env = {};
 	if (withUserShellEnvironment) {
 		try {
-			userShellEnv = await getResolvedShellEnv(logService, environmentService.args, process.env);
+			userShellEnv = await getResolvedShellEnv(configurationService, logService, environmentService.args, process.env);
 		} catch (error) {
 			logService.error('ExtensionHostConnection#buildUserEnvironment resolving shell environment failed', error);
 		}
@@ -121,6 +122,7 @@ export class ExtensionHostConnection {
 		@IServerEnvironmentService private readonly _environmentService: IServerEnvironmentService,
 		@ILogService private readonly _logService: ILogService,
 		@IExtensionHostStatusService private readonly _extensionHostStatusService: IExtensionHostStatusService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService
 	) {
 		this._canSendSocket = (!isWindows || !this._environmentService.args['socket-path']);
 		this._disposed = false;
@@ -233,7 +235,7 @@ export class ExtensionHostConnection {
 				execArgv = [`--inspect${startParams.break ? '-brk' : ''}=${startParams.port}`];
 			}
 
-			const env = await buildUserEnvironment(startParams.env, true, startParams.language, this._environmentService, this._logService);
+			const env = await buildUserEnvironment(startParams.env, true, startParams.language, this._environmentService, this._logService, this._configurationService);
 			removeDangerousEnvVariables(env);
 
 			let extHostNamedPipeServer: net.Server | null;
diff --git a/src/vs/server/node/remoteAgentEnvironmentImpl.ts b/src/vs/server/node/remoteAgentEnvironmentImpl.ts
index cf3090bc7ff291..3a4188285c4aa6 100644
--- a/src/vs/server/node/remoteAgentEnvironmentImpl.ts
+++ b/src/vs/server/node/remoteAgentEnvironmentImpl.ts
@@ -334,8 +334,7 @@ export class RemoteAgentEnvironmentChannel implements IServerChannel {
 	}
 
 	private async _scanInstalledExtensions(language: string): Promise<IExtensionDescription[]> {
-		await this._extensionsScannerService.initializeDefaultProfileExtensions();
-		const scannedExtensions = await this._extensionsScannerService.scanUserExtensions({ language, useCache: true });
+		const scannedExtensions = await this._extensionsScannerService.scanUserExtensions({ profileLocation: this._userDataProfilesService.defaultProfile.extensionsResource, language, useCache: true });
 		return scannedExtensions.map(e => toExtensionDescription(e, false));
 	}
 
diff --git a/src/vs/server/node/remoteExtensionHostAgentCli.ts b/src/vs/server/node/remoteExtensionHostAgentCli.ts
index 0b4cab3b1cdd9f..03d3845e0c4b65 100644
--- a/src/vs/server/node/remoteExtensionHostAgentCli.ts
+++ b/src/vs/server/node/remoteExtensionHostAgentCli.ts
@@ -43,9 +43,10 @@ import { buildHelpMessage, buildVersionMessage, OptionDescriptions } from 'vs/pl
 import { isWindows } from 'vs/base/common/platform';
 import { IExtensionsScannerService } from 'vs/platform/extensionManagement/common/extensionsScannerService';
 import { ExtensionsScannerService } from 'vs/server/node/extensionsScannerService';
-import { IUserDataProfilesService, UserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
 import { ExtensionsProfileScannerService, IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
 import { NullPolicyService } from 'vs/platform/policy/common/policy';
+import { ServerUserDataProfilesService } from 'vs/platform/userDataProfile/node/userDataProfile';
 
 class CliMain extends Disposable {
 
@@ -97,7 +98,7 @@ class CliMain extends Disposable {
 		services.set(IUriIdentityService, uriIdentityService);
 
 		// User Data Profiles
-		const userDataProfilesService = this._register(new UserDataProfilesService(environmentService, fileService, uriIdentityService, logService));
+		const userDataProfilesService = this._register(new ServerUserDataProfilesService(uriIdentityService, environmentService, fileService, logService));
 		services.set(IUserDataProfilesService, userDataProfilesService);
 
 		// Configuration
diff --git a/src/vs/server/node/remoteExtensionHostAgentServer.ts b/src/vs/server/node/remoteExtensionHostAgentServer.ts
index ce679e092012fe..a1603e73f2747c 100644
--- a/src/vs/server/node/remoteExtensionHostAgentServer.ts
+++ b/src/vs/server/node/remoteExtensionHostAgentServer.ts
@@ -280,12 +280,12 @@ class RemoteExtensionHostAgentServer extends Disposable implements IServerAPI {
 	/**
 	 * NOTE: Avoid using await in this method!
 	 * The problem is that await introduces a process.nextTick due to the implicit Promise.then
-	 * This can lead to some bytes being interpreted and a control message being emitted before the next listener has a chance to be registered.
+	 * This can lead to some bytes being received and interpreted and a control message being emitted before the next listener has a chance to be registered.
 	 */
 	private _handleWebSocketConnection(socket: NodeSocket | WebSocketNodeSocket, isReconnection: boolean, reconnectionToken: string): void {
 		const remoteAddress = this._getRemoteAddress(socket);
 		const logPrefix = `[${remoteAddress}][${reconnectionToken.substr(0, 8)}]`;
-		const protocol = new PersistentProtocol(socket);
+		const protocol = new PersistentProtocol({ socket });
 
 		const validator = this._vsdaMod ? new this._vsdaMod.validator() : null;
 		const signer = this._vsdaMod ? new this._vsdaMod.signer() : null;
diff --git a/src/vs/server/node/remoteTerminalChannel.ts b/src/vs/server/node/remoteTerminalChannel.ts
index faa7048e384a5c..1b122f6c8fca08 100644
--- a/src/vs/server/node/remoteTerminalChannel.ts
+++ b/src/vs/server/node/remoteTerminalChannel.ts
@@ -30,6 +30,7 @@ import { buildUserEnvironment } from 'vs/server/node/extensionHostConnection';
 import { IServerEnvironmentService } from 'vs/server/node/serverEnvironmentService';
 import { IProductService } from 'vs/platform/product/common/productService';
 import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 
 class CustomVariableResolver extends AbstractVariableResolverService {
 	constructor(
@@ -98,6 +99,7 @@ export class RemoteTerminalChannel extends Disposable implements IServerChannel<
 		private readonly _ptyService: IPtyService,
 		private readonly _productService: IProductService,
 		private readonly _extensionManagementService: IExtensionManagementService,
+		private readonly _configurationService: IConfigurationService
 	) {
 		super();
 	}
@@ -133,7 +135,7 @@ export class RemoteTerminalChannel extends Disposable implements IServerChannel<
 			case '$getDefaultSystemShell': return this._getDefaultSystemShell.apply(this, args);
 			case '$getProfiles': return this._getProfiles.apply(this, args);
 			case '$getEnvironment': return this._getEnvironment();
-			case '$getWslPath': return this._getWslPath(args[0]);
+			case '$getWslPath': return this._getWslPath(args[0], args[1]);
 			case '$getTerminalLayoutInfo': return this._ptyService.getTerminalLayoutInfo(<IGetTerminalLayoutInfoArgs>args);
 			case '$setTerminalLayoutInfo': return this._ptyService.setTerminalLayoutInfo(<ISetTerminalLayoutInfoArgs>args);
 			case '$serializeTerminalState': return this._ptyService.serializeTerminalState.apply(this._ptyService, args);
@@ -193,7 +195,7 @@ export class RemoteTerminalChannel extends Disposable implements IServerChannel<
 		};
 
 
-		const baseEnv = await buildUserEnvironment(args.resolverEnv, !!args.shellLaunchConfig.useShellEnvironment, platform.language, this._environmentService, this._logService);
+		const baseEnv = await buildUserEnvironment(args.resolverEnv, !!args.shellLaunchConfig.useShellEnvironment, platform.language, this._environmentService, this._logService, this._configurationService);
 		this._logService.trace('baseEnv', baseEnv);
 
 		const reviveWorkspaceFolder = (workspaceData: IWorkspaceFolderData): IWorkspaceFolder => {
@@ -321,8 +323,8 @@ export class RemoteTerminalChannel extends Disposable implements IServerChannel<
 		return { ...process.env };
 	}
 
-	private _getWslPath(original: string): Promise<string> {
-		return this._ptyService.getWslPath(original);
+	private _getWslPath(original: string, direction: 'unix-to-win' | 'win-to-unix'): Promise<string> {
+		return this._ptyService.getWslPath(original, direction);
 	}
 
 
diff --git a/src/vs/server/node/serverConnectionToken.ts b/src/vs/server/node/serverConnectionToken.ts
index 2d678ce97560e2..1868647c790558 100644
--- a/src/vs/server/node/serverConnectionToken.ts
+++ b/src/vs/server/node/serverConnectionToken.ts
@@ -13,7 +13,7 @@ import { connectionTokenCookieName, connectionTokenQueryName } from 'vs/base/com
 import { ServerParsedArgs } from 'vs/server/node/serverEnvironmentService';
 import { Promises } from 'vs/base/node/pfs';
 
-const connectionTokenRegex = /^[0-9A-Za-z-]+$/;
+const connectionTokenRegex = /^[0-9A-Za-z_-]+$/;
 
 export const enum ServerConnectionTokenType {
 	None,
@@ -85,7 +85,7 @@ export async function parseServerConnectionToken(args: ServerParsedArgs, default
 		}
 
 		if (!connectionTokenRegex.test(rawConnectionToken)) {
-			return new ServerConnectionTokenParseError(`The connection token defined in '${connectionTokenFile} does not adhere to the characters 0-9, a-z, A-Z or -.`);
+			return new ServerConnectionTokenParseError(`The connection token defined in '${connectionTokenFile} does not adhere to the characters 0-9, a-z, A-Z, _, or -.`);
 		}
 
 		return new MandatoryServerConnectionToken(rawConnectionToken);
diff --git a/src/vs/server/node/serverServices.ts b/src/vs/server/node/serverServices.ts
index 7da84227a8b16a..8bd5a6351402eb 100644
--- a/src/vs/server/node/serverServices.ts
+++ b/src/vs/server/node/serverServices.ts
@@ -70,12 +70,13 @@ import { ExtensionHostStatusService, IExtensionHostStatusService } from 'vs/serv
 import { IExtensionsScannerService } from 'vs/platform/extensionManagement/common/extensionsScannerService';
 import { ExtensionsScannerService } from 'vs/server/node/extensionsScannerService';
 import { ExtensionsProfileScannerService, IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
-import { IUserDataProfilesService, UserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
 import { NullPolicyService } from 'vs/platform/policy/common/policy';
 import { OneDataSystemAppender } from 'vs/platform/telemetry/node/1dsAppender';
 import { LoggerService } from 'vs/platform/log/node/loggerService';
 import { URI } from 'vs/base/common/uri';
 import { BufferLogService } from 'vs/platform/log/common/bufferLog';
+import { ServerUserDataProfilesService } from 'vs/platform/userDataProfile/node/userDataProfile';
 
 const eventPrefix = 'monacoworkbench';
 
@@ -121,7 +122,7 @@ export async function setupServerServices(connectionToken: ServerConnectionToken
 	services.set(IUriIdentityService, uriIdentityService);
 
 	// User Data Profiles
-	const userDataProfilesService = new UserDataProfilesService(environmentService, fileService, uriIdentityService, logService);
+	const userDataProfilesService = new ServerUserDataProfilesService(uriIdentityService, environmentService, fileService, logService);
 	services.set(IUserDataProfilesService, userDataProfilesService);
 
 	// Configuration
@@ -202,7 +203,7 @@ export async function setupServerServices(connectionToken: ServerConnectionToken
 		const telemetryChannel = new ServerTelemetryChannel(accessor.get(IServerTelemetryService), oneDsAppender);
 		socketServer.registerChannel('telemetry', telemetryChannel);
 
-		socketServer.registerChannel(REMOTE_TERMINAL_CHANNEL_NAME, new RemoteTerminalChannel(environmentService, logService, ptyService, productService, extensionManagementService));
+		socketServer.registerChannel(REMOTE_TERMINAL_CHANNEL_NAME, new RemoteTerminalChannel(environmentService, logService, ptyService, productService, extensionManagementService, configurationService));
 
 		const remoteFileSystemChannel = new RemoteAgentFileSystemProviderChannel(logService, environmentService);
 		socketServer.registerChannel(REMOTE_FILE_SYSTEM_CHANNEL_NAME, remoteFileSystemChannel);
diff --git a/src/vs/workbench/api/browser/mainThreadComments.ts b/src/vs/workbench/api/browser/mainThreadComments.ts
index f417fe688e2644..7f478d0a762a58 100644
--- a/src/vs/workbench/api/browser/mainThreadComments.ts
+++ b/src/vs/workbench/api/browser/mainThreadComments.ts
@@ -120,6 +120,9 @@ export class MainThreadCommentThread<T> implements languages.CommentThread<T> {
 
 	private set initialCollapsibleState(initialCollapsibleState: languages.CommentThreadCollapsibleState | undefined) {
 		this._initialCollapsibleState = initialCollapsibleState;
+		if (this.collapsibleState === undefined) {
+			this.collapsibleState = this.initialCollapsibleState;
+		}
 		this._onDidChangeInitialCollapsibleState.fire(initialCollapsibleState);
 	}
 
diff --git a/src/vs/workbench/api/browser/mainThreadConfiguration.ts b/src/vs/workbench/api/browser/mainThreadConfiguration.ts
index de0630df1a1801..deb82c813659d2 100644
--- a/src/vs/workbench/api/browser/mainThreadConfiguration.ts
+++ b/src/vs/workbench/api/browser/mainThreadConfiguration.ts
@@ -77,7 +77,7 @@ export class MainThreadConfiguration implements MainThreadConfigurationShape {
 			: scopeToLanguage === false ? { resource: overrides.resource }
 				: overrides.overrideIdentifier && overriddenValue !== undefined ? overrides
 					: { resource: overrides.resource };
-		return this.configurationService.updateValue(key, value, overrides, configurationTarget, true);
+		return this.configurationService.updateValue(key, value, overrides, configurationTarget, { donotNotifyError: true });
 	}
 
 	private deriveConfigurationTarget(key: string, overrides: IConfigurationOverrides): ConfigurationTarget {
diff --git a/src/vs/workbench/api/browser/mainThreadCustomEditors.ts b/src/vs/workbench/api/browser/mainThreadCustomEditors.ts
index e36308dbc2efce..08d2e2c61981a6 100644
--- a/src/vs/workbench/api/browser/mainThreadCustomEditors.ts
+++ b/src/vs/workbench/api/browser/mainThreadCustomEditors.ts
@@ -195,7 +195,7 @@ export class MainThreadCustomEditors extends Disposable implements extHostProtoc
 				}
 
 				try {
-					await this._proxyCustomEditors.$resolveWebviewEditor(resource, handle, viewType, {
+					await this._proxyCustomEditors.$resolveCustomEditor(resource, handle, viewType, {
 						title: webviewInput.getTitle(),
 						contentOptions: webviewInput.webview.contentOptions,
 						options: webviewInput.webview.options,
diff --git a/src/vs/workbench/api/browser/mainThreadEditor.ts b/src/vs/workbench/api/browser/mainThreadEditor.ts
index cbc28f4d953f86..05b1a4921c9e1a 100644
--- a/src/vs/workbench/api/browser/mainThreadEditor.ts
+++ b/src/vs/workbench/api/browser/mainThreadEditor.ts
@@ -379,11 +379,7 @@ export class MainThreadTextEditor {
 			newOpts.tabSize = newConfiguration.tabSize;
 		}
 		if (typeof newConfiguration.indentSize !== 'undefined') {
-			if (newConfiguration.indentSize === 'tabSize') {
-				newOpts.indentSize = newOpts.tabSize || creationOpts.tabSize;
-			} else {
-				newOpts.indentSize = newConfiguration.indentSize;
-			}
+			newOpts.indentSize = newConfiguration.indentSize;
 		}
 		this._model.updateOptions(newOpts);
 	}
@@ -527,8 +523,7 @@ export class MainThreadTextEditor {
 		}
 
 		if (this._codeEditor.getModel().getVersionId() !== modelVersionId) {
-			// ignored because emmet tests fail...
-			// return false;
+			return false;
 		}
 
 		const snippetController = SnippetController2.get(this._codeEditor);
diff --git a/src/vs/workbench/api/browser/mainThreadTerminalService.ts b/src/vs/workbench/api/browser/mainThreadTerminalService.ts
index d9cda716c99547..023613fe87c6cd 100644
--- a/src/vs/workbench/api/browser/mainThreadTerminalService.ts
+++ b/src/vs/workbench/api/browser/mainThreadTerminalService.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { DisposableStore, Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { ExtHostContext, ExtHostTerminalServiceShape, MainThreadTerminalServiceShape, MainContext, TerminalLaunchConfig, ITerminalDimensionsDto, ExtHostTerminalIdentifier } from 'vs/workbench/api/common/extHost.protocol';
+import { ExtHostContext, ExtHostTerminalServiceShape, MainThreadTerminalServiceShape, MainContext, TerminalLaunchConfig, ITerminalDimensionsDto, ExtHostTerminalIdentifier, TerminalQuickFix } from 'vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
 import { URI } from 'vs/base/common/uri';
 import { StopWatch } from 'vs/base/common/stopwatch';
@@ -12,7 +12,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { ILogService } from 'vs/platform/log/common/log';
 import { IProcessProperty, IShellLaunchConfig, IShellLaunchConfigDto, ProcessPropertyType, TerminalExitReason, TerminalLocation } from 'vs/platform/terminal/common/terminal';
 import { TerminalDataBufferer } from 'vs/platform/terminal/common/terminalDataBuffering';
-import { ITerminalEditorService, ITerminalExternalLinkProvider, ITerminalGroupService, ITerminalInstance, ITerminalInstanceService, ITerminalLink, ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
+import { ITerminalEditorService, ITerminalExternalLinkProvider, ITerminalGroupService, ITerminalInstance, ITerminalLink, ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
 import { TerminalProcessExtHostProxy } from 'vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy';
 import { IEnvironmentVariableService, ISerializableEnvironmentVariableCollection } from 'vs/workbench/contrib/terminal/common/environmentVariable';
 import { deserializeEnvironmentVariableCollection, serializeEnvironmentVariableCollection } from 'vs/workbench/contrib/terminal/common/environmentVariableShared';
@@ -24,7 +24,9 @@ import { TerminalEditorLocationOptions } from 'vscode';
 import { Promises } from 'vs/base/common/async';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { ITerminalCommand } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { ITerminalOutputMatch, ITerminalOutputMatcher, ITerminalQuickFixOptions } from 'vs/platform/terminal/common/xterm/terminalQuickFix';
+import { ITerminalOutputMatch, ITerminalOutputMatcher, ITerminalQuickFix, ITerminalQuickFixOptions } from 'vs/platform/terminal/common/xterm/terminalQuickFix';
+import { TerminalQuickFixType } from 'vs/workbench/api/common/extHostTypes';
+
 
 @extHostNamedCustomer(MainContext.MainThreadTerminalService)
 export class MainThreadTerminalService implements MainThreadTerminalServiceShape {
@@ -55,7 +57,6 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 		private readonly _extHostContext: IExtHostContext,
 		@ITerminalService private readonly _terminalService: ITerminalService,
 		@ITerminalQuickFixService private readonly _terminalQuickFixService: ITerminalQuickFixService,
-		@ITerminalInstanceService readonly terminalInstanceService: ITerminalInstanceService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IEnvironmentVariableService private readonly _environmentVariableService: IEnvironmentVariableService,
 		@ILogService private readonly _logService: ILogService,
@@ -276,19 +277,9 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 					if (matchResult) {
 						const result = await this._proxy.$provideTerminalQuickFixes(id, matchResult, token);
 						if (result && Array.isArray(result)) {
-							return result.map(r => {
-								return {
-									id,
-									source: extensionId,
-									...r
-								};
-							});
+							return result.map(r => parseQuickFix(id, extensionId, r));
 						} else if (result) {
-							return {
-								id,
-								source: extensionId,
-								...result
-							};
+							return parseQuickFix(id, extensionId, result);
 						}
 					}
 					return;
@@ -466,5 +457,14 @@ class ExtensionTerminalLinkProvider implements ITerminalExternalLinkProvider {
 
 export function getOutputMatchForLines(lines: string[], outputMatcher: ITerminalOutputMatcher): ITerminalOutputMatch | undefined {
 	const match: RegExpMatchArray | null | undefined = lines.join('\n').match(outputMatcher.lineMatcher);
-	return match ? { regexMatch: match, outputLines: outputMatcher.multipleMatches ? lines : undefined } : undefined;
+	return match ? { regexMatch: match, outputLines: lines } : undefined;
+}
+
+function parseQuickFix(id: string, source: string, fix: TerminalQuickFix): ITerminalQuickFix {
+	let type = TerminalQuickFixType.Command;
+	if ('uri' in fix) {
+		fix.uri = URI.revive(fix.uri);
+		type = TerminalQuickFixType.Opener;
+	}
+	return { id, type, source, ...fix };
 }
diff --git a/src/vs/workbench/api/browser/mainThreadWebviewPanels.ts b/src/vs/workbench/api/browser/mainThreadWebviewPanels.ts
index fb393898704612..59c8ca11f7f1ae 100644
--- a/src/vs/workbench/api/browser/mainThreadWebviewPanels.ts
+++ b/src/vs/workbench/api/browser/mainThreadWebviewPanels.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { onUnexpectedError } from 'vs/base/common/errors';
+import { Event } from 'vs/base/common/event';
 import { Disposable, DisposableMap } from 'vs/base/common/lifecycle';
 import { URI } from 'vs/base/common/uri';
 import { generateUuid } from 'vs/base/common/uuid';
@@ -106,11 +107,13 @@ export class MainThreadWebviewPanels extends Disposable implements extHostProtoc
 
 		this._proxy = context.getProxy(extHostProtocol.ExtHostContext.ExtHostWebviewPanels);
 
-		this._register(_editorService.onDidActiveEditorChange(() => {
-			this.updateWebviewViewStates(this._editorService.activeEditor);
-		}));
-
-		this._register(_editorService.onDidVisibleEditorsChange(() => {
+		this._register(Event.any(
+			_editorService.onDidActiveEditorChange,
+			_editorService.onDidVisibleEditorsChange,
+			_editorGroupService.onDidAddGroup,
+			_editorGroupService.onDidRemoveGroup,
+			_editorGroupService.onDidMoveGroup,
+		)(() => {
 			this.updateWebviewViewStates(this._editorService.activeEditor);
 		}));
 
diff --git a/src/vs/workbench/api/browser/mainThreadWebviewViews.ts b/src/vs/workbench/api/browser/mainThreadWebviewViews.ts
index 24bf645059c7e2..cca131b984e033 100644
--- a/src/vs/workbench/api/browser/mainThreadWebviewViews.ts
+++ b/src/vs/workbench/api/browser/mainThreadWebviewViews.ts
@@ -11,6 +11,7 @@ import { MainThreadWebviews, reviveWebviewExtension } from 'vs/workbench/api/bro
 import * as extHostProtocol from 'vs/workbench/api/common/extHost.protocol';
 import { IViewBadge } from 'vs/workbench/common/views';
 import { IWebviewViewService, WebviewView } from 'vs/workbench/contrib/webviewView/browser/webviewViewService';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
 
 
@@ -24,6 +25,7 @@ export class MainThreadWebviewsViews extends Disposable implements extHostProtoc
 	constructor(
 		context: IExtHostContext,
 		private readonly mainThreadWebviews: MainThreadWebviews,
+		@ITelemetryService private readonly _telemetryService: ITelemetryService,
 		@IWebviewViewService private readonly _webviewViewService: IWebviewViewService,
 	) {
 		super();
@@ -93,6 +95,21 @@ export class MainThreadWebviewsViews extends Disposable implements extHostProtoc
 					this._webviewViews.deleteAndDispose(handle);
 				});
 
+				type CreateWebviewViewTelemetry = {
+					extensionId: string;
+					id: string;
+				};
+				type Classification = {
+					extensionId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Id of the extension' };
+					id: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Id of the view' };
+					owner: 'digitarald';
+					comment: 'Helps to gain insights on what extension contributed views are most popular';
+				};
+				this._telemetryService.publicLog2<CreateWebviewViewTelemetry, Classification>('webviews:createWebviewView', {
+					extensionId: extension.id.value,
+					id: viewType,
+				});
+
 				try {
 					await this._proxy.$resolveWebviewView(handle, viewType, webviewView.title, state, cancellation);
 				} catch (error) {
diff --git a/src/vs/workbench/api/browser/viewsExtensionPoint.ts b/src/vs/workbench/api/browser/viewsExtensionPoint.ts
index 73df44c84bee74..810c592c7a1c9a 100644
--- a/src/vs/workbench/api/browser/viewsExtensionPoint.ts
+++ b/src/vs/workbench/api/browser/viewsExtensionPoint.ts
@@ -251,7 +251,18 @@ type ViewExtensionPointType = { [loc: string]: IUserFriendlyViewDescriptor[] };
 const viewsExtensionPoint: IExtensionPoint<ViewExtensionPointType> = ExtensionsRegistry.registerExtensionPoint<ViewExtensionPointType>({
 	extensionPoint: 'views',
 	deps: [viewsContainersExtensionPoint],
-	jsonSchema: viewsContribution
+	jsonSchema: viewsContribution,
+	activationEventsGenerator: (viewExtensionPointTypeArray, result) => {
+		for (const viewExtensionPointType of viewExtensionPointTypeArray) {
+			for (const viewDescriptors of Object.values(viewExtensionPointType)) {
+				for (const viewDescriptor of viewDescriptors) {
+					if (viewDescriptor.id) {
+						result.push(`onView:${viewDescriptor.id}`);
+					}
+				}
+			}
+		}
+	}
 });
 
 const CUSTOM_VIEWS_START_ORDER = 7;
diff --git a/src/vs/workbench/api/common/configurationExtensionPoint.ts b/src/vs/workbench/api/common/configurationExtensionPoint.ts
index bc9154765d5517..1e08a01801ca37 100644
--- a/src/vs/workbench/api/common/configurationExtensionPoint.ts
+++ b/src/vs/workbench/api/common/configurationExtensionPoint.ts
@@ -46,10 +46,6 @@ const configurationEntrySchema: IJSONSchema = {
 					{
 						type: 'object',
 						properties: {
-							isExecutable: {
-								type: 'boolean',
-								markdownDeprecationMessage: 'This property is deprecated. Instead use `scope` property and set it to `machine` value.'
-							},
 							scope: {
 								type: 'string',
 								enum: ['application', 'machine', 'window', 'resource', 'language-overridable', 'machine-overridable'],
@@ -110,7 +106,11 @@ const configurationEntrySchema: IJSONSchema = {
 							order: {
 								type: 'integer',
 								description: nls.localize('scope.order', 'When specified, gives the order of this setting relative to other settings within the same category. Settings with an order property will be placed before settings without this property set.')
-							}
+							},
+							ignoreSync: {
+								type: 'boolean',
+								description: nls.localize('scope.ignoreSync', 'When enabled, Settings Sync will not sync the user value of this configuration by default.')
+							},
 						}
 					}
 				]
diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts
index a5afe3dcd78812..48e67749ad8850 100644
--- a/src/vs/workbench/api/common/extHost.api.impl.ts
+++ b/src/vs/workbench/api/common/extHost.api.impl.ts
@@ -1315,6 +1315,8 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			TaskRevealKind: extHostTypes.TaskRevealKind,
 			TaskScope: extHostTypes.TaskScope,
 			TerminalLink: extHostTypes.TerminalLink,
+			TerminalQuickFixCommand: extHostTypes.TerminalQuickFixCommand,
+			TerminalQuickFixOpener: extHostTypes.TerminalQuickFixOpener,
 			TerminalLocation: extHostTypes.TerminalLocation,
 			TerminalProfile: extHostTypes.TerminalProfile,
 			TerminalExitReason: extHostTypes.TerminalExitReason,
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index 16d4acefd80a41..af66b1293d2f88 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -70,7 +70,10 @@ import { CandidatePort } from 'vs/workbench/services/remote/common/remoteExplore
 import { ITextQueryBuilderOptions } from 'vs/workbench/services/search/common/queryBuilder';
 import * as search from 'vs/workbench/services/search/common/search';
 import { EditSessionIdentityMatch } from 'vs/platform/workspace/common/editSessions';
-import { TerminalCommandMatchResult, TerminalQuickFix } from 'vscode';
+import { TerminalCommandMatchResult, TerminalQuickFixCommand, TerminalQuickFixOpener } from 'vscode';
+
+export type TerminalQuickFix = TerminalQuickFixCommand | TerminalQuickFixOpener;
+
 
 export interface IWorkspaceData extends IStaticWorkspaceData {
 	folders: { uri: UriComponents; name: string; index: number }[];
@@ -905,7 +908,7 @@ export interface ExtHostWebviewPanelsShape {
 }
 
 export interface ExtHostCustomEditorsShape {
-	$resolveWebviewEditor(
+	$resolveCustomEditor(
 		resource: UriComponents,
 		newWebviewHandle: WebviewHandle,
 		viewType: string,
diff --git a/src/vs/workbench/api/common/extHostApiCommands.ts b/src/vs/workbench/api/common/extHostApiCommands.ts
index db6bdefe028a62..e4326c4c6de999 100644
--- a/src/vs/workbench/api/common/extHostApiCommands.ts
+++ b/src/vs/workbench/api/common/extHostApiCommands.ts
@@ -139,17 +139,17 @@ const newCommands: ApiCommand[] = [
 	new ApiCommand(
 		'vscode.prepareCallHierarchy', '_executePrepareCallHierarchy', 'Prepare call hierarchy at a position inside a document',
 		[ApiCommandArgument.Uri, ApiCommandArgument.Position],
-		new ApiCommandResult<ICallHierarchyItemDto[], types.CallHierarchyItem[]>('A CallHierarchyItem or undefined', v => v.map(typeConverters.CallHierarchyItem.to))
+		new ApiCommandResult<ICallHierarchyItemDto[], types.CallHierarchyItem[]>('A promise that resolves to an array of CallHierarchyItem-instances', v => v.map(typeConverters.CallHierarchyItem.to))
 	),
 	new ApiCommand(
 		'vscode.provideIncomingCalls', '_executeProvideIncomingCalls', 'Compute incoming calls for an item',
 		[ApiCommandArgument.CallHierarchyItem],
-		new ApiCommandResult<IIncomingCallDto[], types.CallHierarchyIncomingCall[]>('A CallHierarchyItem or undefined', v => v.map(typeConverters.CallHierarchyIncomingCall.to))
+		new ApiCommandResult<IIncomingCallDto[], types.CallHierarchyIncomingCall[]>('A promise that resolves to an array of CallHierarchyIncomingCall-instances', v => v.map(typeConverters.CallHierarchyIncomingCall.to))
 	),
 	new ApiCommand(
 		'vscode.provideOutgoingCalls', '_executeProvideOutgoingCalls', 'Compute outgoing calls for an item',
 		[ApiCommandArgument.CallHierarchyItem],
-		new ApiCommandResult<IOutgoingCallDto[], types.CallHierarchyOutgoingCall[]>('A CallHierarchyItem or undefined', v => v.map(typeConverters.CallHierarchyOutgoingCall.to))
+		new ApiCommandResult<IOutgoingCallDto[], types.CallHierarchyOutgoingCall[]>('A promise that resolves to an array of CallHierarchyOutgoingCall-instances', v => v.map(typeConverters.CallHierarchyOutgoingCall.to))
 	),
 	// --- rename
 	new ApiCommand(
@@ -419,17 +419,17 @@ const newCommands: ApiCommand[] = [
 	new ApiCommand(
 		'vscode.prepareTypeHierarchy', '_executePrepareTypeHierarchy', 'Prepare type hierarchy at a position inside a document',
 		[ApiCommandArgument.Uri, ApiCommandArgument.Position],
-		new ApiCommandResult<ITypeHierarchyItemDto[], types.TypeHierarchyItem[]>('A TypeHierarchyItem or undefined', v => v.map(typeConverters.TypeHierarchyItem.to))
+		new ApiCommandResult<ITypeHierarchyItemDto[], types.TypeHierarchyItem[]>('A promise that resolves to an array of TypeHierarchyItem-instances', v => v.map(typeConverters.TypeHierarchyItem.to))
 	),
 	new ApiCommand(
 		'vscode.provideSupertypes', '_executeProvideSupertypes', 'Compute supertypes for an item',
 		[ApiCommandArgument.TypeHierarchyItem],
-		new ApiCommandResult<ITypeHierarchyItemDto[], types.TypeHierarchyItem[]>('A TypeHierarchyItem or undefined', v => v.map(typeConverters.TypeHierarchyItem.to))
+		new ApiCommandResult<ITypeHierarchyItemDto[], types.TypeHierarchyItem[]>('A promise that resolves to an array of TypeHierarchyItem-instances', v => v.map(typeConverters.TypeHierarchyItem.to))
 	),
 	new ApiCommand(
 		'vscode.provideSubtypes', '_executeProvideSubtypes', 'Compute subtypes for an item',
 		[ApiCommandArgument.TypeHierarchyItem],
-		new ApiCommandResult<ITypeHierarchyItemDto[], types.TypeHierarchyItem[]>('A TypeHierarchyItem or undefined', v => v.map(typeConverters.TypeHierarchyItem.to))
+		new ApiCommandResult<ITypeHierarchyItemDto[], types.TypeHierarchyItem[]>('A promise that resolves to an array of TypeHierarchyItem-instances', v => v.map(typeConverters.TypeHierarchyItem.to))
 	),
 	// --- testing
 	new ApiCommand(
@@ -442,6 +442,15 @@ const newCommands: ApiCommand[] = [
 		'vscode.experimental.editSession.continue', '_workbench.editSessions.actions.continueEditSession', 'Continue the current edit session in a different workspace',
 		[ApiCommandArgument.Uri.with('workspaceUri', 'The target workspace to continue the current edit session in')],
 		ApiCommandResult.Void
+	),
+	// --- context keys
+	new ApiCommand(
+		'setContext', '_setContext', 'Set a custom context key value that can be used in when clauses.',
+		[
+			ApiCommandArgument.String.with('name', 'The context key name'),
+			new ApiCommandArgument('value', 'The context key value', () => true, v => v),
+		],
+		ApiCommandResult.Void
 	)
 ];
 
diff --git a/src/vs/workbench/api/common/extHostCommands.ts b/src/vs/workbench/api/common/extHostCommands.ts
index 3d6fdca0af1f88..e6912dfea03c59 100644
--- a/src/vs/workbench/api/common/extHostCommands.ts
+++ b/src/vs/workbench/api/common/extHostCommands.ts
@@ -25,7 +25,9 @@ import { TestItemImpl } from 'vs/workbench/api/common/extHostTestItem';
 import { VSBuffer } from 'vs/base/common/buffer';
 import { SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
+import { StopWatch } from 'vs/base/common/stopwatch';
+import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
+import { TrustedTelemetryValue } from 'vs/platform/telemetry/common/telemetryUtils';
 
 interface CommandHandler {
 	callback: Function;
@@ -35,7 +37,7 @@ interface CommandHandler {
 }
 
 export interface ArgumentProcessor {
-	processArgument(arg: any): any;
+	processArgument(arg: any, extensionId: ExtensionIdentifier | undefined): any;
 }
 
 export class ExtHostCommands implements ExtHostCommandsShape {
@@ -235,7 +237,7 @@ export class ExtHostCommands implements ExtHostCommandsShape {
 			}
 		}
 
-		const start = Date.now();
+		const stopWatch = StopWatch.create();
 		try {
 			return await callback.apply(thisArg, args);
 		} catch (err) {
@@ -262,17 +264,17 @@ export class ExtHostCommands implements ExtHostCommandsShape {
 			};
 		}
 		finally {
-			this._reportTelemetry(command, id, Date.now() - start);
+			this._reportTelemetry(command, id, stopWatch.elapsed());
 		}
 	}
 
 	private _reportTelemetry(command: CommandHandler, id: string, duration: number) {
-		if (!command.extension || command.extension.isBuiltin) {
+		if (!command.extension) {
 			return;
 		}
 		type ExtensionActionTelemetry = {
 			extensionId: string;
-			id: string;
+			id: TrustedTelemetryValue<string>;
 			duration: number;
 		};
 		type ExtensionActionTelemetryMeta = {
@@ -284,7 +286,7 @@ export class ExtHostCommands implements ExtHostCommandsShape {
 		};
 		this.#telemetry.$publicLog2<ExtensionActionTelemetry, ExtensionActionTelemetryMeta>('Extension:ActionExecuted', {
 			extensionId: command.extension.identifier.value,
-			id: id,
+			id: new TrustedTelemetryValue(id),
 			duration: duration,
 		});
 	}
@@ -292,10 +294,11 @@ export class ExtHostCommands implements ExtHostCommandsShape {
 	$executeContributedCommand(id: string, ...args: any[]): Promise<unknown> {
 		this._logService.trace('ExtHostCommands#$executeContributedCommand', id);
 
-		if (!this._commands.has(id)) {
+		const cmdHandler = this._commands.get(id);
+		if (!cmdHandler) {
 			return Promise.reject(new Error(`Contributed command '${id}' does not exist.`));
 		} else {
-			args = args.map(arg => this._argumentProcessors.reduce((r, p) => p.processArgument(r), arg));
+			args = args.map(arg => this._argumentProcessors.reduce((r, p) => p.processArgument(r, cmdHandler.extension?.identifier), arg));
 			return this._executeContributedCommand(id, args, true);
 		}
 	}
diff --git a/src/vs/workbench/api/common/extHostComments.ts b/src/vs/workbench/api/common/extHostComments.ts
index 2e2f0e0835cd2f..43646d210bd4bb 100644
--- a/src/vs/workbench/api/common/extHostComments.ts
+++ b/src/vs/workbench/api/common/extHostComments.ts
@@ -136,7 +136,7 @@ export function createExtHostComments(mainContext: IMainContext, commands: ExtHo
 						if (typeof comment.body === 'string') {
 							comment.body = body;
 						} else {
-							comment.body.value = body;
+							comment.body = new types.MarkdownString(body);
 						}
 						return comment;
 					}
diff --git a/src/vs/workbench/api/common/extHostCustomEditors.ts b/src/vs/workbench/api/common/extHostCustomEditors.ts
index 04aa98ad3a8b07..a256e876c49ce6 100644
--- a/src/vs/workbench/api/common/extHostCustomEditors.ts
+++ b/src/vs/workbench/api/common/extHostCustomEditors.ts
@@ -114,18 +114,18 @@ class CustomDocumentStore {
 	}
 }
 
-const enum WebviewEditorType {
+const enum CustomEditorType {
 	Text,
 	Custom
 }
 
 type ProviderEntry = {
 	readonly extension: IExtensionDescription;
-	readonly type: WebviewEditorType.Text;
+	readonly type: CustomEditorType.Text;
 	readonly provider: vscode.CustomTextEditorProvider;
 } | {
 	readonly extension: IExtensionDescription;
-	readonly type: WebviewEditorType.Custom;
+	readonly type: CustomEditorType.Custom;
 	readonly provider: vscode.CustomReadonlyEditorProvider;
 };
 
@@ -133,18 +133,18 @@ class EditorProviderStore {
 	private readonly _providers = new Map<string, ProviderEntry>();
 
 	public addTextProvider(viewType: string, extension: IExtensionDescription, provider: vscode.CustomTextEditorProvider): vscode.Disposable {
-		return this.add(WebviewEditorType.Text, viewType, extension, provider);
+		return this.add(CustomEditorType.Text, viewType, extension, provider);
 	}
 
 	public addCustomProvider(viewType: string, extension: IExtensionDescription, provider: vscode.CustomReadonlyEditorProvider): vscode.Disposable {
-		return this.add(WebviewEditorType.Custom, viewType, extension, provider);
+		return this.add(CustomEditorType.Custom, viewType, extension, provider);
 	}
 
 	public get(viewType: string): ProviderEntry | undefined {
 		return this._providers.get(viewType);
 	}
 
-	private add(type: WebviewEditorType, viewType: string, extension: IExtensionDescription, provider: vscode.CustomTextEditorProvider | vscode.CustomReadonlyEditorProvider): vscode.Disposable {
+	private add(type: CustomEditorType, viewType: string, extension: IExtensionDescription, provider: vscode.CustomTextEditorProvider | vscode.CustomReadonlyEditorProvider): vscode.Disposable {
 		if (this._providers.has(viewType)) {
 			throw new Error(`Provider for viewType:${viewType} already registered`);
 		}
@@ -214,7 +214,7 @@ export class ExtHostCustomEditors implements extHostProtocol.ExtHostCustomEditor
 			throw new Error(`No provider found for '${viewType}'`);
 		}
 
-		if (entry.type !== WebviewEditorType.Custom) {
+		if (entry.type !== CustomEditorType.Custom) {
 			throw new Error(`Invalid provide type for '${viewType}'`);
 		}
 
@@ -236,7 +236,7 @@ export class ExtHostCustomEditors implements extHostProtocol.ExtHostCustomEditor
 			throw new Error(`No provider found for '${viewType}'`);
 		}
 
-		if (entry.type !== WebviewEditorType.Custom) {
+		if (entry.type !== CustomEditorType.Custom) {
 			throw new Error(`Invalid provider type for '${viewType}'`);
 		}
 
@@ -246,7 +246,7 @@ export class ExtHostCustomEditors implements extHostProtocol.ExtHostCustomEditor
 		document.dispose();
 	}
 
-	async $resolveWebviewEditor(
+	async $resolveCustomEditor(
 		resource: UriComponents,
 		handle: extHostProtocol.WebviewHandle,
 		viewType: string,
@@ -258,6 +258,7 @@ export class ExtHostCustomEditors implements extHostProtocol.ExtHostCustomEditor
 		position: EditorGroupColumn,
 		cancellation: CancellationToken,
 	): Promise<void> {
+		console.log('xxxx');
 		const entry = this._editorProviders.get(viewType);
 		if (!entry) {
 			throw new Error(`No provider found for '${viewType}'`);
@@ -271,11 +272,11 @@ export class ExtHostCustomEditors implements extHostProtocol.ExtHostCustomEditor
 		const revivedResource = URI.revive(resource);
 
 		switch (entry.type) {
-			case WebviewEditorType.Custom: {
+			case CustomEditorType.Custom: {
 				const { document } = this.getCustomDocumentEntry(viewType, revivedResource);
 				return entry.provider.resolveCustomEditor(document, panel, cancellation);
 			}
-			case WebviewEditorType.Text: {
+			case CustomEditorType.Text: {
 				const document = this._extHostDocuments.getDocument(revivedResource);
 				return entry.provider.resolveCustomTextEditor(document, panel, cancellation);
 			}
diff --git a/src/vs/workbench/api/common/extHostExtensionActivator.ts b/src/vs/workbench/api/common/extHostExtensionActivator.ts
index 4142c49a439321..0d7b4d471e7186 100644
--- a/src/vs/workbench/api/common/extHostExtensionActivator.ts
+++ b/src/vs/workbench/api/common/extHostExtensionActivator.ts
@@ -166,8 +166,7 @@ type ActivationIdAndReason = { id: ExtensionIdentifier; reason: ExtensionActivat
 export class ExtensionsActivator implements IDisposable {
 
 	private readonly _registry: ExtensionDescriptionRegistry;
-	private readonly _resolvedExtensionsSet: Set<string>;
-	private readonly _externalExtensionsMap: Map<string, ExtensionIdentifier>;
+	private readonly _globalRegistry: ExtensionDescriptionRegistry;
 	private readonly _host: IExtensionsActivatorHost;
 	private readonly _operations: Map<string, ActivationOperation>;
 	/**
@@ -177,16 +176,12 @@ export class ExtensionsActivator implements IDisposable {
 
 	constructor(
 		registry: ExtensionDescriptionRegistry,
-		resolvedExtensions: ExtensionIdentifier[],
-		externalExtensions: ExtensionIdentifier[],
+		globalRegistry: ExtensionDescriptionRegistry,
 		host: IExtensionsActivatorHost,
 		@ILogService private readonly _logService: ILogService
 	) {
 		this._registry = registry;
-		this._resolvedExtensionsSet = new Set<string>();
-		resolvedExtensions.forEach((extensionId) => this._resolvedExtensionsSet.add(ExtensionIdentifier.toKey(extensionId)));
-		this._externalExtensionsMap = new Map<string, ExtensionIdentifier>();
-		externalExtensions.forEach((extensionId) => this._externalExtensionsMap.set(ExtensionIdentifier.toKey(extensionId), extensionId));
+		this._globalRegistry = globalRegistry;
 		this._host = host;
 		this._operations = new Map<string, ActivationOperation>();
 		this._alreadyActivatedEvents = Object.create(null);
@@ -249,7 +244,7 @@ export class ExtensionsActivator implements IDisposable {
 			return this._operations.get(ExtensionIdentifier.toKey(currentActivation.id))!;
 		}
 
-		if (this._externalExtensionsMap.has(ExtensionIdentifier.toKey(currentActivation.id))) {
+		if (this._isHostExtension(currentActivation.id)) {
 			return this._createAndSaveOperation(currentActivation, null, [], null);
 		}
 
@@ -270,7 +265,7 @@ export class ExtensionsActivator implements IDisposable {
 		const depIds = (typeof currentExtension.extensionDependencies === 'undefined' ? [] : currentExtension.extensionDependencies);
 		for (const depId of depIds) {
 
-			if (this._resolvedExtensionsSet.has(ExtensionIdentifier.toKey(depId))) {
+			if (this._isResolvedExtension(depId)) {
 				// This dependency is already resolved
 				continue;
 			}
@@ -281,10 +276,10 @@ export class ExtensionsActivator implements IDisposable {
 				continue;
 			}
 
-			if (this._externalExtensionsMap.has(ExtensionIdentifier.toKey(depId))) {
+			if (this._isHostExtension(depId)) {
 				// must first wait for the dependency to activate
 				deps.push(this._handleActivationRequest({
-					id: this._externalExtensionsMap.get(ExtensionIdentifier.toKey(depId))!,
+					id: this._globalRegistry.getExtensionDescription(depId)!.identifier,
 					reason: currentActivation.reason
 				}));
 				continue;
@@ -325,6 +320,19 @@ export class ExtensionsActivator implements IDisposable {
 		this._operations.set(ExtensionIdentifier.toKey(activation.id), operation);
 		return operation;
 	}
+
+	private _isHostExtension(extensionId: ExtensionIdentifier | string): boolean {
+		return ExtensionDescriptionRegistry.isHostExtension(extensionId, this._registry, this._globalRegistry);
+	}
+
+	private _isResolvedExtension(extensionId: ExtensionIdentifier | string): boolean {
+		const extensionDescription = this._globalRegistry.getExtensionDescription(extensionId);
+		if (!extensionDescription) {
+			// unknown extension
+			return false;
+		}
+		return (!extensionDescription.main && !extensionDescription.browser);
+	}
 }
 
 class ActivationOperation {
diff --git a/src/vs/workbench/api/common/extHostExtensionService.ts b/src/vs/workbench/api/common/extHostExtensionService.ts
index 6ce16b0ff9e19a..26dfc14c97e55e 100644
--- a/src/vs/workbench/api/common/extHostExtensionService.ts
+++ b/src/vs/workbench/api/common/extHostExtensionService.ts
@@ -7,7 +7,7 @@ import * as nls from 'vs/nls';
 import * as path from 'vs/base/common/path';
 import * as performance from 'vs/base/common/performance';
 import { originalFSPath, joinPath, extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
-import { asPromise, Barrier, timeout } from 'vs/base/common/async';
+import { asPromise, Barrier, IntervalTimer, timeout } from 'vs/base/common/async';
 import { dispose, toDisposable, Disposable } from 'vs/base/common/lifecycle';
 import { TernarySearchTree } from 'vs/base/common/ternarySearchTree';
 import { URI, UriComponents } from 'vs/base/common/uri';
@@ -41,6 +41,7 @@ import { ExtensionSecrets } from 'vs/workbench/api/common/extHostSecrets';
 import { Schemas } from 'vs/base/common/network';
 import { IResolveAuthorityResult } from 'vs/workbench/services/extensions/common/extensionHostProxy';
 import { IExtHostLocalizationService } from 'vs/workbench/api/common/extHostLocalizationService';
+import { StopWatch } from 'vs/base/common/stopwatch';
 
 interface ITestRunner {
 	/** Old test runner API, as exported from `vscode/lib/testrunner` */
@@ -163,29 +164,16 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
 			[IExtHostSecretState, this._secretState]
 		));
 
-		let resolvedExtensions: ExtensionIdentifier[] = [];
-		let hostExtensions: ExtensionIdentifier[] = [];
-		if (this._initData.remote.isRemote) {
-			resolvedExtensions = this._initData.allExtensions.filter(extension => !extension.main && !extension.browser).map(extension => extension.identifier);
-			hostExtensions = (
-				this._initData.allExtensions
-					.filter(extension => !myExtensionsSet.has(ExtensionIdentifier.toKey(extension.identifier.value)))
-					.filter(extension => (extension.main || extension.browser) && extension.api === 'none').map(extension => extension.identifier)
-			);
-		}
-		const hostExtensionsSet = extensionIdentifiersArrayToSet(hostExtensions);
-
 		this._activator = this._register(new ExtensionsActivator(
 			this._myRegistry,
-			resolvedExtensions,
-			hostExtensions,
+			this._globalRegistry,
 			{
 				onExtensionActivationError: (extensionId: ExtensionIdentifier, error: Error, missingExtensionDependency: MissingExtensionDependency | null): void => {
 					this._mainThreadExtensionsProxy.$onExtensionActivationError(extensionId, errors.transformErrorForSerialization(error), missingExtensionDependency);
 				},
 
 				actualActivateExtension: async (extensionId: ExtensionIdentifier, reason: ExtensionActivationReason): Promise<ActivatedExtension> => {
-					if (hostExtensionsSet.has(ExtensionIdentifier.toKey(extensionId))) {
+					if (ExtensionDescriptionRegistry.isHostExtension(extensionId, this._myRegistry, this._globalRegistry)) {
 						await this._mainThreadExtensionsProxy.$activateExtension(extensionId, reason);
 						return new HostExtension();
 					}
@@ -766,10 +754,15 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
 	}
 
 	public async $resolveAuthority(remoteAuthority: string, resolveAttempt: number): Promise<IResolveAuthorityResult> {
-		this._logService.info(`$resolveAuthority invoked for authority (${getRemoteAuthorityPrefix(remoteAuthority)})`);
+		const sw = StopWatch.create(false);
+		const prefix = () => `[resolveAuthority(${getRemoteAuthorityPrefix(remoteAuthority)},${resolveAttempt})][${sw.elapsed()}ms] `;
+		const logInfo = (msg: string) => this._logService.info(`${prefix()}${msg}`);
+		const logError = (msg: string, err: any = undefined) => this._logService.error(`${prefix()}${msg}`, err);
 
+		logInfo(`activating resolver...`);
 		const { authorityPrefix, resolver } = await this._activateAndGetResolver(remoteAuthority);
 		if (!resolver) {
+			logError(`no resolver`);
 			return {
 				type: 'error',
 				error: {
@@ -780,11 +773,18 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
 			};
 		}
 
+		const intervalLogger = new IntervalTimer();
 		try {
+			logInfo(`setting tunnel factory...`);
 			this._register(await this._extHostTunnelService.setTunnelFactory(resolver));
+
+			intervalLogger.cancelAndSet(() => logInfo('waiting...'), 1000);
+			logInfo(`invoking resolve()...`);
 			performance.mark(`code/extHost/willResolveAuthority/${authorityPrefix}`);
 			const result = await resolver.resolve(remoteAuthority, { resolveAttempt });
 			performance.mark(`code/extHost/didResolveAuthorityOK/${authorityPrefix}`);
+			intervalLogger.dispose();
+			logInfo(`returned ${result.host}:${result.port}`);
 
 			// Split merged API result into separate authority/options
 			const authority: ResolvedAuthority = {
@@ -812,6 +812,8 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
 			};
 		} catch (err) {
 			performance.mark(`code/extHost/didResolveAuthorityError/${authorityPrefix}`);
+			intervalLogger.dispose();
+			logError(`returned an error`, err);
 			if (err instanceof RemoteAuthorityResolverError) {
 				return {
 					type: 'error',
diff --git a/src/vs/workbench/api/common/extHostLanguageFeatures.ts b/src/vs/workbench/api/common/extHostLanguageFeatures.ts
index 83222499467b1c..5b2b58a9e402bb 100644
--- a/src/vs/workbench/api/common/extHostLanguageFeatures.ts
+++ b/src/vs/workbench/api/common/extHostLanguageFeatures.ts
@@ -1021,7 +1021,7 @@ class CompletionsAdapter {
 			[extHostProtocol.ISuggestDataDtoField.sortText]: item.sortText !== item.label ? item.sortText : undefined,
 			[extHostProtocol.ISuggestDataDtoField.filterText]: item.filterText !== item.label ? item.filterText : undefined,
 			[extHostProtocol.ISuggestDataDtoField.preselect]: item.preselect || undefined,
-			[extHostProtocol.ISuggestDataDtoField.insertTextRules]: item.keepWhitespace ? languages.CompletionItemInsertTextRule.KeepWhitespace : 0,
+			[extHostProtocol.ISuggestDataDtoField.insertTextRules]: item.keepWhitespace ? languages.CompletionItemInsertTextRule.KeepWhitespace : languages.CompletionItemInsertTextRule.None,
 			[extHostProtocol.ISuggestDataDtoField.commitCharacters]: item.commitCharacters?.join(''),
 			[extHostProtocol.ISuggestDataDtoField.additionalTextEdits]: item.additionalTextEdits && item.additionalTextEdits.map(typeConvert.TextEdit.from),
 			[extHostProtocol.ISuggestDataDtoField.commandIdent]: command?.$ident,
diff --git a/src/vs/workbench/api/common/extHostLocalizationService.ts b/src/vs/workbench/api/common/extHostLocalizationService.ts
index ea8ee4b770bafd..f3e4d7554b978c 100644
--- a/src/vs/workbench/api/common/extHostLocalizationService.ts
+++ b/src/vs/workbench/api/common/extHostLocalizationService.ts
@@ -59,7 +59,6 @@ export class ExtHostLocalizationService implements ExtHostLocalizationShape {
 
 	async initializeLocalizedMessages(extension: IExtensionDescription): Promise<void> {
 		if (this.isDefaultLanguage
-			// TODO: support builtin extensions
 			|| (!extension.l10n && !extension.isBuiltin)
 		) {
 			return;
diff --git a/src/vs/workbench/api/common/extHostTelemetry.ts b/src/vs/workbench/api/common/extHostTelemetry.ts
index 2db079c8be6370..1a539f210566fb 100644
--- a/src/vs/workbench/api/common/extHostTelemetry.ts
+++ b/src/vs/workbench/api/common/extHostTelemetry.ts
@@ -52,10 +52,11 @@ export class ExtHostTelemetry implements ExtHostTelemetryShape {
 		};
 	}
 
-	instantiateLogger(extension: IExtensionDescription, appender: vscode.TelemetryAppender) {
+	instantiateLogger(extension: IExtensionDescription, appender: vscode.TelemetryAppender, options?: vscode.TelemetryInitializationOptions) {
 		const telemetryDetails = this.getTelemetryDetails();
 		const logger = new ExtHostTelemetryLogger(
 			appender,
+			options,
 			extension,
 			this._outputLogger,
 			this._inLoggingOnlyMode,
@@ -118,7 +119,7 @@ export class ExtHostTelemetry implements ExtHostTelemetryShape {
 
 	onExtensionError(extension: ExtensionIdentifier, error: Error): boolean {
 		const logger = this._telemetryLoggers.get(extension.value);
-		if (!logger) {
+		if (!logger || logger.ignoreUnhandledExtHostErrors) {
 			return false;
 		}
 		logger.logError(error);
@@ -131,14 +132,21 @@ export class ExtHostTelemetryLogger {
 	private readonly _onDidChangeEnableStates = new Emitter<vscode.TelemetryLogger>();
 	private _telemetryEnablements: { isUsageEnabled: boolean; isErrorsEnabled: boolean };
 	private _apiObject: vscode.TelemetryLogger | undefined;
+	private readonly _ignoreBuiltinCommonProperties: boolean;
+	private readonly _additionalCommonProperties: Record<string, any> | undefined;
+	public readonly ignoreUnhandledExtHostErrors: boolean;
 	constructor(
 		appender: vscode.TelemetryAppender,
+		options: vscode.TelemetryInitializationOptions | undefined,
 		private readonly _extension: IExtensionDescription,
 		private readonly _logger: ILogger,
 		private readonly _inLoggingOnlyMode: boolean,
 		private readonly _commonProperties: Record<string, any>,
 		telemetryEnablements: { isUsageEnabled: boolean; isErrorsEnabled: boolean }
 	) {
+		this.ignoreUnhandledExtHostErrors = options?.ignoreUnhandledErrors ?? false;
+		this._ignoreBuiltinCommonProperties = options?.ignoreBuiltInCommonProperties ?? false;
+		this._additionalCommonProperties = options?.additionalCommonProperties;
 		this._appender = appender;
 		this._telemetryEnablements = { isUsageEnabled: telemetryEnablements.isUsageEnabled, isErrorsEnabled: telemetryEnablements.isErrorsEnabled };
 	}
@@ -153,17 +161,16 @@ export class ExtHostTelemetryLogger {
 	mixInCommonPropsAndCleanData(data: Record<string, any>): Record<string, any> {
 		// Some telemetry modules prefer to break properties and measurmements up
 		// We mix common properties into the properties tab.
-		// TODO @lramos15 should this be up to the implementer and not done here?
 		let updatedData = data.properties ?? data;
 
 		// We don't clean measurements since they are just numbers
 		updatedData = cleanData(updatedData, []);
 
-		if (this._appender.additionalCommonProperties) {
-			updatedData = mixin(updatedData, this._appender.additionalCommonProperties);
+		if (this._additionalCommonProperties) {
+			updatedData = mixin(updatedData, this._additionalCommonProperties);
 		}
 
-		if (!this._appender.ignoreBuiltInCommonProperties) {
+		if (!this._ignoreBuiltinCommonProperties) {
 			updatedData = mixin(updatedData, this._commonProperties);
 		}
 
@@ -205,7 +212,7 @@ export class ExtHostTelemetryLogger {
 			this.logEvent(eventNameOrException, data);
 		} else {
 			// TODO @lramos15, implement cleaning for and logging for this case
-			this._appender.logException(eventNameOrException, data);
+			this._appender.logError(eventNameOrException, data);
 		}
 	}
 
diff --git a/src/vs/workbench/api/common/extHostTerminalService.ts b/src/vs/workbench/api/common/extHostTerminalService.ts
index acfb3f6345ff0b..7737164a7ce759 100644
--- a/src/vs/workbench/api/common/extHostTerminalService.ts
+++ b/src/vs/workbench/api/common/extHostTerminalService.ts
@@ -248,7 +248,7 @@ export class ExtHostTerminal {
 	}
 }
 
-export class ExtHostPseudoterminal implements ITerminalChildProcess {
+class ExtHostPseudoterminal implements ITerminalChildProcess {
 	readonly id = 0;
 	readonly shouldPersist = false;
 
@@ -679,7 +679,7 @@ export abstract class BaseExtHostTerminalService extends Disposable implements I
 		});
 	}
 
-	public async $provideTerminalQuickFixes(id: string, matchResult: vscode.TerminalCommandMatchResult): Promise<vscode.TerminalQuickFix[] | vscode.TerminalQuickFix | undefined> {
+	public async $provideTerminalQuickFixes(id: string, matchResult: vscode.TerminalCommandMatchResult): Promise<(vscode.TerminalQuickFixOpener | vscode.TerminalQuickFixCommand)[] | vscode.TerminalQuickFixOpener | vscode.TerminalQuickFixCommand | undefined> {
 		const token = new CancellationTokenSource().token;
 		if (token.isCancellationRequested) {
 			return;
@@ -688,7 +688,12 @@ export abstract class BaseExtHostTerminalService extends Disposable implements I
 		if (!provider) {
 			return;
 		}
-		return provider.provideTerminalQuickFixes(matchResult, token);
+		const quickFixes = await provider.provideTerminalQuickFixes(matchResult, token);
+		if (quickFixes === null) {
+			return undefined;
+		} else {
+			return quickFixes;
+		}
 	}
 
 	public async $createContributedProfileTerminal(id: string, options: ICreateContributedTerminalProfileOptions): Promise<void> {
@@ -861,7 +866,7 @@ export abstract class BaseExtHostTerminalService extends Disposable implements I
 	}
 }
 
-export class EnvironmentVariableCollection implements vscode.EnvironmentVariableCollection {
+class EnvironmentVariableCollection implements vscode.EnvironmentVariableCollection {
 	readonly map: Map<string, vscode.EnvironmentVariableMutator> = new Map();
 	private _persistent: boolean = true;
 
diff --git a/src/vs/workbench/api/common/extHostTesting.ts b/src/vs/workbench/api/common/extHostTesting.ts
index 2e23c169b87e8a..96fdc162f522f7 100644
--- a/src/vs/workbench/api/common/extHostTesting.ts
+++ b/src/vs/workbench/api/common/extHostTesting.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { mapFind } from 'vs/base/common/arrays';
+import { RunOnceScheduler } from 'vs/base/common/async';
 import { VSBuffer } from 'vs/base/common/buffer';
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 import { Emitter, Event } from 'vs/base/common/event';
@@ -300,7 +301,7 @@ export class ExtHostTesting implements ExtHostTestingShape {
 		} catch (e) {
 			return { error: String(e) };
 		} finally {
-			if (tracker.isRunning && !token.isCancellationRequested) {
+			if (tracker.hasRunningTasks && !token.isCancellationRequested) {
 				await Event.toPromise(tracker.onEnd);
 			}
 
@@ -320,12 +321,24 @@ export class ExtHostTesting implements ExtHostTestingShape {
 	}
 }
 
+// Deadline after being requested by a user that a test run is forcibly cancelled.
+const RUN_CANCEL_DEADLINE = 10_000;
+
+const enum TestRunTrackerState {
+	// Default state
+	Running,
+	// Cancellation is requested, but the run is still going.
+	Cancelling,
+	// All tasks have ended
+	Ended,
+}
+
 class TestRunTracker extends Disposable {
+	private state = TestRunTrackerState.Running;
 	private readonly tasks = new Map</* task ID */string, { run: vscode.TestRun; coverage: TestRunCoverageBearer }>();
 	private readonly sharedTestIds = new Set<string>();
 	private readonly cts: CancellationTokenSource;
 	private readonly endEmitter = this._register(new Emitter<void>());
-	private disposed = false;
 
 	/**
 	 * Fires when a test ends, and no more tests are left running.
@@ -335,7 +348,7 @@ class TestRunTracker extends Disposable {
 	/**
 	 * Gets whether there are any tests running.
 	 */
-	public get isRunning() {
+	public get hasRunningTasks() {
 		return this.tasks.size > 0;
 	}
 
@@ -349,18 +362,28 @@ class TestRunTracker extends Disposable {
 	constructor(private readonly dto: TestRunDto, private readonly proxy: MainThreadTestingShape, parentToken?: CancellationToken) {
 		super();
 		this.cts = this._register(new CancellationTokenSource(parentToken));
-		this._register(this.cts.token.onCancellationRequested(() => {
-			for (const { run } of this.tasks.values()) {
-				run.end();
-			}
-		}));
+
+		const forciblyEnd = this._register(new RunOnceScheduler(() => this.forciblyEndTasks(), RUN_CANCEL_DEADLINE));
+		this._register(this.cts.token.onCancellationRequested(() => forciblyEnd.schedule()));
+	}
+
+	/** Requests cancellation of the run. On the second call, forces cancellation. */
+	public cancel() {
+		if (this.state === TestRunTrackerState.Running) {
+			this.cts.cancel();
+			this.state = TestRunTrackerState.Cancelling;
+		} else if (this.state === TestRunTrackerState.Cancelling) {
+			this.forciblyEndTasks();
+		}
 	}
 
+	/** Gets coverage for a task ID. */
 	public getCoverage(taskId: string) {
 		return this.tasks.get(taskId)?.coverage;
 	}
 
-	public createRun(name: string | undefined) {
+	/** Creates the public test run interface to give to extensions. */
+	public createRun(name: string | undefined): vscode.TestRun {
 		const runId = this.dto.id;
 		const ctrlId = this.dto.controllerId;
 		const taskId = generateUuid();
@@ -458,8 +481,8 @@ class TestRunTracker extends Disposable {
 				ended = true;
 				this.proxy.$finishedTestRunTask(runId, taskId);
 				this.tasks.delete(taskId);
-				if (!this.isRunning) {
-					this.dispose();
+				if (!this.tasks.size) {
+					this.markEnded();
 				}
 			}
 		};
@@ -470,15 +493,18 @@ class TestRunTracker extends Disposable {
 		return run;
 	}
 
-	public override dispose() {
-		if (!this.disposed) {
-			this.disposed = true;
-			this.endEmitter.fire();
-			this.cts.cancel();
-			super.dispose();
+	private forciblyEndTasks() {
+		for (const { run } of this.tasks.values()) {
+			run.end();
 		}
 	}
 
+	private markEnded() {
+		if (this.state !== TestRunTrackerState.Ended) {
+			this.state = TestRunTrackerState.Ended;
+			this.endEmitter.fire();
+		}
+	}
 
 	private ensureTestIsKnown(test: vscode.TestItem) {
 		if (!(test instanceof TestItemImpl)) {
@@ -539,7 +565,7 @@ export class TestRunCoordinator {
 	public cancelRunById(runId: string) {
 		for (const tracker of this.tracked.values()) {
 			if (tracker.id === runId) {
-				tracker.dispose();
+				tracker.cancel();
 				return;
 			}
 		}
@@ -550,7 +576,7 @@ export class TestRunCoordinator {
 	 */
 	public cancelAllRuns() {
 		for (const tracker of this.tracked.values()) {
-			tracker.dispose();
+			tracker.cancel();
 		}
 	}
 
@@ -578,7 +604,11 @@ export class TestRunCoordinator {
 		});
 
 		const tracker = this.getTracker(request, dto);
-		tracker.onEnd(() => this.proxy.$finishedExtensionTestRun(dto.id));
+		tracker.onEnd(() => {
+			this.proxy.$finishedExtensionTestRun(dto.id);
+			tracker.dispose();
+		});
+
 		return tracker.createRun(name);
 	}
 
diff --git a/src/vs/workbench/api/common/extHostTextEditor.ts b/src/vs/workbench/api/common/extHostTextEditor.ts
index 316e0fe076acce..6486d953fb2102 100644
--- a/src/vs/workbench/api/common/extHostTextEditor.ts
+++ b/src/vs/workbench/api/common/extHostTextEditor.ts
@@ -50,7 +50,7 @@ export interface IEditData {
 	undoStopAfter: boolean;
 }
 
-export class TextEditorEdit {
+class TextEditorEdit {
 
 	private readonly _document: vscode.TextDocument;
 	private readonly _documentVersionId: number;
diff --git a/src/vs/workbench/api/common/extHostTimeline.ts b/src/vs/workbench/api/common/extHostTimeline.ts
index c9d9e611649718..f769766f5e4839 100644
--- a/src/vs/workbench/api/common/extHostTimeline.ts
+++ b/src/vs/workbench/api/common/extHostTimeline.ts
@@ -29,7 +29,7 @@ export class ExtHostTimeline implements IExtHostTimeline {
 
 	private _proxy: MainThreadTimelineShape;
 
-	private _providers = new Map<string, TimelineProvider>();
+	private _providers = new Map<string, { provider: TimelineProvider; extension: ExtensionIdentifier }>();
 
 	private _itemsBySourceAndUriMap = new Map<string, Map<string | undefined, Map<string, vscode.TimelineItem>>>();
 
@@ -40,23 +40,26 @@ export class ExtHostTimeline implements IExtHostTimeline {
 		this._proxy = mainContext.getProxy(MainContext.MainThreadTimeline);
 
 		commands.registerArgumentProcessor({
-			processArgument: arg => {
+			processArgument: (arg, extension) => {
 				if (arg && arg.$mid === MarshalledId.TimelineActionContext) {
-					const uri = arg.uri === undefined ? undefined : URI.revive(arg.uri);
-					return this._itemsBySourceAndUriMap.get(arg.source)?.get(getUriKey(uri))?.get(arg.handle);
+					if (this._providers.get(arg.source) && ExtensionIdentifier.equals(extension, this._providers.get(arg.source)?.extension)) {
+						const uri = arg.uri === undefined ? undefined : URI.revive(arg.uri);
+						return this._itemsBySourceAndUriMap.get(arg.source)?.get(getUriKey(uri))?.get(arg.handle);
+					} else {
+						return undefined;
+					}
 				}
-
 				return arg;
 			}
 		});
 	}
 
 	async $getTimeline(id: string, uri: UriComponents, options: vscode.TimelineOptions, token: vscode.CancellationToken): Promise<Timeline | undefined> {
-		const provider = this._providers.get(id);
-		return provider?.provideTimeline(URI.revive(uri), options, token);
+		const item = this._providers.get(id);
+		return item?.provider.provideTimeline(URI.revive(uri), options, token);
 	}
 
-	registerTimelineProvider(scheme: string | string[], provider: vscode.TimelineProvider, _extensionId: ExtensionIdentifier, commandConverter: CommandsConverter): IDisposable {
+	registerTimelineProvider(scheme: string | string[], provider: vscode.TimelineProvider, extensionId: ExtensionIdentifier, commandConverter: CommandsConverter): IDisposable {
 		const timelineDisposables = new DisposableStore();
 
 		const convertTimelineItem = this.convertTimelineItem(provider.id, commandConverter, timelineDisposables).bind(this);
@@ -102,7 +105,7 @@ export class ExtHostTimeline implements IExtHostTimeline {
 				disposable?.dispose();
 				timelineDisposables.dispose();
 			}
-		});
+		}, extensionId);
 	}
 
 	private convertTimelineItem(source: string, commandConverter: CommandsConverter, disposables: DisposableStore) {
@@ -178,7 +181,7 @@ export class ExtHostTimeline implements IExtHostTimeline {
 		};
 	}
 
-	private registerTimelineProviderCore(provider: TimelineProvider): IDisposable {
+	private registerTimelineProviderCore(provider: TimelineProvider, extension: ExtensionIdentifier): IDisposable {
 		// console.log(`ExtHostTimeline#registerTimelineProvider: id=${provider.id}`);
 
 		const existing = this._providers.get(provider.id);
@@ -191,7 +194,7 @@ export class ExtHostTimeline implements IExtHostTimeline {
 			label: provider.label,
 			scheme: provider.scheme
 		});
-		this._providers.set(provider.id, provider);
+		this._providers.set(provider.id, { provider, extension });
 
 		return toDisposable(() => {
 			for (const sourceMap of this._itemsBySourceAndUriMap.values()) {
diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts
index f0458313274312..a2786f18059dd3 100644
--- a/src/vs/workbench/api/common/extHostTypes.ts
+++ b/src/vs/workbench/api/common/extHostTypes.ts
@@ -17,7 +17,7 @@ import { IExtensionDescription } from 'vs/platform/extensions/common/extensions'
 import { FileSystemProviderErrorCode, markAsFileSystemProviderError } from 'vs/platform/files/common/files';
 import { RemoteAuthorityResolverErrorCode } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import { IRelativePatternDto } from 'vs/workbench/api/common/extHost.protocol';
-import { CellEditType, ICellPartialMetadataEdit, IDocumentMetadataEdit, isTextStreamMime } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { CellEditType, CellUri, ICellPartialMetadataEdit, IDocumentMetadataEdit, isTextStreamMime } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { checkProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
 import type * as vscode from 'vscode';
 
@@ -46,13 +46,13 @@ function es5ClassCompat(target: Function): any {
 }
 
 export enum TerminalOutputAnchor {
-	top = 'top',
-	bottom = 'bottom'
+	Top = 0,
+	Bottom = 1
 }
 
 export enum TerminalQuickFixType {
-	command = 'command',
-	opener = 'opener'
+	Command = 0,
+	Opener = 1
 }
 
 @es5ClassCompat
@@ -492,7 +492,7 @@ export class ResolvedAuthority {
 			throw illegalArgument('port');
 		}
 		if (typeof connectionToken !== 'undefined') {
-			if (typeof connectionToken !== 'string' || connectionToken.length === 0 || !/^[0-9A-Za-z\-]+$/.test(connectionToken)) {
+			if (typeof connectionToken !== 'string' || connectionToken.length === 0 || !/^[0-9A-Za-z_\-]+$/.test(connectionToken)) {
 				throw illegalArgument('connectionToken');
 			}
 		}
@@ -862,6 +862,10 @@ export class WorkspaceEdit implements vscode.WorkspaceEdit {
 					edit = editOrTuple;
 				}
 				if (NotebookEdit.isNotebookCellEdit(edit)) {
+					if (uri.scheme === CellUri.scheme) {
+						throw new Error('set must be called with a notebook document URI, not a cell URI.');
+					}
+
 					if (edit.newCellMetadata) {
 						this.replaceNotebookCellMetadata(uri, edit.range.start, edit.newCellMetadata, metadata);
 					} else if (edit.newNotebookMetadata) {
@@ -1926,6 +1930,20 @@ export class TerminalLink implements vscode.TerminalLink {
 	}
 }
 
+export class TerminalQuickFixOpener {
+	uri: vscode.Uri;
+	constructor(uri: vscode.Uri) {
+		this.uri = uri;
+	}
+}
+
+export class TerminalQuickFixCommand {
+	terminalCommand: string;
+	constructor(terminalCommand: string) {
+		this.terminalCommand = terminalCommand;
+	}
+}
+
 export enum TerminalLocation {
 	Panel = 1,
 	Editor = 2,
diff --git a/src/vs/workbench/api/node/extHostTunnelService.ts b/src/vs/workbench/api/node/extHostTunnelService.ts
index 2df2828d9ad73d..97fc03a5ff794a 100644
--- a/src/vs/workbench/api/node/extHostTunnelService.ts
+++ b/src/vs/workbench/api/node/extHostTunnelService.ts
@@ -424,7 +424,7 @@ export class ExtHostTunnelService extends Disposable implements IExtHostTunnelSe
 			}));
 			this._foundRootPorts = tryFindRootPorts(unFoundConnections, rootProcesses, this._foundRootPorts);
 			heuristicPorts = Array.from(this._foundRootPorts.values());
-			this.logService.trace(`ForwardedPorts: (ExtHostTunnelService) heuristic ports ${heuristicPorts.join(', ')}`);
+			this.logService.trace(`ForwardedPorts: (ExtHostTunnelService) heuristic ports ${heuristicPorts.map(heuristicPort => heuristicPort.port).join(', ')}`);
 
 		}
 		return foundPorts.then(foundCandidates => {
diff --git a/src/vs/workbench/api/node/extensionHostProcess.ts b/src/vs/workbench/api/node/extensionHostProcess.ts
index 072897555558e1..f69d06dfce90e8 100644
--- a/src/vs/workbench/api/node/extensionHostProcess.ts
+++ b/src/vs/workbench/api/node/extensionHostProcess.ts
@@ -192,7 +192,7 @@ function _createExtHostProtocol(): Promise<IMessagePassingProtocol> {
 						protocol.sendResume();
 					} else {
 						clearTimeout(timer);
-						protocol = new PersistentProtocol(socket, initialDataChunk);
+						protocol = new PersistentProtocol({ socket, initialChunk: initialDataChunk });
 						protocol.sendResume();
 						protocol.onDidDispose(() => onTerminate('renderer disconnected'));
 						resolve(protocol);
@@ -229,7 +229,7 @@ function _createExtHostProtocol(): Promise<IMessagePassingProtocol> {
 
 			const socket = net.createConnection(pipeName, () => {
 				socket.removeListener('error', reject);
-				const protocol = new PersistentProtocol(new NodeSocket(socket, 'extHost-renderer'));
+				const protocol = new PersistentProtocol({ socket: new NodeSocket(socket, 'extHost-renderer') });
 				protocol.sendResume();
 				resolve(protocol);
 			});
diff --git a/src/vs/workbench/api/test/browser/extHostApiCommands.test.ts b/src/vs/workbench/api/test/browser/extHostApiCommands.test.ts
index b9cdbe930fc346..7b53ba19b7ef34 100644
--- a/src/vs/workbench/api/test/browser/extHostApiCommands.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostApiCommands.test.ts
@@ -722,6 +722,25 @@ suite('ExtHostLanguageFeatureCommands', function () {
 
 	// --- suggest
 
+	test('triggerCharacter is null when completion provider is called programmatically #159914', async function () {
+
+		let actualContext: vscode.CompletionContext | undefined;
+
+		disposables.push(extHost.registerCompletionItemProvider(nullExtensionDescription, defaultSelector, <vscode.CompletionItemProvider>{
+			provideCompletionItems(_doc, _pos, _tok, context): any {
+				actualContext = context;
+				return [];
+			}
+		}, []));
+
+		await rpcProtocol.sync();
+
+		await commands.executeCommand<vscode.CompletionList>('vscode.executeCompletionItemProvider', model.uri, new types.Position(0, 4));
+
+		assert.ok(actualContext);
+		assert.deepStrictEqual(actualContext, { triggerKind: types.CompletionTriggerKind.Invoke, triggerCharacter: undefined });
+	});
+
 	test('Suggest, back and forth', function () {
 		disposables.push(extHost.registerCompletionItemProvider(nullExtensionDescription, defaultSelector, <vscode.CompletionItemProvider>{
 			provideCompletionItems(): any {
diff --git a/src/vs/workbench/api/test/browser/extHostDiagnostics.test.ts b/src/vs/workbench/api/test/browser/extHostDiagnostics.test.ts
index ac429a5255ab11..da1f8de024051e 100644
--- a/src/vs/workbench/api/test/browser/extHostDiagnostics.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostDiagnostics.test.ts
@@ -505,7 +505,7 @@ suite('ExtHostDiagnostics', () => {
 				startColumn: 1,
 				endLineNumber: 1,
 				endColumn: 1,
-				severity: 3
+				severity: MarkerSeverity.Info
 			}];
 
 			const p1 = Event.toPromise(diags.onDidChangeDiagnostics);
diff --git a/src/vs/workbench/api/test/browser/extHostTelemetry.test.ts b/src/vs/workbench/api/test/browser/extHostTelemetry.test.ts
index 0fd8f9f75d5394..202d9441f4e9f4 100644
--- a/src/vs/workbench/api/test/browser/extHostTelemetry.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostTelemetry.test.ts
@@ -79,10 +79,9 @@ suite('ExtHostTelemetry', function () {
 			logEvent: (eventName: string, data) => {
 				functionSpy.dataArr.push({ eventName, data });
 			},
-			logException: (exception, data) => {
+			logError: (exception, data) => {
 				functionSpy.exceptionArr.push({ exception, data });
 			},
-			ignoreBuiltInCommonProperties: false,
 			flush: () => {
 				functionSpy.flushCalled = true;
 			}
diff --git a/src/vs/workbench/api/test/browser/extHostTesting.test.ts b/src/vs/workbench/api/test/browser/extHostTesting.test.ts
index 68905a8f34d57a..a5ec96b4f7a1a3 100644
--- a/src/vs/workbench/api/test/browser/extHostTesting.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostTesting.test.ts
@@ -4,21 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
+import * as sinon from 'sinon';
 import { VSBuffer } from 'vs/base/common/buffer';
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
 import { Iterable } from 'vs/base/common/iterator';
 import { URI } from 'vs/base/common/uri';
 import { mockObject, MockObject } from 'vs/base/test/common/mock';
+import * as editorRange from 'vs/editor/common/core/range';
 import { MainThreadTestingShape } from 'vs/workbench/api/common/extHost.protocol';
+import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
 import { TestRunCoordinator, TestRunDto, TestRunProfileImpl } from 'vs/workbench/api/common/extHostTesting';
 import { ExtHostTestItemCollection, TestItemImpl } from 'vs/workbench/api/common/extHostTestItem';
 import * as convert from 'vs/workbench/api/common/extHostTypeConverters';
 import { Location, Position, Range, TestMessage, TestResultState, TestRunProfileKind, TestRunRequest as TestRunRequestImpl, TestTag } from 'vs/workbench/api/common/extHostTypes';
-import { TestDiffOpType, TestItemExpandState, TestMessageType, TestsDiff } from 'vs/workbench/contrib/testing/common/testTypes';
 import { TestId } from 'vs/workbench/contrib/testing/common/testId';
+import { TestDiffOpType, TestItemExpandState, TestMessageType, TestsDiff } from 'vs/workbench/contrib/testing/common/testTypes';
 import type { TestItem, TestRunRequest } from 'vscode';
-import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
-import * as editorRange from 'vs/editor/common/core/range';
 
 const simplify = (item: TestItem) => ({
 	id: item.id,
@@ -620,12 +621,12 @@ suite('ExtHost Testing', () => {
 
 		test('tracks a run started from a main thread request', () => {
 			const tracker = c.prepareForMainThreadTestRun(req, dto, cts.token);
-			assert.strictEqual(tracker.isRunning, false);
+			assert.strictEqual(tracker.hasRunningTasks, false);
 
 			const task1 = c.createTestRun('ctrl', single, req, 'run1', true);
 			const task2 = c.createTestRun('ctrl', single, req, 'run2', true);
 			assert.strictEqual(proxy.$startedExtensionTestRun.called, false);
-			assert.strictEqual(tracker.isRunning, true);
+			assert.strictEqual(tracker.hasRunningTasks, true);
 
 			task1.appendOutput('hello');
 			const taskId = proxy.$appendOutputToRun.args[0]?.[1];
@@ -633,19 +634,65 @@ suite('ExtHost Testing', () => {
 			task1.end();
 
 			assert.strictEqual(proxy.$finishedExtensionTestRun.called, false);
-			assert.strictEqual(tracker.isRunning, true);
+			assert.strictEqual(tracker.hasRunningTasks, true);
 
 			task2.end();
 
 			assert.strictEqual(proxy.$finishedExtensionTestRun.called, false);
-			assert.strictEqual(tracker.isRunning, false);
+			assert.strictEqual(tracker.hasRunningTasks, false);
+		});
+
+		test('run cancel force ends after a timeout', () => {
+			const clock = sinon.useFakeTimers();
+			try {
+				const tracker = c.prepareForMainThreadTestRun(req, dto, cts.token);
+				const task = c.createTestRun('ctrl', single, req, 'run1', true);
+				const onEnded = sinon.stub();
+				tracker.onEnd(onEnded);
+
+				assert.strictEqual(task.token.isCancellationRequested, false);
+				assert.strictEqual(tracker.hasRunningTasks, true);
+				tracker.cancel();
+
+				assert.strictEqual(task.token.isCancellationRequested, true);
+				assert.strictEqual(tracker.hasRunningTasks, true);
+
+				clock.tick(9999);
+				assert.strictEqual(tracker.hasRunningTasks, true);
+				assert.strictEqual(onEnded.called, false);
+
+				clock.tick(1);
+				assert.strictEqual(onEnded.called, true);
+				assert.strictEqual(tracker.hasRunningTasks, false);
+			} finally {
+				clock.restore();
+			}
+		});
+
+		test('run cancel force ends on second cancellation request', () => {
+			const tracker = c.prepareForMainThreadTestRun(req, dto, cts.token);
+			const task = c.createTestRun('ctrl', single, req, 'run1', true);
+			const onEnded = sinon.stub();
+			tracker.onEnd(onEnded);
+
+			assert.strictEqual(task.token.isCancellationRequested, false);
+			assert.strictEqual(tracker.hasRunningTasks, true);
+			tracker.cancel();
+
+			assert.strictEqual(task.token.isCancellationRequested, true);
+			assert.strictEqual(tracker.hasRunningTasks, true);
+			assert.strictEqual(onEnded.called, false);
+			tracker.cancel();
+
+			assert.strictEqual(tracker.hasRunningTasks, false);
+			assert.strictEqual(onEnded.called, true);
 		});
 
 		test('tracks a run started from an extension request', () => {
 			const task1 = c.createTestRun('ctrl', single, req, 'hello world', false);
 
 			const tracker = Iterable.first(c.trackers)!;
-			assert.strictEqual(tracker.isRunning, true);
+			assert.strictEqual(tracker.hasRunningTasks, true);
 			assert.deepStrictEqual(proxy.$startedExtensionTestRun.args, [
 				[{
 					profile: { group: 2, id: 42 },
@@ -662,11 +709,11 @@ suite('ExtHost Testing', () => {
 
 			task1.end();
 			assert.strictEqual(proxy.$finishedExtensionTestRun.called, false);
-			assert.strictEqual(tracker.isRunning, true);
+			assert.strictEqual(tracker.hasRunningTasks, true);
 
 			task2.end();
 			assert.deepStrictEqual(proxy.$finishedExtensionTestRun.args, [[tracker.id]]);
-			assert.strictEqual(tracker.isRunning, false);
+			assert.strictEqual(tracker.hasRunningTasks, false);
 
 			task3Detached.end();
 		});
diff --git a/src/vs/workbench/api/test/browser/extHostTextEditor.test.ts b/src/vs/workbench/api/test/browser/extHostTextEditor.test.ts
index 0793a57fff6fa5..50aed9236a7073 100644
--- a/src/vs/workbench/api/test/browser/extHostTextEditor.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostTextEditor.test.ts
@@ -21,7 +21,7 @@ suite('ExtHostTextEditor', () => {
 	], '\n', 1, 'text', false);
 
 	setup(() => {
-		editor = new ExtHostTextEditor('fake', null!, new NullLogService(), new Lazy(() => doc.document), [], { cursorStyle: 0, insertSpaces: true, lineNumbers: 1, tabSize: 4, indentSize: 4 }, [], 1);
+		editor = new ExtHostTextEditor('fake', null!, new NullLogService(), new Lazy(() => doc.document), [], { cursorStyle: TextEditorCursorStyle.Line, insertSpaces: true, lineNumbers: 1, tabSize: 4, indentSize: 4 }, [], 1);
 	});
 
 	test('disposed editor', () => {
@@ -48,7 +48,7 @@ suite('ExtHostTextEditor', () => {
 					applyCount += 1;
 					return Promise.resolve(true);
 				}
-			}, new NullLogService(), new Lazy(() => doc.document), [], { cursorStyle: 0, insertSpaces: true, lineNumbers: 1, tabSize: 4, indentSize: 4 }, [], 1);
+			}, new NullLogService(), new Lazy(() => doc.document), [], { cursorStyle: TextEditorCursorStyle.Line, insertSpaces: true, lineNumbers: 1, tabSize: 4, indentSize: 4 }, [], 1);
 
 		await editor.value.edit(edit => { });
 		assert.strictEqual(applyCount, 0);
diff --git a/src/vs/workbench/api/test/browser/extHostTypes.test.ts b/src/vs/workbench/api/test/browser/extHostTypes.test.ts
index 5bf6668b649979..4bca6a1c4c435b 100644
--- a/src/vs/workbench/api/test/browser/extHostTypes.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostTypes.test.ts
@@ -4,13 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import * as types from 'vs/workbench/api/common/extHostTypes';
+import { CancellationError } from 'vs/base/common/errors';
+import { MarshalledId } from 'vs/base/common/marshallingIds';
+import { Mimes } from 'vs/base/common/mime';
 import { isWindows } from 'vs/base/common/platform';
 import { assertType } from 'vs/base/common/types';
-import { Mimes } from 'vs/base/common/mime';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { CancellationError } from 'vs/base/common/errors';
+import { URI } from 'vs/base/common/uri';
+import * as types from 'vs/workbench/api/common/extHostTypes';
+import { CellUri } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 
 function assertToJSON(a: any, expected: any) {
 	const raw = JSON.stringify(a);
@@ -432,6 +433,23 @@ suite('ExtHostTypes', function () {
 		assert.strictEqual(second.edit.newText, 'Foo');
 	});
 
+	test('WorkspaceEdit - NotebookEdits', () => {
+		const edit = new types.WorkspaceEdit();
+		const notebookEdit = types.NotebookEdit.insertCells(0, [new types.NotebookCellData(types.NotebookCellKind.Code, '// hello', 'javascript')]) as types.NotebookEdit;
+		const notebookUri = URI.parse('/foo/notebook.ipynb');
+		edit.set(notebookUri, [notebookEdit]);
+
+		const cellUri = CellUri.generate(notebookUri, 123);
+		try {
+			edit.set(cellUri, [notebookEdit]);
+		} catch (err) {
+			assert.ok(err.message.includes('set must be called with a notebook document URI'), err.toString());
+			return;
+		}
+
+		throw new Error('Expected set to throw with cell URI');
+	});
+
 	test('DocumentLink', () => {
 		assert.throws(() => new types.DocumentLink(null!, null!));
 		assert.throws(() => new types.DocumentLink(new types.Range(1, 1, 1, 1), null!));
diff --git a/src/vs/workbench/api/test/common/extHostExtensionActivator.test.ts b/src/vs/workbench/api/test/common/extHostExtensionActivator.test.ts
index ddaaa76bb35707..c52219d7771dba 100644
--- a/src/vs/workbench/api/test/common/extHostExtensionActivator.test.ts
+++ b/src/vs/workbench/api/test/common/extHostExtensionActivator.test.ts
@@ -6,7 +6,7 @@
 import * as assert from 'assert';
 import { timeout } from 'vs/base/common/async';
 import { URI } from 'vs/base/common/uri';
-import { ExtensionIdentifier, IExtensionDescription, TargetPlatform } from 'vs/platform/extensions/common/extensions';
+import { ExtensionIdentifier, IExtensionDescription, IRelaxedExtensionDescription, TargetPlatform } from 'vs/platform/extensions/common/extensions';
 import { NullLogService } from 'vs/platform/log/common/log';
 import { ActivatedExtension, EmptyExtension, ExtensionActivationTimes, ExtensionsActivator, IExtensionsActivatorHost } from 'vs/workbench/api/common/extHostExtensionActivator';
 import { ExtensionDescriptionRegistry } from 'vs/workbench/services/extensions/common/extensionDescriptionRegistry';
@@ -81,9 +81,12 @@ suite('ExtensionsActivator', () => {
 
 	test('Supports having resolved extensions', async () => {
 		const host = new SimpleExtensionsActivatorHost();
+		const bExt = desc(idB);
+		delete (<IRelaxedExtensionDescription>bExt).main;
+		delete (<IRelaxedExtensionDescription>bExt).browser;
 		const activator = createActivator(host, [
 			desc(idA, [idB])
-		], [idB]);
+		], [bExt]);
 
 		await activator.activateByEvent('*', false);
 		assert.deepStrictEqual(host.activateCalls, [idA]);
@@ -96,9 +99,11 @@ suite('ExtensionsActivator', () => {
 			[idA, extActivationA],
 			[idB, extActivationB]
 		]);
+		const bExt = desc(idB);
+		(<IRelaxedExtensionDescription>bExt).api = 'none';
 		const activator = createActivator(host, [
 			desc(idA, [idB])
-		], [], [idB]);
+		], [bExt]);
 
 		const activate = activator.activateByEvent('*', false);
 
@@ -243,9 +248,10 @@ suite('ExtensionsActivator', () => {
 		}
 	}
 
-	function createActivator(host: IExtensionsActivatorHost, extensionDescriptions: IExtensionDescription[], resolvedExtensions: ExtensionIdentifier[] = [], hostExtensions: ExtensionIdentifier[] = []): ExtensionsActivator {
+	function createActivator(host: IExtensionsActivatorHost, extensionDescriptions: IExtensionDescription[], otherHostExtensionDescriptions: IExtensionDescription[] = []): ExtensionsActivator {
 		const registry = new ExtensionDescriptionRegistry(extensionDescriptions);
-		return new ExtensionsActivator(registry, resolvedExtensions, hostExtensions, host, new NullLogService());
+		const globalRegistry = new ExtensionDescriptionRegistry(extensionDescriptions.concat(otherHostExtensionDescriptions));
+		return new ExtensionsActivator(registry, globalRegistry, host, new NullLogService());
 	}
 
 	function desc(id: ExtensionIdentifier, deps: ExtensionIdentifier[] = [], activationEvents: string[] = ['*']): IExtensionDescription {
diff --git a/src/vs/workbench/browser/actions/developerActions.ts b/src/vs/workbench/browser/actions/developerActions.ts
index 9de0788c23f465..4f1fea387b625e 100644
--- a/src/vs/workbench/browser/actions/developerActions.ts
+++ b/src/vs/workbench/browser/actions/developerActions.ts
@@ -10,13 +10,13 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { DomEmitter } from 'vs/base/browser/event';
 import { Color } from 'vs/base/common/color';
 import { Event } from 'vs/base/common/event';
-import { IDisposable, toDisposable, dispose, Disposable, DisposableStore } from 'vs/base/common/lifecycle';
+import { IDisposable, toDisposable, dispose, DisposableStore } from 'vs/base/common/lifecycle';
 import { getDomNodePagePosition, createStyleSheet, createCSSRule, append, $ } from 'vs/base/browser/dom';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { Context } from 'vs/platform/contextkey/browser/contextKeyService';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { timeout } from 'vs/base/common/async';
+import { RunOnceScheduler } from 'vs/base/common/async';
 import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { registerAction2, Action2, MenuRegistry } from 'vs/platform/actions/common/actions';
@@ -141,10 +141,13 @@ class ToggleScreencastModeAction extends Action2 {
 			mouseMarker.style.top = `${e.clientY - mouseIndicatorSize / 2}px`;
 			mouseMarker.style.left = `${e.clientX - mouseIndicatorSize / 2}px`;
 			mouseMarker.style.display = 'block';
+			mouseMarker.style.transform = `scale(${1})`;
+			mouseMarker.style.transition = 'transform 0.1s';
 
 			const mouseMoveListener = onMouseMove.event(e => {
 				mouseMarker.style.top = `${e.clientY - mouseIndicatorSize / 2}px`;
 				mouseMarker.style.left = `${e.clientX - mouseIndicatorSize / 2}px`;
+				mouseMarker.style.transform = `scale(${.8})`;
 			});
 
 			Event.once(onMouseUp.event)(() => {
@@ -164,7 +167,7 @@ class ToggleScreencastModeAction extends Action2 {
 			keyboardMarker.style.bottom = `${clamp(configurationService.getValue<number>('screencastMode.verticalOffset') || 0, 0, 90)}%`;
 		};
 
-		let keyboardMarkerTimeout: number;
+		let keyboardMarkerTimeout!: number;
 		const updateKeyboardMarkerTimeout = () => {
 			keyboardMarkerTimeout = clamp(configurationService.getValue<number>('screencastMode.keyboardOverlayTimeout') || 800, 500, 5000);
 		};
@@ -196,11 +199,40 @@ class ToggleScreencastModeAction extends Action2 {
 		}));
 
 		const onKeyDown = disposables.add(new DomEmitter(window, 'keydown', true));
-		let keyboardTimeout: IDisposable = Disposable.None;
+		const onCompositionUpdate = disposables.add(new DomEmitter(window, 'compositionupdate', true));
+		const onCompositionEnd = disposables.add(new DomEmitter(window, 'compositionend', true));
+
 		let length = 0;
+		let composing: Element | undefined = undefined;
+
+		const clearKeyboardScheduler = new RunOnceScheduler(() => {
+			keyboardMarker.textContent = '';
+			composing = undefined;
+			length = 0;
+		}, keyboardMarkerTimeout);
+
+		disposables.add(onCompositionUpdate.event(e => {
+			if (e.data) {
+				composing = composing ?? append(keyboardMarker, $('span.key'));
+				composing.textContent = e.data;
+			}
+
+			clearKeyboardScheduler.schedule();
+		}));
+
+		disposables.add(onCompositionEnd.event(e => {
+			composing = undefined;
+		}));
 
 		disposables.add(onKeyDown.event(e => {
-			keyboardTimeout.dispose();
+			if (e.key === 'Process') {
+				if (!e.code.includes('Key')) {
+					composing = undefined;
+					clearKeyboardScheduler.cancel();
+				}
+
+				return;
+			}
 
 			const event = new StandardKeyboardEvent(e);
 			const shortcut = keybindingService.softDispatch(event, event.target);
@@ -230,9 +262,11 @@ class ToggleScreencastModeAction extends Action2 {
 					}
 
 					if (shortcut?.commandId) {
-						const fullKeyLabel = keybindingService.lookupKeybinding(shortcut.commandId);
-						if (fullKeyLabel) {
-							keyLabel = fullKeyLabel.getLabel();
+						const keybindings = keybindingService.lookupKeybindings(shortcut.commandId)
+							.filter(k => k.getLabel()?.endsWith(keyLabel ?? ''));
+
+						if (keybindings.length > 0) {
+							keyLabel = keybindings[keybindings.length - 1].getLabel();
 						}
 					}
 				}
@@ -248,13 +282,7 @@ class ToggleScreencastModeAction extends Action2 {
 				length++;
 			}
 
-			const promise = timeout(keyboardMarkerTimeout);
-			keyboardTimeout = toDisposable(() => promise.cancel());
-
-			promise.then(() => {
-				keyboardMarker.textContent = '';
-				length = 0;
-			});
+			clearKeyboardScheduler.schedule();
 		}));
 
 		ToggleScreencastModeAction.disposable = disposables;
@@ -356,7 +384,7 @@ configurationRegistry.registerConfiguration({
 		},
 		'screencastMode.onlyKeyboardShortcuts': {
 			type: 'boolean',
-			description: localize('screencastMode.onlyKeyboardShortcuts', "Only show keyboard shortcuts in screencast mode."),
+			description: localize('screencastMode.onlyKeyboardShortcuts', "Show only keyboard shortcuts in screencast mode (do not include action names)."),
 			default: false
 		},
 		'screencastMode.keyboardOverlayTimeout': {
diff --git a/src/vs/workbench/browser/actions/layoutActions.ts b/src/vs/workbench/browser/actions/layoutActions.ts
index 098d2447e02d38..b84893998c97b4 100644
--- a/src/vs/workbench/browser/actions/layoutActions.ts
+++ b/src/vs/workbench/browser/actions/layoutActions.ts
@@ -362,7 +362,7 @@ class ToggleSidebarVisibilityAction extends Action2 {
 			toggled: {
 				condition: SideBarVisibleContext,
 				title: localize('primary sidebar', "Primary Side Bar"),
-				mnemonicTitle: localize('primary sidebar mnemonic', "&&Primary Side Bar"),
+				mnemonicTitle: localize({ key: 'primary sidebar mnemonic', comment: ['&& denotes a mnemonic'] }, "&&Primary Side Bar"),
 			},
 			category: Categories.View,
 			f1: true,
@@ -521,7 +521,7 @@ registerAction2(class extends Action2 {
 			id: 'workbench.action.toggleZenMode',
 			title: {
 				value: localize('toggleZenMode', "Toggle Zen Mode"),
-				mnemonicTitle: localize('miToggleZenMode', "Zen Mode"),
+				mnemonicTitle: localize({ key: 'miToggleZenMode', comment: ['&& denotes a mnemonic'] }, "Zen Mode"),
 				original: 'Toggle Zen Mode'
 			},
 			category: Categories.View,
diff --git a/src/vs/workbench/browser/actions/quickAccessActions.ts b/src/vs/workbench/browser/actions/quickAccessActions.ts
index ba895c00fd64c9..002bdcbf9b071c 100644
--- a/src/vs/workbench/browser/actions/quickAccessActions.ts
+++ b/src/vs/workbench/browser/actions/quickAccessActions.ts
@@ -154,11 +154,7 @@ registerAction2(class QuickAccessAction extends Action2 {
 	constructor() {
 		super({
 			id: 'workbench.action.quickOpenWithModes',
-			title: {
-				value: localize('quickOpenWithModes', "Launch Command Center"),
-				original: 'Launch Command Center'
-			},
-			f1: true,
+			title: localize('quickOpenWithModes', "Command Center"),
 			menu: {
 				id: MenuId.CommandCenter,
 				order: 100
@@ -169,6 +165,7 @@ registerAction2(class QuickAccessAction extends Action2 {
 	run(accessor: ServicesAccessor): void {
 		const quickInputService = accessor.get(IQuickInputService);
 		quickInputService.quickAccess.show(undefined, {
+			preserveValue: true,
 			providerOptions: {
 				includeHelp: true,
 			} as AnythingQuickAccessProviderRunOptions
diff --git a/src/vs/workbench/browser/actions/textInputActions.ts b/src/vs/workbench/browser/actions/textInputActions.ts
index 60dad7953122c1..f8722e3d06d85d 100644
--- a/src/vs/workbench/browser/actions/textInputActions.ts
+++ b/src/vs/workbench/browser/actions/textInputActions.ts
@@ -94,7 +94,6 @@ export class TextInputActionsProvider extends Disposable implements IWorkbenchCo
 			getAnchor: () => e,
 			getActions: () => this.textInputActions,
 			getActionsContext: () => target,
-			onHide: () => target.focus() // fixes https://github.com/microsoft/vscode/issues/52948
 		});
 	}
 }
diff --git a/src/vs/workbench/browser/actions/windowActions.ts b/src/vs/workbench/browser/actions/windowActions.ts
index eaa2db307dde2e..03810af50ea3d2 100644
--- a/src/vs/workbench/browser/actions/windowActions.ts
+++ b/src/vs/workbench/browser/actions/windowActions.ts
@@ -14,7 +14,7 @@ import { Categories } from 'vs/platform/action/common/actionCommonCategories';
 import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { IQuickInputButton, IQuickInputService, IQuickPickSeparator, IKeyMods, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
 import { IWorkspaceContextService, IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { ILabelService } from 'vs/platform/label/common/label';
+import { ILabelService, Verbosity } from 'vs/platform/label/common/label';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IModelService } from 'vs/editor/common/services/model';
 import { ILanguageService } from 'vs/editor/common/languages/language';
@@ -196,7 +196,7 @@ abstract class BaseOpenRecentAction extends Action2 {
 			resource = recent.folderUri;
 			iconClasses = getIconClasses(modelService, languageService, resource, FileKind.FOLDER);
 			openable = { folderUri: resource };
-			fullLabel = recent.label || labelService.getWorkspaceLabel(resource, { verbose: true });
+			fullLabel = recent.label || labelService.getWorkspaceLabel(resource, { verbose: Verbosity.LONG });
 		}
 
 		// Workspace
@@ -204,7 +204,7 @@ abstract class BaseOpenRecentAction extends Action2 {
 			resource = recent.workspace.configPath;
 			iconClasses = getIconClasses(modelService, languageService, resource, FileKind.ROOT_FOLDER);
 			openable = { workspaceUri: resource };
-			fullLabel = recent.label || labelService.getWorkspaceLabel(recent.workspace, { verbose: true });
+			fullLabel = recent.label || labelService.getWorkspaceLabel(recent.workspace, { verbose: Verbosity.LONG });
 			isWorkspace = true;
 		}
 
diff --git a/src/vs/workbench/browser/actions/workspaceActions.ts b/src/vs/workbench/browser/actions/workspaceActions.ts
index e9394767147e57..1ce4d6a66ebb31 100644
--- a/src/vs/workbench/browser/actions/workspaceActions.ts
+++ b/src/vs/workbench/browser/actions/workspaceActions.ts
@@ -231,7 +231,7 @@ export class AddRootFolderAction extends Action2 {
 	}
 }
 
-class RemoveRootFolderAction extends Action2 {
+export class RemoveRootFolderAction extends Action2 {
 
 	static readonly ID = 'workbench.action.removeRootFolder';
 
diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
index df2c9e8ae41565..08e5497f4e7786 100644
--- a/src/vs/workbench/browser/layout.ts
+++ b/src/vs/workbench/browser/layout.ts
@@ -6,7 +6,7 @@
 import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { Event, Emitter } from 'vs/base/common/event';
 import { EventType, addDisposableListener, getClientArea, Dimension, position, size, IDimension, isAncestorUsingFlowTo, computeScreenAwareSize } from 'vs/base/browser/dom';
-import { onDidChangeFullscreen, isFullscreen, isWCOVisible } from 'vs/base/browser/browser';
+import { onDidChangeFullscreen, isFullscreen, isWCOEnabled } from 'vs/base/browser/browser';
 import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
 import { isWindows, isLinux, isMacintosh, isWeb, isNative, isIOS } from 'vs/base/common/platform';
 import { EditorInputCapabilities, GroupIdentifier, isResourceEditorInput, IUntypedEditorInput, pathsToEditors } from 'vs/workbench/common/editor';
@@ -31,7 +31,7 @@ import { IStatusbarService } from 'vs/workbench/services/statusbar/browser/statu
 import { IFileService } from 'vs/platform/files/common/files';
 import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
 import { coalesce } from 'vs/base/common/arrays';
-import { assertIsDefined, isNumber } from 'vs/base/common/types';
+import { assertIsDefined } from 'vs/base/common/types';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { WINDOW_ACTIVE_BORDER, WINDOW_INACTIVE_BORDER } from 'vs/workbench/common/theme';
@@ -171,7 +171,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		}
 		// If the command center is visible then the quickinput should go over the title bar and the banner
 		if (this.titleService.isCommandCenterVisible) {
-			quickPickTop = 0;
+			quickPickTop = 6;
 		}
 		return { top, quickPickTop };
 	}
@@ -683,23 +683,11 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			return {
 				layout: defaultLayout.layout?.editors,
 				filesToOpenOrCreate: defaultLayout?.editors?.map(editor => {
-					// TODO@bpasero remove me eventually
-					const editor2 = editor as any;
-					const legacySelection = editor2.selection && editor2.selection.start && isNumber(editor2.selection.start.line) ? {
-						startLineNumber: editor2.selection.start.line,
-						startColumn: isNumber(editor2.selection.start.column) ? editor2.selection.start.column : 1,
-						endLineNumber: isNumber(editor2.selection.end.line) ? editor2.selection.end.line : undefined,
-						endColumn: isNumber(editor2.selection.end.line) ? (isNumber(editor2.selection.end.column) ? editor2.selection.end.column : 1) : undefined,
-					} : undefined;
-
 					return {
 						viewColumn: editor.viewColumn,
 						fileUri: URI.revive(editor.uri),
 						openOnlyIfExists: editor.openOnlyIfExists,
-						options: {
-							selection: legacySelection,
-							...editor.options // keep at the end to override legacy selection/override that may be `undefined`
-						}
+						options: editor.options
 					};
 				})
 			};
@@ -1089,7 +1077,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		}
 
 		// if WCO is visible, we have to show the title bar
-		if (isWCOVisible()) {
+		if (isWCOEnabled() && !this.state.runtime.fullscreen) {
 			return true;
 		}
 
@@ -1110,7 +1098,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 	}
 
 	private shouldShowBannerFirst(): boolean {
-		return isWeb && !isWCOVisible();
+		return isWeb && !isWCOEnabled();
 	}
 
 	focus(): void {
diff --git a/src/vs/workbench/browser/media/style.css b/src/vs/workbench/browser/media/style.css
index 9eb68309dc3f71..19500496d7e4d5 100644
--- a/src/vs/workbench/browser/media/style.css
+++ b/src/vs/workbench/browser/media/style.css
@@ -3,6 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+/* Animations */
+
+@keyframes fadeIn { from { opacity: 0; } to { opacity: 1; } }
+
 /* Font Families (with CJK support) */
 
 .mac { font-family: -apple-system, BlinkMacSystemFont, sans-serif; }
@@ -45,18 +49,17 @@ body.web {
 	position: fixed; /* prevent bounce effect */
 }
 
-.monaco-workbench.web {
-	touch-action: none; /* Disable browser handling of all panning and zooming gestures. Removes 300ms touch delay. */
-}
-
-@keyframes fadeIn { from { opacity: 0; } to { opacity: 1; } }
-
 .monaco-workbench {
 	font-size: 13px;
 	line-height: 1.4em;
 	position: relative;
 	z-index: 1;
 	overflow: hidden;
+	color: var(--vscode-foreground);
+}
+
+.monaco-workbench.web {
+	touch-action: none; /* Disable browser handling of all panning and zooming gestures. Removes 300ms touch delay. */
 }
 
 .monaco-workbench.border:not(.fullscreen) {
@@ -106,9 +109,13 @@ body.web {
 	font-size: 100%;
 }
 
-.monaco-workbench select {
-	font-family: inherit;
-}
+.monaco-workbench input::placeholder { color: var(--vscode-input-placeholderForeground); }
+.monaco-workbench input::-webkit-input-placeholder  { color: var(--vscode-input-placeholderForeground); }
+.monaco-workbench input::-moz-placeholder { color: var(--vscode-input-placeholderForeground); }
+
+.monaco-workbench textarea::placeholder { color: var(--vscode-input-placeholderForeground); }
+.monaco-workbench textarea::-webkit-input-placeholder { color: var(--vscode-input-placeholderForeground); }
+.monaco-workbench textarea::-moz-placeholder { color: var(--vscode-input-placeholderForeground); }
 
 .monaco-workbench .pointer {
 	cursor: pointer;
@@ -135,6 +142,9 @@ body.web {
 	-webkit-app-region: no-drag;
 }
 
+.monaco-workbench .codicon {
+	color: var(--vscode-icon-foreground);
+}
 
 .monaco-workbench .codicon[class*='codicon-'] {
 	font-size: 16px; /* sets font-size for codicons in workbench (https://github.com/microsoft/vscode/issues/98495) */
@@ -147,6 +157,8 @@ body.web {
 /* Custom Dropdown (select) Arrows */
 
 .monaco-workbench select {
+	font-family: inherit;
+	appearance: none;
 	-webkit-appearance: none;
 	-moz-appearance: none;
 	/* Hides inner border from FF */
@@ -180,14 +192,22 @@ body.web {
 .monaco-workbench select:focus,
 .monaco-workbench input[type="button"]:focus,
 .monaco-workbench input[type="text"]:focus,
+.monaco-workbench button:focus,
 .monaco-workbench textarea:focus,
+.monaco-workbench input[type="search"]:focus,
 .monaco-workbench input[type="checkbox"]:focus {
 	outline-width: 1px;
 	outline-style: solid;
 	outline-offset: -1px;
+	outline-color: var(--vscode-focusBorder);
 	opacity: 1;
 }
 
+.monaco-workbench.hc-black .synthetic-focus input,
+.monaco-workbench.hc-light .synthetic-focus input {
+	background: transparent; /* Search input focus fix when in high contrast */
+}
+
 .monaco-workbench input[type="checkbox"]:focus {
 	outline-offset: 2px;
 }
@@ -217,6 +237,15 @@ body.web {
 	outline-width: 1px;
 	outline-style: solid;
 	outline-offset: -1px;
+	outline-color: var(--vscode-focusBorder);
+}
+
+.monaco-workbench .monaco-list .monaco-list-row .monaco-highlighted-label .highlight {
+	color: var(--vscode-list-highlightForeground);
+}
+
+.monaco-workbench .monaco-list .monaco-list-row.focused .monaco-highlighted-label .highlight {
+	color: var(--vscode-list-focusHighlightForeground);
 }
 
 .monaco-workbench .synthetic-focus :focus {
@@ -239,3 +268,18 @@ body.web {
 .monaco-workbench a.monaco-link:hover {
 	text-decoration: underline; /* render underline on hover for accessibility requirements */
 }
+
+.monaco-workbench .monaco-action-bar:not(.vertical) .action-label:not(.disabled):hover,
+.monaco-workbench .monaco-action-bar:not(.vertical) .monaco-dropdown-with-primary:not(.disabled):hover {
+	background-color: var(--vscode-toolbar-hoverBackground);
+}
+
+.monaco-workbench .monaco-action-bar:not(.vertical) .action-item.active .action-label:not(.disabled),
+.monaco-workbench .monaco-action-bar:not(.vertical) .monaco-dropdown.active .action-label:not(.disabled) {
+	background-color: var(--vscode-toolbar-activeBackground);
+}
+
+.monaco-workbench .monaco-action-bar:not(.vertical) .action-item .action-label:hover:not(.disabled) {
+	outline: 1px dashed var(--vscode-toolbar-hoverOutline);
+	outline-offset: -1px;
+}
diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
index dfaf754c33160a..b1197169f661c4 100644
--- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
+++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
@@ -1067,7 +1067,7 @@ export class ActivitybarPart extends Part implements IPaneCompositeSelectorPart
 	}
 
 	private get profilesVisibilityPreference(): boolean {
-		return this.userDataProfilesService.isEnabled() && this.storageService.getBoolean(ProfilesActivityActionViewItem.PROFILES_VISIBILITY_PREFERENCE_KEY, StorageScope.PROFILE, this.userDataProfilesService.profiles.length > 1);
+		return this.userDataProfilesService.isEnabled() && this.storageService.getBoolean(ProfilesActivityActionViewItem.PROFILES_VISIBILITY_PREFERENCE_KEY, StorageScope.PROFILE, true);
 	}
 
 	private set profilesVisibilityPreference(value: boolean) {
diff --git a/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts b/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts
index 7d07e6304cee18..0a855771b8ec87 100644
--- a/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts
+++ b/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts
@@ -33,7 +33,7 @@ export class ToggleAuxiliaryBarAction extends Action2 {
 			toggled: {
 				condition: AuxiliaryBarVisibleContext,
 				title: localize('secondary sidebar', "Secondary Side Bar"),
-				mnemonicTitle: localize('secondary sidebar mnemonic', "Secondary Si&&de Bar"),
+				mnemonicTitle: localize({ key: 'secondary sidebar mnemonic', comment: ['&& denotes a mnemonic'] }, "Secondary Si&&de Bar"),
 			},
 
 			category: Categories.View,
diff --git a/src/vs/workbench/browser/parts/auxiliarybar/media/auxiliaryBarPart.css b/src/vs/workbench/browser/parts/auxiliarybar/media/auxiliaryBarPart.css
index 74dbd62f7c0098..a125434f89762d 100644
--- a/src/vs/workbench/browser/parts/auxiliarybar/media/auxiliaryBarPart.css
+++ b/src/vs/workbench/browser/parts/auxiliarybar/media/auxiliaryBarPart.css
@@ -11,7 +11,7 @@
 .monaco-workbench .part.auxiliarybar > .content .monaco-editor,
 .monaco-workbench .part.auxiliarybar > .content .monaco-editor .margin,
 .monaco-workbench .part.auxiliarybar > .content .monaco-editor .monaco-editor-background {
-	background-color: var(--vscode-sideBar-background) !important;
+	background-color: var(--vscode-sideBar-background);
 }
 
 .monaco-workbench .part.auxiliarybar > .title > .panel-switcher-container > .monaco-action-bar .action-item:hover .action-label,
diff --git a/src/vs/workbench/browser/parts/editor/accessibilityStatus.ts b/src/vs/workbench/browser/parts/editor/accessibilityStatus.ts
new file mode 100644
index 00000000000000..de248517d494bd
--- /dev/null
+++ b/src/vs/workbench/browser/parts/editor/accessibilityStatus.ts
@@ -0,0 +1,100 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
+import { Event } from 'vs/base/common/event';
+import Severity from 'vs/base/common/severity';
+import { localize } from 'vs/nls';
+import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
+import { CommandsRegistry } from 'vs/platform/commands/common/commands';
+import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { INotificationHandle, INotificationService } from 'vs/platform/notification/common/notification';
+import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
+import { IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from 'vs/workbench/services/statusbar/browser/statusbar';
+import { themeColorFromId } from 'vs/platform/theme/common/themeService';
+import { STATUS_BAR_PROMINENT_ITEM_BACKGROUND, STATUS_BAR_PROMINENT_ITEM_FOREGROUND } from 'vs/workbench/common/theme';
+
+export class AccessibilityStatus extends Disposable implements IWorkbenchContribution {
+	private screenReaderNotification: INotificationHandle | null = null;
+	private promptedScreenReader: boolean = false;
+	private readonly screenReaderModeElement = this._register(new MutableDisposable<IStatusbarEntryAccessor>());
+
+	constructor(
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@INotificationService private readonly notificationService: INotificationService,
+		@IAccessibilityService private readonly _accessibilityService: IAccessibilityService,
+		@IStatusbarService private readonly statusbarService: IStatusbarService
+	) {
+		super();
+
+		this._register(this._accessibilityService.onDidChangeScreenReaderOptimized(() => this.onScreenReaderModeChange()));
+		this._register(configurationService.onDidChangeConfiguration(c => {
+			if (c.affectsConfiguration('editor.accessibilitySupport')) {
+				this.onScreenReaderModeChange();
+			}
+		}));
+		CommandsRegistry.registerCommand({ id: 'showEditorScreenReaderNotification', handler: () => this.showScreenReaderNotification() });
+	}
+
+	private showScreenReaderNotification(): void {
+		if (!this.screenReaderNotification) {
+			this.screenReaderNotification = this.notificationService.prompt(
+				Severity.Info,
+				localize('screenReaderDetectedExplanation.question', "Are you using a screen reader to operate VS Code?"),
+				[{
+					label: localize('screenReaderDetectedExplanation.answerYes', "Yes"),
+					run: () => {
+						this.configurationService.updateValue('editor.accessibilitySupport', 'on', ConfigurationTarget.USER);
+					}
+				}, {
+					label: localize('screenReaderDetectedExplanation.answerNo', "No"),
+					run: () => {
+						this.configurationService.updateValue('editor.accessibilitySupport', 'off', ConfigurationTarget.USER);
+					}
+				}],
+				{ sticky: true }
+			);
+
+			Event.once(this.screenReaderNotification.onDidClose)(() => this.screenReaderNotification = null);
+		}
+	}
+	private updateScreenReaderModeElement(visible: boolean): void {
+		if (visible) {
+			if (!this.screenReaderModeElement.value) {
+				const text = localize('screenReaderDetected', "Screen Reader Optimized");
+				this.screenReaderModeElement.value = this.statusbarService.addEntry({
+					name: localize('status.editor.screenReaderMode', "Screen Reader Mode"),
+					text,
+					ariaLabel: text,
+					command: 'showEditorScreenReaderNotification',
+					backgroundColor: themeColorFromId(STATUS_BAR_PROMINENT_ITEM_BACKGROUND),
+					color: themeColorFromId(STATUS_BAR_PROMINENT_ITEM_FOREGROUND)
+				}, 'status.editor.screenReaderMode', StatusbarAlignment.RIGHT, 100.6);
+			}
+		} else {
+			this.screenReaderModeElement.clear();
+		}
+	}
+
+	private onScreenReaderModeChange(): void {
+
+		// We only support text based editors
+		const screenReaderDetected = this._accessibilityService.isScreenReaderOptimized();
+		if (screenReaderDetected) {
+			const screenReaderConfiguration = this.configurationService.getValue('editor.accessibilitySupport');
+			if (screenReaderConfiguration === 'auto') {
+				if (!this.promptedScreenReader) {
+					this.promptedScreenReader = true;
+					setTimeout(() => this.showScreenReaderNotification(), 100);
+				}
+			}
+		}
+
+		if (this.screenReaderNotification) {
+			this.screenReaderNotification.close();
+		}
+		this.updateScreenReaderModeElement(this._accessibilityService.isScreenReaderOptimized());
+	}
+}
diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts
index 68c3d487a413e9..9ebfbf652aea82 100644
--- a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts
@@ -5,7 +5,7 @@
 
 import * as dom from 'vs/base/browser/dom';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { BreadcrumbsItem, BreadcrumbsWidget, IBreadcrumbsItemEvent } from 'vs/base/browser/ui/breadcrumbs/breadcrumbsWidget';
+import { BreadcrumbsItem, BreadcrumbsWidget, IBreadcrumbsItemEvent, IBreadcrumbsWidgetStyles } from 'vs/base/browser/ui/breadcrumbs/breadcrumbsWidget';
 import { tail } from 'vs/base/common/arrays';
 import { timeout } from 'vs/base/common/async';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
@@ -21,11 +21,8 @@ import { IContextViewService } from 'vs/platform/contextview/browser/contextView
 import { FileKind, IFileService, IFileStat } from 'vs/platform/files/common/files';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IListService, WorkbenchDataTree, WorkbenchListFocusContextKey } from 'vs/platform/list/browser/listService';
+import { IListService, WorkbenchAsyncDataTree, WorkbenchDataTree, WorkbenchListFocusContextKey } from 'vs/platform/list/browser/listService';
 import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { ColorIdentifier, ColorTransform } from 'vs/platform/theme/common/colorRegistry';
-import { attachBreadcrumbsStyler } from 'vs/platform/theme/common/styler';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { DEFAULT_LABELS_CONTAINER, ResourceLabels } from 'vs/workbench/browser/labels';
 import { BreadcrumbsConfig, IBreadcrumbsService } from 'vs/workbench/browser/parts/editor/breadcrumbs';
 import { BreadcrumbsModel, FileElement, OutlineElement2 } from 'vs/workbench/browser/parts/editor/breadcrumbsModel';
@@ -41,6 +38,7 @@ import { ITreeNode } from 'vs/base/browser/ui/tree/tree';
 import { IOutline } from 'vs/workbench/services/outline/browser/outline';
 import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
 import { Codicon } from 'vs/base/common/codicons';
+import { defaultBreadcrumbsWidgetStyles } from 'vs/platform/theme/browser/defaultStyles';
 
 class OutlineItem extends BreadcrumbsItem {
 
@@ -143,11 +141,11 @@ class FileItem extends BreadcrumbsItem {
 }
 
 export interface IBreadcrumbsControlOptions {
-	showFileIcons: boolean;
-	showSymbolIcons: boolean;
-	showDecorationColors: boolean;
-	breadcrumbsBackground: ColorIdentifier | ColorTransform;
-	showPlaceholder: boolean;
+	readonly showFileIcons: boolean;
+	readonly showSymbolIcons: boolean;
+	readonly showDecorationColors: boolean;
+	readonly showPlaceholder: boolean;
+	readonly widgetStyles?: IBreadcrumbsWidgetStyles;
 }
 
 const separatorIcon = registerIcon('breadcrumb-separator', Codicon.chevronRight, localize('separatorIcon', 'Icon for the separator in the breadcrumbs.'));
@@ -193,7 +191,6 @@ export class BreadcrumbsControl {
 		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
 		@IContextViewService private readonly _contextViewService: IContextViewService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@IThemeService private readonly _themeService: IThemeService,
 		@IQuickInputService private readonly _quickInputService: IQuickInputService,
 		@IFileService private readonly _fileService: IFileService,
 		@IEditorService private readonly _editorService: IEditorService,
@@ -212,11 +209,11 @@ export class BreadcrumbsControl {
 		this._labels = this._instantiationService.createInstance(ResourceLabels, DEFAULT_LABELS_CONTAINER);
 
 		const sizing = this._cfTitleScrollbarSizing.getValue() ?? 'default';
-		this._widget = new BreadcrumbsWidget(this.domNode, BreadcrumbsControl.SCROLLBAR_SIZES[sizing], separatorIcon);
+		const styles = _options.widgetStyles ?? defaultBreadcrumbsWidgetStyles;
+		this._widget = new BreadcrumbsWidget(this.domNode, BreadcrumbsControl.SCROLLBAR_SIZES[sizing], separatorIcon, styles);
 		this._widget.onDidSelectItem(this._onSelectEvent, this, this._disposables);
 		this._widget.onDidFocusItem(this._onFocusEvent, this, this._disposables);
 		this._widget.onDidChangeFocus(this._updateCkBreadcrumbsActive, this, this._disposables);
-		this._disposables.add(attachBreadcrumbsStyler(this._widget, this._themeService, { breadcrumbsBackground: _options.breadcrumbsBackground }));
 
 		this._ckBreadcrumbsPossible = BreadcrumbsControl.CK_BreadcrumbsPossible.bindTo(this._contextKeyService);
 		this._ckBreadcrumbsVisible = BreadcrumbsControl.CK_BreadcrumbsVisible.bindTo(this._contextKeyService);
@@ -253,6 +250,10 @@ export class BreadcrumbsControl {
 		this.domNode.classList.toggle('hidden', true);
 	}
 
+	revealLast(): void {
+		this._widget.revealLast();
+	}
+
 	update(): boolean {
 		this._breadcrumbsDisposables.clear();
 
@@ -504,14 +505,14 @@ registerAction2(class ToggleBreadcrumb extends Action2 {
 			id: 'breadcrumbs.toggle',
 			title: {
 				value: localize('cmd.toggle', "Toggle Breadcrumbs"),
-				mnemonicTitle: localize('miBreadcrumbs', "Toggle &&Breadcrumbs"),
+				mnemonicTitle: localize({ key: 'miBreadcrumbs', comment: ['&& denotes a mnemonic'] }, "Toggle &&Breadcrumbs"),
 				original: 'Toggle Breadcrumbs',
 			},
 			category: Categories.View,
 			toggled: {
 				condition: ContextKeyExpr.equals('config.breadcrumbs.enabled', true),
 				title: localize('cmd.toggle2', "Breadcrumbs"),
-				mnemonicTitle: localize('miBreadcrumbs2', "&&Breadcrumbs")
+				mnemonicTitle: localize({ key: 'miBreadcrumbs2', comment: ['&& denotes a mnemonic'] }, "&&Breadcrumbs")
 			},
 			menu: [
 				{ id: MenuId.CommandPalette },
@@ -744,7 +745,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 		const lists = accessor.get(IListService);
 
 		const tree = lists.lastFocusedList;
-		if (!(tree instanceof WorkbenchDataTree)) {
+		if (!(tree instanceof WorkbenchDataTree) && !(tree instanceof WorkbenchAsyncDataTree)) {
 			return;
 		}
 
diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts
index 4f4e5b1c52a8e6..9ca0b4310a585d 100644
--- a/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts
+++ b/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts
@@ -17,7 +17,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { FileKind, IFileService, IFileStat } from 'vs/platform/files/common/files';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { WorkbenchDataTree, WorkbenchAsyncDataTree } from 'vs/platform/list/browser/listService';
-import { breadcrumbsPickerBackground, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
+import { breadcrumbsPickerBackground, widgetBorder, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
 import { isWorkspace, isWorkspaceFolder, IWorkspace, IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { ResourceLabels, IResourceLabel, DEFAULT_LABELS_CONTAINER } from 'vs/workbench/browser/labels';
 import { BreadcrumbsConfig } from 'vs/workbench/browser/parts/editor/breadcrumbs';
@@ -95,7 +95,9 @@ export abstract class BreadcrumbsPicker {
 		this._treeContainer = document.createElement('div');
 		this._treeContainer.style.background = color ? color.toString() : '';
 		this._treeContainer.style.paddingTop = '2px';
+		this._treeContainer.style.borderRadius = '3px';
 		this._treeContainer.style.boxShadow = `0 0 8px 2px ${this._themeService.getColorTheme().getColor(widgetShadow)}`;
+		this._treeContainer.style.border = `1px solid ${this._themeService.getColorTheme().getColor(widgetBorder)}`;
 		this._domNode.appendChild(this._treeContainer);
 
 		this._layoutInfo = { maxHeight, width, arrowSize, arrowOffset, inputHeight: 0 };
diff --git a/src/vs/workbench/browser/parts/editor/editor.contribution.ts b/src/vs/workbench/browser/parts/editor/editor.contribution.ts
index 2f42bb51fcaf41..a5b711d543cd08 100644
--- a/src/vs/workbench/browser/parts/editor/editor.contribution.ts
+++ b/src/vs/workbench/browser/parts/editor/editor.contribution.ts
@@ -67,6 +67,7 @@ import { Codicon } from 'vs/base/common/codicons';
 import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
 import { UntitledTextEditorInputSerializer, UntitledTextEditorWorkingCopyEditorHandler } from 'vs/workbench/services/untitled/common/untitledTextEditorHandler';
 import { DynamicEditorConfigurations } from 'vs/workbench/browser/parts/editor/editorConfiguration';
+import { AccessibilityStatus } from 'vs/workbench/browser/parts/editor/accessibilityStatus';
 
 //#region Editor Registrations
 
@@ -125,6 +126,7 @@ Registry.as<IEditorFactoryRegistry>(EditorExtensions.EditorFactory).registerEdit
 
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(EditorAutoSave, LifecyclePhase.Ready);
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(EditorStatus, LifecyclePhase.Ready);
+Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(AccessibilityStatus, LifecyclePhase.Ready);
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(UntitledTextEditorWorkingCopyEditorHandler, LifecyclePhase.Ready);
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(DynamicEditorConfigurations, LifecyclePhase.Ready);
 
diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts
index 31d6bb4bf3fa86..370f99967f4657 100644
--- a/src/vs/workbench/browser/parts/editor/editorCommands.ts
+++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts
@@ -37,6 +37,8 @@ import { IEditorResolverService } from 'vs/workbench/services/editor/common/edit
 import { IPathService } from 'vs/workbench/services/path/common/pathService';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { extname } from 'vs/base/common/resources';
+import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
+import { isDiffEditor } from 'vs/editor/browser/editorBrowser';
 
 export const CLOSE_SAVED_EDITORS_COMMAND_ID = 'workbench.action.closeUnmodifiedEditors';
 export const CLOSE_EDITORS_IN_GROUP_COMMAND_ID = 'workbench.action.closeEditorsInGroup';
@@ -67,6 +69,7 @@ export const GOTO_PREVIOUS_CHANGE = 'workbench.action.compareEditor.previousChan
 export const DIFF_FOCUS_PRIMARY_SIDE = 'workbench.action.compareEditor.focusPrimarySide';
 export const DIFF_FOCUS_SECONDARY_SIDE = 'workbench.action.compareEditor.focusSecondarySide';
 export const DIFF_FOCUS_OTHER_SIDE = 'workbench.action.compareEditor.focusOtherSide';
+export const DIFF_OPEN_SIDE = 'workbench.action.compareEditor.openSide';
 export const TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE = 'toggle.diff.ignoreTrimWhitespace';
 
 export const SPLIT_EDITOR_UP = 'workbench.action.splitEditorUp';
@@ -1338,6 +1341,33 @@ function registerOtherEditorCommands(): void {
 		}
 	});
 
+	KeybindingsRegistry.registerCommandAndKeybindingRule({
+		id: DIFF_OPEN_SIDE,
+		weight: KeybindingWeight.WorkbenchContrib,
+		when: EditorContextKeys.inDiffEditor,
+		primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.Shift | KeyCode.KeyO),
+		handler: async accessor => {
+			const editorService = accessor.get(IEditorService);
+			const editorGroupService = accessor.get(IEditorGroupsService);
+
+			const activeEditor = editorService.activeEditor;
+			const activeTextEditorControl = editorService.activeTextEditorControl;
+			if (!isDiffEditor(activeTextEditorControl) || !(activeEditor instanceof DiffEditorInput)) {
+				return;
+			}
+
+			let editor: EditorInput | undefined;
+			const originalEditor = activeTextEditorControl.getOriginalEditor();
+			if (originalEditor.hasTextFocus()) {
+				editor = activeEditor.original;
+			} else {
+				editor = activeEditor.modified;
+			}
+
+			return editorGroupService.activeGroup.openEditor(editor);
+		}
+	});
+
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: UNPIN_EDITOR_COMMAND_ID,
 		weight: KeybindingWeight.WorkbenchContrib,
diff --git a/src/vs/workbench/browser/parts/editor/editorPlaceholder.ts b/src/vs/workbench/browser/parts/editor/editorPlaceholder.ts
index 744a52743d1103..2605197c9db5f7 100644
--- a/src/vs/workbench/browser/parts/editor/editorPlaceholder.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPlaceholder.ts
@@ -12,7 +12,7 @@ import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
-import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { Dimension, size, clearNode, $ } from 'vs/base/browser/dom';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { DisposableStore, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
@@ -25,8 +25,6 @@ import { computeEditorAriaLabel, EditorPaneDescriptor } from 'vs/workbench/brows
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { Link } from 'vs/platform/opener/browser/link';
 import { SimpleIconLabel } from 'vs/base/browser/ui/iconLabel/simpleIconLabel';
-import { editorErrorForeground, editorInfoForeground, editorWarningForeground } from 'vs/platform/theme/common/colorRegistry';
-import { Codicon } from 'vs/base/common/codicons';
 import { FileChangeType, FileOperationError, FileOperationResult, IFileService } from 'vs/platform/files/common/files';
 import { isErrorWithActions, toErrorMessage } from 'vs/base/common/errorMessage';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
@@ -277,34 +275,3 @@ export class ErrorPlaceholderEditor extends EditorPlaceholder {
 		return { icon: '$(error)', label, actions: actions ?? [] };
 	}
 }
-
-registerThemingParticipant((theme, collector) => {
-
-	// Editor Placeholder Error Icon
-	const editorErrorIconForegroundColor = theme.getColor(editorErrorForeground);
-	if (editorErrorIconForegroundColor) {
-		collector.addRule(`
-		.monaco-editor-pane-placeholder .editor-placeholder-icon-container ${Codicon.error.cssSelector} {
-			color: ${editorErrorIconForegroundColor};
-		}`);
-	}
-
-	// Editor Placeholder Warning Icon
-	const editorWarningIconForegroundColor = theme.getColor(editorWarningForeground);
-	if (editorWarningIconForegroundColor) {
-		collector.addRule(`
-		.monaco-editor-pane-placeholder .editor-placeholder-icon-container ${Codicon.warning.cssSelector} {
-			color: ${editorWarningIconForegroundColor};
-		}`);
-	}
-
-	// Editor Placeholder Info/Trust Icon
-	const editorInfoIconForegroundColor = theme.getColor(editorInfoForeground);
-	if (editorInfoIconForegroundColor) {
-		collector.addRule(`
-		.monaco-editor-pane-placeholder .editor-placeholder-icon-container ${Codicon.info.cssSelector},
-		.monaco-editor-pane-placeholder .editor-placeholder-icon-container ${Codicon.workspaceUntrusted.cssSelector} {
-			color: ${editorInfoIconForegroundColor};
-		}`);
-	}
-});
diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts
index 8cc75d0c09d087..746dadb68a5602 100644
--- a/src/vs/workbench/browser/parts/editor/editorStatus.ts
+++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts
@@ -33,7 +33,7 @@ import { ICommandService, CommandsRegistry } from 'vs/platform/commands/common/c
 import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { EncodingMode, IEncodingSupport, ILanguageSupport, ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { SUPPORTED_ENCODINGS } from 'vs/workbench/services/textfile/common/encoding';
-import { ConfigurationChangedEvent, IEditorOptions, EditorOption } from 'vs/editor/common/config/editorOptions';
+import { ConfigurationChangedEvent, EditorOption } from 'vs/editor/common/config/editorOptions';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
 import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { deepClone } from 'vs/base/common/objects';
@@ -43,9 +43,7 @@ import { IPreferencesService } from 'vs/workbench/services/preferences/common/pr
 import { IQuickInputService, IQuickPickItem, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
 import { getIconClassesForLanguageId } from 'vs/editor/common/services/getIconClasses';
 import { Promises, timeout } from 'vs/base/common/async';
-import { INotificationHandle, INotificationService, Severity } from 'vs/platform/notification/common/notification';
 import { Event } from 'vs/base/common/event';
-import { IAccessibilityService, AccessibilitySupport } from 'vs/platform/accessibility/common/accessibility';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment, IStatusbarEntry } from 'vs/workbench/services/statusbar/browser/statusbar';
 import { IMarker, IMarkerService, MarkerSeverity, IMarkerData } from 'vs/platform/markers/common/markers';
@@ -148,7 +146,6 @@ class StateChange {
 	EOL: boolean = false;
 	tabFocusMode: boolean = false;
 	columnSelectionMode: boolean = false;
-	screenReaderMode: boolean = false;
 	metadata: boolean = false;
 
 	combine(other: StateChange) {
@@ -160,7 +157,6 @@ class StateChange {
 		this.EOL = this.EOL || other.EOL;
 		this.tabFocusMode = this.tabFocusMode || other.tabFocusMode;
 		this.columnSelectionMode = this.columnSelectionMode || other.columnSelectionMode;
-		this.screenReaderMode = this.screenReaderMode || other.screenReaderMode;
 		this.metadata = this.metadata || other.metadata;
 	}
 
@@ -173,7 +169,6 @@ class StateChange {
 			|| this.EOL
 			|| this.tabFocusMode
 			|| this.columnSelectionMode
-			|| this.screenReaderMode
 			|| this.metadata;
 	}
 }
@@ -186,7 +181,6 @@ type StateDelta = (
 	| { type: 'indentation'; indentation: string | undefined }
 	| { type: 'tabFocusMode'; tabFocusMode: boolean }
 	| { type: 'columnSelectionMode'; columnSelectionMode: boolean }
-	| { type: 'screenReaderMode'; screenReaderMode: boolean }
 	| { type: 'metadata'; metadata: string | undefined }
 );
 
@@ -213,9 +207,6 @@ class State {
 	private _columnSelectionMode: boolean | undefined;
 	get columnSelectionMode(): boolean | undefined { return this._columnSelectionMode; }
 
-	private _screenReaderMode: boolean | undefined;
-	get screenReaderMode(): boolean | undefined { return this._screenReaderMode; }
-
 	private _metadata: string | undefined;
 	get metadata(): string | undefined { return this._metadata; }
 
@@ -272,13 +263,6 @@ class State {
 				}
 				break;
 
-			case 'screenReaderMode':
-				if (this._screenReaderMode !== update.screenReaderMode) {
-					this._screenReaderMode = update.screenReaderMode;
-					change.screenReaderMode = true;
-				}
-				break;
-
 			case 'metadata':
 				if (this._metadata !== update.metadata) {
 					this._metadata = update.metadata;
@@ -302,7 +286,6 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
 
 	private readonly tabFocusModeElement = this._register(new MutableDisposable<IStatusbarEntryAccessor>());
 	private readonly columnSelectionModeElement = this._register(new MutableDisposable<IStatusbarEntryAccessor>());
-	private readonly screenRedearModeElement = this._register(new MutableDisposable<IStatusbarEntryAccessor>());
 	private readonly indentationElement = this._register(new MutableDisposable<IStatusbarEntryAccessor>());
 	private readonly selectionElement = this._register(new MutableDisposable<IStatusbarEntryAccessor>());
 	private readonly encodingElement = this._register(new MutableDisposable<IStatusbarEntryAccessor>());
@@ -315,17 +298,13 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
 	private readonly activeEditorListeners = this._register(new DisposableStore());
 	private readonly delayedRender = this._register(new MutableDisposable());
 	private toRender: StateChange | null = null;
-	private screenReaderNotification: INotificationHandle | null = null;
-	private promptedScreenReader: boolean = false;
+
 
 	constructor(
 		@IEditorService private readonly editorService: IEditorService,
 		@IQuickInputService private readonly quickInputService: IQuickInputService,
 		@ILanguageService private readonly languageService: ILanguageService,
 		@ITextFileService private readonly textFileService: ITextFileService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@INotificationService private readonly notificationService: INotificationService,
-		@IAccessibilityService private readonly accessibilityService: IAccessibilityService,
 		@IStatusbarService private readonly statusbarService: IStatusbarService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService
 	) {
@@ -343,32 +322,9 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
 	}
 
 	private registerCommands(): void {
-		CommandsRegistry.registerCommand({ id: 'showEditorScreenReaderNotification', handler: () => this.showScreenReaderNotification() });
 		CommandsRegistry.registerCommand({ id: 'changeEditorIndentation', handler: () => this.showIndentationPicker() });
 	}
 
-	private showScreenReaderNotification(): void {
-		if (!this.screenReaderNotification) {
-			this.screenReaderNotification = this.notificationService.prompt(
-				Severity.Info,
-				localize('screenReaderDetectedExplanation.question', "Are you using a screen reader to operate VS Code?"),
-				[{
-					label: localize('screenReaderDetectedExplanation.answerYes', "Yes"),
-					run: () => {
-						this.configurationService.updateValue('editor.accessibilitySupport', 'on');
-					}
-				}, {
-					label: localize('screenReaderDetectedExplanation.answerNo', "No"),
-					run: () => {
-						this.configurationService.updateValue('editor.accessibilitySupport', 'off');
-					}
-				}],
-				{ sticky: true }
-			);
-
-			Event.once(this.screenReaderNotification.onDidClose)(() => this.screenReaderNotification = null);
-		}
-	}
 
 	private async showIndentationPicker(): Promise<unknown> {
 		const activeTextEditorControl = getCodeEditor(this.editorService.activeTextEditorControl);
@@ -445,24 +401,6 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
 		}
 	}
 
-	private updateScreenReaderModeElement(visible: boolean): void {
-		if (visible) {
-			if (!this.screenRedearModeElement.value) {
-				const text = localize('screenReaderDetected', "Screen Reader Optimized");
-				this.screenRedearModeElement.value = this.statusbarService.addEntry({
-					name: localize('status.editor.screenReaderMode', "Screen Reader Mode"),
-					text,
-					ariaLabel: text,
-					command: 'showEditorScreenReaderNotification',
-					backgroundColor: themeColorFromId(STATUS_BAR_PROMINENT_ITEM_BACKGROUND),
-					color: themeColorFromId(STATUS_BAR_PROMINENT_ITEM_FOREGROUND)
-				}, 'status.editor.screenReaderMode', StatusbarAlignment.RIGHT, 100.6);
-			}
-		} else {
-			this.screenRedearModeElement.clear();
-		}
-	}
-
 	private updateSelectionElement(text: string | undefined): void {
 		if (!text) {
 			this.selectionElement.clear();
@@ -598,7 +536,6 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
 	private doRenderNow(changed: StateChange): void {
 		this.updateTabFocusModeElement(!!this.state.tabFocusMode);
 		this.updateColumnSelectionModeElement(!!this.state.columnSelectionMode);
-		this.updateScreenReaderModeElement(!!this.state.screenReaderMode);
 		this.updateIndentationElement(this.state.indentation);
 		this.updateSelectionElement(this.state.selectionStatus);
 		this.updateEncodingElement(this.state.encoding);
@@ -638,7 +575,6 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
 
 		// Update all states
 		this.onColumnSelectionModeChange(activeCodeEditor);
-		this.onScreenReaderModeChange(activeCodeEditor);
 		this.onSelectionChange(activeCodeEditor);
 		this.onLanguageChange(activeCodeEditor, activeInput);
 		this.onEOLChange(activeCodeEditor);
@@ -668,9 +604,6 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
 				if (event.hasChanged(EditorOption.columnSelection)) {
 					this.onColumnSelectionModeChange(activeCodeEditor);
 				}
-				if (event.hasChanged(EditorOption.accessibilitySupport)) {
-					this.onScreenReaderModeChange(activeCodeEditor);
-				}
 			}));
 
 			// Hook Listener for Selection changes
@@ -792,32 +725,6 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
 		this.updateState(info);
 	}
 
-	private onScreenReaderModeChange(editorWidget: ICodeEditor | undefined): void {
-		let screenReaderMode = false;
-
-		// We only support text based editors
-		if (editorWidget) {
-			const screenReaderDetected = this.accessibilityService.isScreenReaderOptimized();
-			if (screenReaderDetected) {
-				const screenReaderConfiguration = this.configurationService.getValue<IEditorOptions>('editor')?.accessibilitySupport;
-				if (screenReaderConfiguration === 'auto') {
-					if (!this.promptedScreenReader) {
-						this.promptedScreenReader = true;
-						setTimeout(() => this.showScreenReaderNotification(), 100);
-					}
-				}
-			}
-
-			screenReaderMode = (editorWidget.getOption(EditorOption.accessibilitySupport) === AccessibilitySupport.Enabled);
-		}
-
-		if (screenReaderMode === false && this.screenReaderNotification) {
-			this.screenReaderNotification.close();
-		}
-
-		this.updateState({ type: 'screenReaderMode', screenReaderMode: screenReaderMode });
-	}
-
 	private onSelectionChange(editorWidget: ICodeEditor | undefined): void {
 		const info: IEditorSelectionStatus = Object.create(null);
 
diff --git a/src/vs/workbench/browser/parts/editor/media/editorplaceholder.css b/src/vs/workbench/browser/parts/editor/media/editorplaceholder.css
index 325e348e2e0a11..d4bbd91669e75b 100644
--- a/src/vs/workbench/browser/parts/editor/media/editorplaceholder.css
+++ b/src/vs/workbench/browser/parts/editor/media/editorplaceholder.css
@@ -21,6 +21,19 @@
 	font-size: 48px;
 }
 
+.monaco-editor-pane-placeholder .editor-placeholder-icon-container .codicon.codicon-error {
+	color: var(--vscode-editorError-foreground);
+}
+
+.monaco-editor-pane-placeholder .editor-placeholder-icon-container .codicon.codicon-warning {
+	color: var(--vscode-editorWarning-foreground);
+}
+
+.monaco-editor-pane-placeholder .editor-placeholder-icon-container .codicon.codicon-info,
+.monaco-editor-pane-placeholder .editor-placeholder-icon-container .codicon.codicon-workspace-untrusted {
+	color: var(--vscode-editorInfo-foreground);
+}
+
 .monaco-editor-pane-placeholder.max-height-200px .editor-placeholder-icon-container {
 	/* Hide the icon when height is limited */
 	display: none;
diff --git a/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css b/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css
index 7eb60a659f4b94..df08d558acf4e6 100644
--- a/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css
+++ b/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css
@@ -171,10 +171,6 @@
 	position: static; /** disable sticky positions for sticky compact/shrink tabs if the available space is too little */
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.tab-actions-left .action-label {
-	margin-right: 4px !important;
-}
-
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-shrink.tab-actions-left::after,
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-shrink.tab-actions-off::after {
 	content: '';
diff --git a/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
index b274185619751c..93f7e6db6b2139 100644
--- a/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
@@ -17,6 +17,7 @@ import { withNullAsUndefined, assertIsDefined, assertAllDefined } from 'vs/base/
 import { IEditorGroupTitleHeight } from 'vs/workbench/browser/parts/editor/editor';
 import { equals } from 'vs/base/common/objects';
 import { toDisposable } from 'vs/base/common/lifecycle';
+import { defaultBreadcrumbsWidgetStyles } from 'vs/platform/theme/browser/defaultStyles';
 
 interface IRenderedEditorLabel {
 	editor?: EditorInput;
@@ -50,7 +51,7 @@ export class NoTabsTitleControl extends TitleControl {
 		this._register(addDisposableListener(this.editorLabel.element, EventType.CLICK, e => this.onTitleLabelClick(e)));
 
 		// Breadcrumbs
-		this.createBreadcrumbsControl(labelContainer, { showFileIcons: false, showSymbolIcons: true, showDecorationColors: false, breadcrumbsBackground: Color.transparent.toString(), showPlaceholder: false });
+		this.createBreadcrumbsControl(labelContainer, { showFileIcons: false, showSymbolIcons: true, showDecorationColors: false, widgetStyles: { ...defaultBreadcrumbsWidgetStyles, breadcrumbsBackground: Color.transparent.toString() }, showPlaceholder: false });
 		titleContainer.classList.toggle('breadcrumbs', Boolean(this.breadcrumbsControl));
 		this._register(toDisposable(() => titleContainer.classList.remove('breadcrumbs'))); // important to remove because the container is a shared dom node
 
diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
index 399fc5844080f8..1e6c16ea0c8229 100644
--- a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
@@ -27,7 +27,7 @@ import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import { getOrSet } from 'vs/base/common/map';
 import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { TAB_INACTIVE_BACKGROUND, TAB_ACTIVE_BACKGROUND, TAB_ACTIVE_FOREGROUND, TAB_INACTIVE_FOREGROUND, TAB_BORDER, EDITOR_DRAG_AND_DROP_BACKGROUND, TAB_UNFOCUSED_ACTIVE_FOREGROUND, TAB_UNFOCUSED_INACTIVE_FOREGROUND, TAB_UNFOCUSED_ACTIVE_BACKGROUND, TAB_UNFOCUSED_ACTIVE_BORDER, TAB_ACTIVE_BORDER, TAB_HOVER_BACKGROUND, TAB_HOVER_BORDER, TAB_UNFOCUSED_HOVER_BACKGROUND, TAB_UNFOCUSED_HOVER_BORDER, EDITOR_GROUP_HEADER_TABS_BACKGROUND, WORKBENCH_BACKGROUND, TAB_ACTIVE_BORDER_TOP, TAB_UNFOCUSED_ACTIVE_BORDER_TOP, TAB_ACTIVE_MODIFIED_BORDER, TAB_INACTIVE_MODIFIED_BORDER, TAB_UNFOCUSED_ACTIVE_MODIFIED_BORDER, TAB_UNFOCUSED_INACTIVE_MODIFIED_BORDER, TAB_UNFOCUSED_INACTIVE_BACKGROUND, TAB_HOVER_FOREGROUND, TAB_UNFOCUSED_HOVER_FOREGROUND, EDITOR_GROUP_HEADER_TABS_BORDER, TAB_LAST_PINNED_BORDER } from 'vs/workbench/common/theme';
-import { activeContrastBorder, contrastBorder, editorBackground, breadcrumbsBackground } from 'vs/platform/theme/common/colorRegistry';
+import { activeContrastBorder, contrastBorder, editorBackground } from 'vs/platform/theme/common/colorRegistry';
 import { ResourcesDropHandler, DraggedEditorIdentifier, DraggedEditorGroupIdentifier, DraggedTreeItemsIdentifier, extractTreeDropData } from 'vs/workbench/browser/dnd';
 import { Color } from 'vs/base/common/color';
 import { INotificationService } from 'vs/platform/notification/common/notification';
@@ -53,7 +53,9 @@ import { EditorActivation } from 'vs/platform/editor/common/editor';
 import { UNLOCK_GROUP_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
 import { ITreeViewsService } from 'vs/workbench/services/views/browser/treeViewsService';
 
-interface EditorInputLabel {
+interface IEditorInputLabel {
+	editor: EditorInput;
+
 	name?: string;
 	description?: string;
 	forceDescription?: boolean;
@@ -79,8 +81,6 @@ interface IScheduledTabsTitleControlLayout extends IDisposable {
 	options?: ITabsTitleControlLayoutOptions;
 }
 
-type EditorInputLabelAndEditor = EditorInputLabel & { editor: EditorInput };
-
 export class TabsTitleControl extends TitleControl {
 
 	private static readonly SCROLLBAR_SIZES = {
@@ -111,7 +111,9 @@ export class TabsTitleControl extends TitleControl {
 	private readonly unpinEditorAction = this._register(this.instantiationService.createInstance(UnpinEditorAction, UnpinEditorAction.ID, UnpinEditorAction.LABEL));
 
 	private readonly tabResourceLabels = this._register(this.instantiationService.createInstance(ResourceLabels, DEFAULT_LABELS_CONTAINER));
-	private tabLabels: EditorInputLabel[] = [];
+	private tabLabels: IEditorInputLabel[] = [];
+	private activeTabLabel: IEditorInputLabel | undefined;
+
 	private tabActionBars: ActionBar[] = [];
 	private tabDisposables: IDisposable[] = [];
 
@@ -191,7 +193,7 @@ export class TabsTitleControl extends TitleControl {
 		const breadcrumbsContainer = document.createElement('div');
 		breadcrumbsContainer.classList.add('tabs-breadcrumbs');
 		this.titleContainer.appendChild(breadcrumbsContainer);
-		this.createBreadcrumbsControl(breadcrumbsContainer, { showFileIcons: true, showSymbolIcons: true, showDecorationColors: false, showPlaceholder: true, breadcrumbsBackground: breadcrumbsBackground });
+		this.createBreadcrumbsControl(breadcrumbsContainer, { showFileIcons: true, showSymbolIcons: true, showDecorationColors: false, showPlaceholder: true });
 	}
 
 	private createTabsScrollbar(scrollable: HTMLElement): ScrollableElement {
@@ -240,7 +242,7 @@ export class TabsTitleControl extends TitleControl {
 			}
 		}));
 
-		// New file when double clicking on tabs container (but not tabs)
+		// New file when double-clicking on tabs container (but not tabs)
 		for (const eventType of [TouchEventType.Tap, EventType.DBLCLICK]) {
 			this._register(addDisposableListener(tabsContainer, eventType, (e: MouseEvent | GestureEvent) => {
 				if (eventType === EventType.DBLCLICK) {
@@ -430,14 +432,58 @@ export class TabsTitleControl extends TitleControl {
 			tabsContainer.appendChild(this.createTab(i, tabsContainer, tabsScrollbar));
 		}
 
-		// An add of a tab requires to recompute all labels
+		// Make sure to recompute tab labels and detect
+		// if a label change occurred that requires a
+		// redraw of tabs and update of breadcrumbs.
+
+		const activeEditorChanged = this.didActiveEditorChange();
+		const oldActiveTabLabel = this.activeTabLabel;
+		const oldTabLabelsLength = this.tabLabels.length;
 		this.computeTabLabels();
 
-		// Redraw all tabs
-		this.redraw({ forceRevealActiveTab: true });
+		// Redraw and update in these cases
+		if (
+			activeEditorChanged ||													// active editor changed
+			oldTabLabelsLength !== this.tabLabels.length ||							// number of tabs changed
+			!this.equalsEditorInputLabel(oldActiveTabLabel, this.activeTabLabel)	// active editor label changed
+		) {
+			this.redraw({ forceRevealActiveTab: true });
+			this.breadcrumbsControl?.update();
+		}
+
+		// Otherwise only layout for revealing in tabs and breadcrumbs
+		else {
+			this.layout(this.dimensions, { forceRevealActiveTab: true });
+			this.breadcrumbsControl?.revealLast();
+		}
+	}
+
+	private didActiveEditorChange(): boolean {
+		if (
+			!this.activeTabLabel?.editor && this.group.activeEditor || 							// active editor changed from null => editor
+			this.activeTabLabel?.editor && !this.group.activeEditor || 							// active editor changed from editor => null
+			(!this.activeTabLabel?.editor || !this.group.isActive(this.activeTabLabel.editor))	// active editor changed from editorA => editorB
+		) {
+			return true;
+		}
+
+		return false;
+	}
+
+	private equalsEditorInputLabel(labelA: IEditorInputLabel | undefined, labelB: IEditorInputLabel | undefined): boolean {
+		if (labelA === labelB) {
+			return true;
+		}
+
+		if (!labelA || !labelB) {
+			return false;
+		}
 
-		// Update Breadcrumbs
-		this.breadcrumbsControl?.update();
+		return labelA.name === labelB.name &&
+			labelA.description === labelB.description &&
+			labelA.forceDescription === labelB.forceDescription &&
+			labelA.title === labelB.title &&
+			labelA.ariaLabel === labelB.ariaLabel;
 	}
 
 	closeEditor(editor: EditorInput, index: number | undefined): void {
@@ -480,6 +526,7 @@ export class TabsTitleControl extends TitleControl {
 			this.tabDisposables = dispose(this.tabDisposables);
 			this.tabResourceLabels.clear();
 			this.tabLabels = [];
+			this.activeTabLabel = undefined;
 			this.tabActionBars = [];
 
 			this.clearEditorActionsToolbar();
@@ -608,7 +655,7 @@ export class TabsTitleControl extends TitleControl {
 		this.redraw();
 	}
 
-	private forEachTab(fn: (editor: EditorInput, index: number, tabContainer: HTMLElement, tabLabelWidget: IResourceLabel, tabLabel: EditorInputLabel, tabActionBar: ActionBar) => void, fromIndex?: number, toIndex?: number): void {
+	private forEachTab(fn: (editor: EditorInput, index: number, tabContainer: HTMLElement, tabLabelWidget: IResourceLabel, tabLabel: IEditorInputLabel, tabActionBar: ActionBar) => void, fromIndex?: number, toIndex?: number): void {
 		this.group.editors.forEach((editor, index) => {
 			if (typeof fromIndex === 'number' && fromIndex > index) {
 				return; // do nothing if we are not yet at `fromIndex`
@@ -622,11 +669,11 @@ export class TabsTitleControl extends TitleControl {
 		});
 	}
 
-	private withTab(editor: EditorInput, fn: (editor: EditorInput, index: number, tabContainer: HTMLElement, tabLabelWidget: IResourceLabel, tabLabel: EditorInputLabel, tabActionBar: ActionBar) => void): void {
+	private withTab(editor: EditorInput, fn: (editor: EditorInput, index: number, tabContainer: HTMLElement, tabLabelWidget: IResourceLabel, tabLabel: IEditorInputLabel, tabActionBar: ActionBar) => void): void {
 		this.doWithTab(this.group.getIndexOfEditor(editor), editor, fn);
 	}
 
-	private doWithTab(index: number, editor: EditorInput, fn: (editor: EditorInput, index: number, tabContainer: HTMLElement, tabLabelWidget: IResourceLabel, tabLabel: EditorInputLabel, tabActionBar: ActionBar) => void): void {
+	private doWithTab(index: number, editor: EditorInput, fn: (editor: EditorInput, index: number, tabContainer: HTMLElement, tabLabelWidget: IResourceLabel, tabLabel: IEditorInputLabel, tabActionBar: ActionBar) => void): void {
 		const tabsContainer = assertIsDefined(this.tabsContainer);
 		const tabContainer = tabsContainer.children[index] as HTMLElement;
 		const tabResourceLabel = this.tabResourceLabels.get(index);
@@ -985,27 +1032,38 @@ export class TabsTitleControl extends TitleControl {
 		const { verbosity, shortenDuplicates } = this.getLabelConfigFlags(labelFormat);
 
 		// Build labels and descriptions for each editor
-		const labels: EditorInputLabelAndEditor[] = this.group.editors.map((editor, index) => ({
-			editor,
-			name: editor.getName(),
-			description: editor.getDescription(verbosity),
-			forceDescription: editor.hasCapability(EditorInputCapabilities.ForceDescription),
-			title: editor.getTitle(Verbosity.LONG),
-			ariaLabel: computeEditorAriaLabel(editor, index, this.group, this.editorGroupService.count)
-		}));
+		const labels: IEditorInputLabel[] = [];
+		let activeEditorIndex = -1;
+		for (let i = 0; i < this.group.editors.length; i++) {
+			const editor = this.group.editors[i];
+			labels.push({
+				editor,
+				name: editor.getName(),
+				description: editor.getDescription(verbosity),
+				forceDescription: editor.hasCapability(EditorInputCapabilities.ForceDescription),
+				title: editor.getTitle(Verbosity.LONG),
+				ariaLabel: computeEditorAriaLabel(editor, i, this.group, this.editorGroupService.count)
+			});
+
+			if (editor === this.group.activeEditor) {
+				activeEditorIndex = i;
+			}
+		}
 
 		// Shorten labels as needed
 		if (shortenDuplicates) {
 			this.shortenTabLabels(labels);
 		}
 
+		// Remember for fast lookup
 		this.tabLabels = labels;
+		this.activeTabLabel = labels[activeEditorIndex];
 	}
 
-	private shortenTabLabels(labels: EditorInputLabelAndEditor[]): void {
+	private shortenTabLabels(labels: IEditorInputLabel[]): void {
 
 		// Gather duplicate titles, while filtering out invalid descriptions
-		const mapNameToDuplicates = new Map<string, EditorInputLabelAndEditor[]>();
+		const mapNameToDuplicates = new Map<string, IEditorInputLabel[]>();
 		for (const label of labels) {
 			if (typeof label.description === 'string') {
 				getOrSet(mapNameToDuplicates, label.name, []).push(label);
@@ -1026,7 +1084,7 @@ export class TabsTitleControl extends TitleControl {
 			}
 
 			// Identify duplicate descriptions
-			const mapDescriptionToDuplicates = new Map<string, EditorInputLabelAndEditor[]>();
+			const mapDescriptionToDuplicates = new Map<string, IEditorInputLabel[]>();
 			for (const duplicateLabel of duplicateLabels) {
 				getOrSet(mapDescriptionToDuplicates, duplicateLabel.description, []).push(duplicateLabel);
 			}
@@ -1119,7 +1177,7 @@ export class TabsTitleControl extends TitleControl {
 		this.layout(this.dimensions, options);
 	}
 
-	private redrawTab(editor: EditorInput, index: number, tabContainer: HTMLElement, tabLabelWidget: IResourceLabel, tabLabel: EditorInputLabel, tabActionBar: ActionBar): void {
+	private redrawTab(editor: EditorInput, index: number, tabContainer: HTMLElement, tabLabelWidget: IResourceLabel, tabLabel: IEditorInputLabel, tabActionBar: ActionBar): void {
 		const isTabSticky = this.group.isSticky(index);
 		const options = this.accessor.partOptions;
 
@@ -1179,7 +1237,7 @@ export class TabsTitleControl extends TitleControl {
 		this.redrawTabActiveAndDirty(this.accessor.activeGroup === this.group, editor, tabContainer, tabActionBar);
 	}
 
-	private redrawTabLabel(editor: EditorInput, index: number, tabContainer: HTMLElement, tabLabelWidget: IResourceLabel, tabLabel: EditorInputLabel): void {
+	private redrawTabLabel(editor: EditorInput, index: number, tabContainer: HTMLElement, tabLabelWidget: IResourceLabel, tabLabel: IEditorInputLabel): void {
 		const options = this.accessor.partOptions;
 
 		// Unless tabs are sticky compact, show the full label and description
@@ -1900,10 +1958,10 @@ registerThemingParticipant((theme, collector) => {
 	const borderColor = theme.getColor(TAB_BORDER);
 	if (borderColor) {
 		collector.addRule(`
-				.monaco-workbench .part.editor > .content .editor-group-container > .title > .tabs-and-actions-container.wrapping .tabs-container > .tab {
-					border-bottom: 1px solid ${borderColor};
-				}
-			`);
+			.monaco-workbench .part.editor > .content .editor-group-container > .title > .tabs-and-actions-container.wrapping .tabs-container > .tab {
+				border-bottom: 1px solid ${borderColor};
+			}
+		`);
 	}
 
 	// Styling with Outline color (e.g. high contrast theme)
diff --git a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
index bdd0964760cf17..8a7d35f9ac4279 100644
--- a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
@@ -7,7 +7,7 @@ import { localize } from 'vs/nls';
 import { deepClone } from 'vs/base/common/objects';
 import { isObject, assertIsDefined, withUndefinedAsNull, withNullAsUndefined } from 'vs/base/common/types';
 import { ICodeEditor, IDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { IDiffEditorOptions, IEditorOptions as ICodeEditorOptions } from 'vs/editor/common/config/editorOptions';
+import { IDiffEditorOptions, EditorOption, IEditorOptions as ICodeEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { AbstractTextEditor, IEditorConfiguration } from 'vs/workbench/browser/parts/editor/textEditor';
 import { TEXT_DIFF_EDITOR_ID, IEditorFactoryRegistry, EditorExtensions, ITextDiffEditorPane, IEditorOpenContext, EditorInputCapabilities, isEditorInput, isTextEditorViewState } from 'vs/workbench/common/editor';
 import { EditorInput } from 'vs/workbench/common/editor/editorInput';
@@ -132,7 +132,8 @@ export class TextDiffEditor extends AbstractTextEditor<IDiffEditorViewState> imp
 
 			// Diff navigator
 			this.diffNavigator = new DiffNavigator(control, {
-				alwaysRevealFirst: !optionsGotApplied && !hasPreviousViewState // only reveal first change if we had no options or viewstate
+				alwaysRevealFirst: !optionsGotApplied && !hasPreviousViewState, // only reveal first change if we had no options or viewstate
+				findResultLoop: this.getMainControl()?.getOption(EditorOption.find).loop
 			});
 			this.diffNavigatorDisposables.add(this.diffNavigator);
 
diff --git a/src/vs/workbench/browser/parts/editor/titleControl.ts b/src/vs/workbench/browser/parts/editor/titleControl.ts
index 250499da668a8b..82cbfbb3b871a2 100644
--- a/src/vs/workbench/browser/parts/editor/titleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/titleControl.ts
@@ -22,7 +22,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 import { listActiveSelectionBackground, listActiveSelectionForeground } from 'vs/platform/theme/common/colorRegistry';
-import { IThemeService, registerThemingParticipant, Themable } from 'vs/platform/theme/common/themeService';
+import { IThemeService, Themable } from 'vs/platform/theme/common/themeService';
 import { DraggedEditorGroupIdentifier, DraggedEditorIdentifier, DraggedTreeItemsIdentifier, fillEditorsDragData, LocalSelectionTransfer } from 'vs/workbench/browser/dnd';
 import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
 import { BreadcrumbsConfig } from 'vs/workbench/browser/parts/editor/breadcrumbs';
@@ -325,7 +325,7 @@ export abstract class TitleControl extends Themable {
 					label = localize('draggedEditorGroup', "{0} (+{1})", label, this.group.count - 1);
 				}
 
-				applyDragImage(e, label, 'monaco-editor-group-drag-image');
+				applyDragImage(e, label, 'monaco-editor-group-drag-image', this.getColor(listActiveSelectionBackground), this.getColor(listActiveSelectionForeground));
 			}
 		}));
 
@@ -443,16 +443,3 @@ export abstract class TitleControl extends Themable {
 		super.dispose();
 	}
 }
-
-registerThemingParticipant((theme, collector) => {
-
-	// Drag Feedback
-	const dragImageBackground = theme.getColor(listActiveSelectionBackground);
-	const dragImageForeground = theme.getColor(listActiveSelectionForeground);
-	collector.addRule(`
-		.monaco-editor-group-drag-image {
-			background: ${dragImageBackground};
-			color: ${dragImageForeground};
-		}
-	`);
-});
diff --git a/src/vs/workbench/browser/parts/notifications/media/notificationsCenter.css b/src/vs/workbench/browser/parts/notifications/media/notificationsCenter.css
index bd6c9dd9565257..434929c14b843c 100644
--- a/src/vs/workbench/browser/parts/notifications/media/notificationsCenter.css
+++ b/src/vs/workbench/browser/parts/notifications/media/notificationsCenter.css
@@ -10,6 +10,7 @@
 	bottom: 31px;
 	display: none;
 	overflow: hidden;
+	border-radius: 4px;
 }
 
 .monaco-workbench.nostatusbar > .notifications-center {
@@ -42,3 +43,27 @@
 .monaco-workbench > .notifications-center > .notifications-center-header > .notifications-center-header-toolbar .actions-container {
 	justify-content: flex-end;
 }
+
+.monaco-workbench > .notifications-center .notifications-list-container .monaco-list-row[data-last-element="false"] > .notification-list-item {
+	border-bottom: 1px solid var(--vscode-notifications-border);
+}
+
+.monaco-workbench > .notifications-center .notifications-list-container,
+.monaco-workbench > .notifications-center .notifications-list-container .monaco-scrollable-element,
+.monaco-workbench > .notifications-center .notifications-list-container .notification-list-item {
+	border-radius: 0;
+}
+
+/* Icons */
+
+.monaco-workbench > .notifications-center .codicon.codicon-error {
+	color: var(--vscode-notificationsErrorIcon-foreground);
+}
+
+.monaco-workbench > .notifications-center .codicon.codicon-warning {
+	color: var(--vscode-notificationsWarningIcon-foreground);
+}
+
+.monaco-workbench > .notifications-center .codicon.codicon-info {
+	color: var(--vscode-notificationsInfoIcon-foreground);
+}
diff --git a/src/vs/workbench/browser/parts/notifications/media/notificationsList.css b/src/vs/workbench/browser/parts/notifications/media/notificationsList.css
index 87b72a07b53c5d..ddb96275cd2c63 100644
--- a/src/vs/workbench/browser/parts/notifications/media/notificationsList.css
+++ b/src/vs/workbench/browser/parts/notifications/media/notificationsList.css
@@ -9,6 +9,7 @@
 	color: var(--vscode-notifications-foreground);
 	background: var(--vscode-notifications-background);
 	outline-color: var(--vscode-contrastBorder);
+	border-radius: inherit;
 }
 
 .monaco-workbench .notifications-list-container .notification-list-item {
@@ -18,6 +19,7 @@
 	padding: 10px 5px;
 	height: 100%;
 	box-sizing: border-box;
+	border-radius: 4px;
 }
 
 .monaco-workbench .notifications-list-container .notification-offset-helper {
@@ -27,6 +29,10 @@
 	word-wrap: break-word; /* never overflow long words, but break to next line */
 }
 
+.monaco-workbench .notifications-list-container .monaco-scrollable-element {
+	border-radius: 4px;
+}
+
 /** Notification: Main Row */
 
 .monaco-workbench .notifications-list-container .notification-list-item > .notification-list-item-main-row {
@@ -59,9 +65,14 @@
 	-webkit-user-select: text;
 }
 
+.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-message a {
+	color: var(--vscode-notificationLink-foreground);
+}
+
 .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-message a:focus {
 	outline-width: 1px;
 	outline-style: solid;
+	outline-color: var(--vscode-focusBorder);
 }
 
 .monaco-workbench .notifications-list-container .notification-list-item.expanded .notification-list-item-message {
@@ -122,7 +133,7 @@
 
 .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-buttons-container .monaco-text-button {
 	width: fit-content;
-	padding: 5px 10px;
+	padding: 4px 10px;
 	display: inline-block;	/* to enable ellipsis in text overflow */
 	font-size: 12px;
 	overflow: hidden;
diff --git a/src/vs/workbench/browser/parts/notifications/media/notificationsToasts.css b/src/vs/workbench/browser/parts/notifications/media/notificationsToasts.css
index 58b74fb0785d0e..59b0dc841f3edc 100644
--- a/src/vs/workbench/browser/parts/notifications/media/notificationsToasts.css
+++ b/src/vs/workbench/browser/parts/notifications/media/notificationsToasts.css
@@ -30,6 +30,7 @@
 	transform: translate3d(0px, 100%, 0px); /* move the notification 50px to the bottom (to prevent bleed through) */
 	opacity: 0; /*  fade the toast in */
 	transition:	transform 300ms ease-out, opacity 300ms ease-out;
+	border-radius: 4px;
 }
 
 .monaco-workbench.reduce-motion > .notifications-toasts .notification-toast-container > .notification-toast {
@@ -46,3 +47,17 @@
 	transform: none;
 	transition:	none;
 }
+
+/* Icons */
+
+.monaco-workbench > .notifications-toasts .codicon.codicon-error {
+	color: var(--vscode-notificationsErrorIcon-foreground);
+}
+
+.monaco-workbench > .notifications-toasts .codicon.codicon-warning {
+	color: var(--vscode-notificationsWarningIcon-foreground);
+}
+
+.monaco-workbench > .notifications-toasts .codicon.codicon-info {
+	color: var(--vscode-notificationsInfoIcon-foreground);
+}
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts b/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
index ae1ffea2aa397c..d4901ff35f4667 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
@@ -5,8 +5,8 @@
 
 import 'vs/css!./media/notificationsCenter';
 import 'vs/css!./media/notificationsActions';
-import { NOTIFICATIONS_BORDER, NOTIFICATIONS_CENTER_HEADER_FOREGROUND, NOTIFICATIONS_CENTER_HEADER_BACKGROUND, NOTIFICATIONS_CENTER_BORDER } from 'vs/workbench/common/theme';
-import { IThemeService, registerThemingParticipant, Themable } from 'vs/platform/theme/common/themeService';
+import { NOTIFICATIONS_CENTER_HEADER_FOREGROUND, NOTIFICATIONS_CENTER_HEADER_BACKGROUND, NOTIFICATIONS_CENTER_BORDER } from 'vs/workbench/common/theme';
+import { IThemeService, Themable } from 'vs/platform/theme/common/themeService';
 import { INotificationsModel, INotificationChangeEvent, NotificationChangeType, NotificationViewItemContentChangeKind } from 'vs/workbench/common/notifications';
 import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
 import { Emitter } from 'vs/base/common/event';
@@ -275,6 +275,7 @@ export class NotificationsCenter extends Themable implements INotificationsCente
 
 			const headerBackground = this.getColor(NOTIFICATIONS_CENTER_HEADER_BACKGROUND);
 			this.notificationsCenterHeader.style.background = headerBackground ? headerBackground.toString() : '';
+
 		}
 	}
 
@@ -327,10 +328,3 @@ export class NotificationsCenter extends Themable implements INotificationsCente
 	}
 }
 
-
-registerThemingParticipant((theme, collector) => {
-	const notificationBorderColor = theme.getColor(NOTIFICATIONS_BORDER);
-	if (notificationBorderColor) {
-		collector.addRule(`.monaco-workbench > .notifications-center .notifications-list-container .monaco-list-row[data-last-element="false"] > .notification-list-item { border-bottom: 1px solid ${notificationBorderColor}; }`);
-	}
-});
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts b/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
index e474515f5bdc8a..d9b5bab9fca487 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
@@ -196,7 +196,7 @@ export function registerNotificationCommands(center: INotificationsCenterControl
 		weight: KeybindingWeight.WorkbenchContrib,
 		when: ContextKeyExpr.and(NotificationFocusedContext, NotificationsToastsVisibleContext),
 		primary: KeyCode.DownArrow,
-		handler: (accessor) => {
+		handler: () => {
 			toasts.focusNext();
 		}
 	});
@@ -207,7 +207,7 @@ export function registerNotificationCommands(center: INotificationsCenterControl
 		weight: KeybindingWeight.WorkbenchContrib,
 		when: ContextKeyExpr.and(NotificationFocusedContext, NotificationsToastsVisibleContext),
 		primary: KeyCode.UpArrow,
-		handler: (accessor) => {
+		handler: () => {
 			toasts.focusPrevious();
 		}
 	});
@@ -219,7 +219,7 @@ export function registerNotificationCommands(center: INotificationsCenterControl
 		when: ContextKeyExpr.and(NotificationFocusedContext, NotificationsToastsVisibleContext),
 		primary: KeyCode.PageUp,
 		secondary: [KeyCode.Home],
-		handler: (accessor) => {
+		handler: () => {
 			toasts.focusFirst();
 		}
 	});
@@ -231,7 +231,7 @@ export function registerNotificationCommands(center: INotificationsCenterControl
 		when: ContextKeyExpr.and(NotificationFocusedContext, NotificationsToastsVisibleContext),
 		primary: KeyCode.PageDown,
 		secondary: [KeyCode.End],
-		handler: (accessor) => {
+		handler: () => {
 			toasts.focusLast();
 		}
 	});
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsList.ts b/src/vs/workbench/browser/parts/notifications/notificationsList.ts
index 4a58d932d112f4..c718f27c65b4c1 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsList.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsList.ts
@@ -9,17 +9,15 @@ import { isAncestor, trackFocus } from 'vs/base/browser/dom';
 import { WorkbenchList } from 'vs/platform/list/browser/listService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IListOptions } from 'vs/base/browser/ui/list/listWidget';
-import { NOTIFICATIONS_LINKS, NOTIFICATIONS_BACKGROUND, NOTIFICATIONS_ERROR_ICON_FOREGROUND, NOTIFICATIONS_WARNING_ICON_FOREGROUND, NOTIFICATIONS_INFO_ICON_FOREGROUND } from 'vs/workbench/common/theme';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { focusBorder } from 'vs/platform/theme/common/colorRegistry';
+import { NOTIFICATIONS_BACKGROUND } from 'vs/workbench/common/theme';
 import { INotificationViewItem } from 'vs/workbench/common/notifications';
 import { NotificationsListDelegate, NotificationRenderer } from 'vs/workbench/browser/parts/notifications/notificationsViewer';
 import { NotificationActionRunner, CopyNotificationMessageAction } from 'vs/workbench/browser/parts/notifications/notificationsActions';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { assertIsDefined, assertAllDefined } from 'vs/base/common/types';
-import { Codicon } from 'vs/base/common/codicons';
 import { NotificationFocusedContext } from 'vs/workbench/common/contextkeys';
 import { Disposable } from 'vs/base/common/lifecycle';
+import { AriaRole } from 'vs/base/browser/ui/aria/aria';
 
 export interface INotificationsListOptions extends IListOptions<INotificationViewItem> {
 	widgetAriaLabel?: string;
@@ -105,7 +103,7 @@ export class NotificationsList extends Disposable {
 					getWidgetAriaLabel(): string {
 						return options.widgetAriaLabel ?? localize('notificationsList', "Notifications List");
 					},
-					getRole(): string {
+					getRole(): AriaRole {
 						return 'dialog'; // https://github.com/microsoft/vscode/issues/82728
 					}
 				}
@@ -268,48 +266,3 @@ export class NotificationsList extends Disposable {
 		super.dispose();
 	}
 }
-
-registerThemingParticipant((theme, collector) => {
-	const linkColor = theme.getColor(NOTIFICATIONS_LINKS);
-	if (linkColor) {
-		collector.addRule(`.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-message a { color: ${linkColor}; }`);
-	}
-
-	const focusOutline = theme.getColor(focusBorder);
-	if (focusOutline) {
-		collector.addRule(`
-		.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-message a:focus {
-			outline-color: ${focusOutline};
-		}`);
-	}
-
-	// Notification Error Icon
-	const notificationErrorIconForegroundColor = theme.getColor(NOTIFICATIONS_ERROR_ICON_FOREGROUND);
-	if (notificationErrorIconForegroundColor) {
-		collector.addRule(`
-		.monaco-workbench .notifications-center ${Codicon.error.cssSelector},
-		.monaco-workbench .notifications-toasts ${Codicon.error.cssSelector} {
-			color: ${notificationErrorIconForegroundColor};
-		}`);
-	}
-
-	// Notification Warning Icon
-	const notificationWarningIconForegroundColor = theme.getColor(NOTIFICATIONS_WARNING_ICON_FOREGROUND);
-	if (notificationWarningIconForegroundColor) {
-		collector.addRule(`
-		.monaco-workbench .notifications-center ${Codicon.warning.cssSelector},
-		.monaco-workbench .notifications-toasts ${Codicon.warning.cssSelector} {
-			color: ${notificationWarningIconForegroundColor};
-		}`);
-	}
-
-	// Notification Info Icon
-	const notificationInfoIconForegroundColor = theme.getColor(NOTIFICATIONS_INFO_ICON_FOREGROUND);
-	if (notificationInfoIconForegroundColor) {
-		collector.addRule(`
-		.monaco-workbench .notifications-center ${Codicon.info.cssSelector},
-		.monaco-workbench .notifications-toasts ${Codicon.info.cssSelector} {
-			color: ${notificationInfoIconForegroundColor};
-		}`);
-	}
-});
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
index c32bbd3cf3a1d8..3f16b0815bbd79 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IListVirtualDelegate, IListRenderer } from 'vs/base/browser/ui/list/list';
-import { clearNode, addDisposableListener, EventType, EventHelper, $, EventLike } from 'vs/base/browser/dom';
+import { clearNode, addDisposableListener, EventType, EventHelper, $, isEventLike } from 'vs/base/browser/dom';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { URI } from 'vs/base/common/uri';
 import { localize } from 'vs/nls';
@@ -26,6 +26,8 @@ import { DomEmitter } from 'vs/base/browser/event';
 import { Gesture, EventType as GestureEventType } from 'vs/base/browser/touch';
 import { Event } from 'vs/base/common/event';
 import { defaultButtonStyles, defaultProgressBarStyles } from 'vs/platform/theme/browser/defaultStyles';
+import { KeyCode } from 'vs/base/common/keyCodes';
+import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 
 export class NotificationsListDelegate implements IListVirtualDelegate<INotificationViewItem> {
 
@@ -150,20 +152,30 @@ class NotificationMessageRenderer {
 					title = node.href;
 				}
 
-				const anchor = $('a', { href: node.href, title: title, }, node.label);
+				const anchor = $('a', { href: node.href, title, tabIndex: 0 }, node.label);
 
 				if (actionHandler) {
-					const onPointer = (e: EventLike) => {
-						EventHelper.stop(e, true);
+					const handleOpen = (e: unknown) => {
+						if (isEventLike(e)) {
+							EventHelper.stop(e, true);
+						}
+
 						actionHandler.callback(node.href);
 					};
 
-					const onClick = actionHandler.toDispose.add(new DomEmitter(anchor, 'click')).event;
+					const onClick = actionHandler.toDispose.add(new DomEmitter(anchor, EventType.CLICK)).event;
+
+					const onKeydown = actionHandler.toDispose.add(new DomEmitter(anchor, EventType.KEY_DOWN)).event;
+					const onSpaceOrEnter = actionHandler.toDispose.add(Event.chain(onKeydown)).filter(e => {
+						const event = new StandardKeyboardEvent(e);
+
+						return event.equals(KeyCode.Space) || event.equals(KeyCode.Enter);
+					}).event;
 
 					actionHandler.toDispose.add(Gesture.addTarget(anchor));
 					const onTap = actionHandler.toDispose.add(new DomEmitter(anchor, GestureEventType.Tap)).event;
 
-					Event.any(onClick, onTap)(onPointer, null, actionHandler.toDispose);
+					Event.any(onClick, onTap, onSpaceOrEnter)(handleOpen, null, actionHandler.toDispose);
 				}
 
 				messageContainer.appendChild(anchor);
@@ -388,11 +400,6 @@ export class NotificationTemplateRenderer extends Disposable {
 			this.template.message.removeAttribute('title');
 		}
 
-		const links = this.template.message.querySelectorAll('a');
-		for (let i = 0; i < links.length; i++) {
-			links.item(i).tabIndex = -1; // prevent keyboard navigation to links to allow for better keyboard support within a message
-		}
-
 		return messageOverflows;
 	}
 
diff --git a/src/vs/workbench/browser/parts/panel/media/basepanelpart.css b/src/vs/workbench/browser/parts/panel/media/basepanelpart.css
index 1f4f10f21c3ffe..4b0bc7fbaf2655 100644
--- a/src/vs/workbench/browser/parts/panel/media/basepanelpart.css
+++ b/src/vs/workbench/browser/parts/panel/media/basepanelpart.css
@@ -7,7 +7,8 @@
 	justify-content: flex-end;
 }
 
-.monaco-workbench .part.basepanel > .composite.title > .title-actions .monaco-action-bar .action-item {
+.monaco-workbench .part.basepanel > .composite.title > .title-actions .monaco-action-bar .action-item,
+.monaco-workbench .part.basepanel > .composite.title > .global-actions .monaco-action-bar .action-item {
 	margin-right: 4px;
 }
 
diff --git a/src/vs/workbench/browser/parts/panel/media/panelpart.css b/src/vs/workbench/browser/parts/panel/media/panelpart.css
index d3ecdaa0cd2954..4c9153ebddec90 100644
--- a/src/vs/workbench/browser/parts/panel/media/panelpart.css
+++ b/src/vs/workbench/browser/parts/panel/media/panelpart.css
@@ -38,7 +38,7 @@
 .monaco-workbench .part.panel > .content .monaco-editor,
 .monaco-workbench .part.panel > .content .monaco-editor .margin,
 .monaco-workbench .part.panel > .content .monaco-editor .monaco-editor-background {
-	background-color: var(--vscode-panel-background) !important;
+	background-color: var(--vscode-panel-background);
 }
 
 .monaco-workbench .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item:focus .action-label,
diff --git a/src/vs/workbench/browser/parts/panel/panelActions.ts b/src/vs/workbench/browser/parts/panel/panelActions.ts
index 33106362f32916..6eadbe1b0111bc 100644
--- a/src/vs/workbench/browser/parts/panel/panelActions.ts
+++ b/src/vs/workbench/browser/parts/panel/panelActions.ts
@@ -41,7 +41,7 @@ export class TogglePanelAction extends Action2 {
 			toggled: {
 				condition: PanelVisibleContext,
 				title: localize('toggle panel', "Panel"),
-				mnemonicTitle: localize('toggle panel mnemonic', "&&Panel"),
+				mnemonicTitle: localize({ key: 'toggle panel mnemonic', comment: ['&& denotes a mnemonic'] }, "&&Panel"),
 			},
 			f1: true,
 			category: Categories.View,
diff --git a/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css b/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
index 239a92d2f9af79..1cce2eb01d4d40 100644
--- a/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
+++ b/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
@@ -46,7 +46,9 @@
 	height: 100%;
 	vertical-align: top;
 	max-width: 40vw;
+	font-variant-numeric: tabular-nums;
 }
+
 .monaco-workbench .part.statusbar > .items-container > .statusbar-item.has-beak {
 	position: relative;
 }
@@ -148,3 +150,30 @@
 	font-size: 14px;
 	color: inherit;
 }
+
+.monaco-workbench .part.statusbar > .items-container > .statusbar-item .status-bar-info {
+	color: var(--vscode-statusBarItem-prominentForeground);
+	background-color: var(--vscode-statusBarItem-prominentBackground);
+}
+
+.monaco-workbench .part.statusbar > .items-container > .statusbar-item a.status-bar-info:hover:not(.disabled) {
+	background-color: var(--vscode-statusBarItem-prominentHoverBackground);
+}
+
+.monaco-workbench .part.statusbar > .items-container > .statusbar-item a:active:not(.disabled) {
+	outline: 1px solid var(--vscode-contrastActiveBorder) !important;
+	outline-offset: -1px;
+}
+
+.monaco-workbench:not(.hc-light):not(.hc-black) .part.statusbar > .items-container > .statusbar-item a:active:not(.disabled) {
+	background-color: var(--vscode-statusBarItem-activeBackground) !important;
+}
+
+.monaco-workbench .part.statusbar > .items-container > .statusbar-item a:hover:not(.disabled) {
+	outline: 1px dashed var(--vscode-contrastActiveBorder);
+	outline-offset: -1px;
+}
+
+.monaco-workbench:not(.hc-light):not(.hc-black) .part.statusbar > .items-container > .statusbar-item a:hover:not(.disabled) {
+	background-color: var(--vscode-statusBarItem-hoverBackground);
+}
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
index 619d4900d322f0..6a55439437e512 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
@@ -12,8 +12,8 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { StatusbarAlignment, IStatusbarService, IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarStyleOverride, isStatusbarEntryLocation, IStatusbarEntryLocation } from 'vs/workbench/services/statusbar/browser/statusbar';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IAction, Separator, toAction } from 'vs/base/common/actions';
-import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { STATUS_BAR_BACKGROUND, STATUS_BAR_FOREGROUND, STATUS_BAR_NO_FOLDER_BACKGROUND, STATUS_BAR_ITEM_HOVER_BACKGROUND, STATUS_BAR_ITEM_ACTIVE_BACKGROUND, STATUS_BAR_PROMINENT_ITEM_FOREGROUND, STATUS_BAR_PROMINENT_ITEM_BACKGROUND, STATUS_BAR_PROMINENT_ITEM_HOVER_BACKGROUND, STATUS_BAR_BORDER, STATUS_BAR_NO_FOLDER_FOREGROUND, STATUS_BAR_NO_FOLDER_BORDER, STATUS_BAR_ITEM_COMPACT_HOVER_BACKGROUND, STATUS_BAR_ITEM_FOCUS_BORDER, STATUS_BAR_FOCUS_BORDER } from 'vs/workbench/common/theme';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { STATUS_BAR_BACKGROUND, STATUS_BAR_FOREGROUND, STATUS_BAR_NO_FOLDER_BACKGROUND, STATUS_BAR_ITEM_HOVER_BACKGROUND, STATUS_BAR_BORDER, STATUS_BAR_NO_FOLDER_FOREGROUND, STATUS_BAR_NO_FOLDER_BORDER, STATUS_BAR_ITEM_COMPACT_HOVER_BACKGROUND, STATUS_BAR_ITEM_FOCUS_BORDER, STATUS_BAR_FOCUS_BORDER } from 'vs/workbench/common/theme';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { contrastBorder, activeContrastBorder } from 'vs/platform/theme/common/colorRegistry';
 import { EventHelper, createStyleSheet, addDisposableListener, EventType, clearNode } from 'vs/base/browser/dom';
@@ -572,50 +572,4 @@ export class StatusbarPart extends Part implements IStatusbarService {
 	}
 }
 
-registerThemingParticipant((theme, collector) => {
-	if (!isHighContrast(theme.type)) {
-		const statusBarItemHoverBackground = theme.getColor(STATUS_BAR_ITEM_HOVER_BACKGROUND);
-		if (statusBarItemHoverBackground) {
-			collector.addRule(`.monaco-workbench .part.statusbar > .items-container > .statusbar-item a:hover:not(.disabled) { background-color: ${statusBarItemHoverBackground}; }`);
-		}
-
-		const statusBarItemActiveBackground = theme.getColor(STATUS_BAR_ITEM_ACTIVE_BACKGROUND);
-		if (statusBarItemActiveBackground) {
-			// using !important for this rule to win over any background color that is set via JS code for compact items in a group
-			collector.addRule(`.monaco-workbench .part.statusbar > .items-container > .statusbar-item a:active:not(.disabled) { background-color: ${statusBarItemActiveBackground} !important; }`);
-		}
-	}
-
-	const activeContrastBorderColor = theme.getColor(activeContrastBorder);
-	if (activeContrastBorderColor) {
-		collector.addRule(`
-			.monaco-workbench .part.statusbar > .items-container > .statusbar-item a:active:not(.disabled) {
-				outline: 1px solid ${activeContrastBorderColor} !important;
-				outline-offset: -1px;
-			}
-		`);
-		collector.addRule(`
-			.monaco-workbench .part.statusbar > .items-container > .statusbar-item a:hover:not(.disabled) {
-				outline: 1px dashed ${activeContrastBorderColor};
-				outline-offset: -1px;
-			}
-		`);
-	}
-
-	const statusBarProminentItemForeground = theme.getColor(STATUS_BAR_PROMINENT_ITEM_FOREGROUND);
-	if (statusBarProminentItemForeground) {
-		collector.addRule(`.monaco-workbench .part.statusbar > .items-container > .statusbar-item .status-bar-info { color: ${statusBarProminentItemForeground}; }`);
-	}
-
-	const statusBarProminentItemBackground = theme.getColor(STATUS_BAR_PROMINENT_ITEM_BACKGROUND);
-	if (statusBarProminentItemBackground) {
-		collector.addRule(`.monaco-workbench .part.statusbar > .items-container > .statusbar-item .status-bar-info { background-color: ${statusBarProminentItemBackground}; }`);
-	}
-
-	const statusBarProminentItemHoverBackground = theme.getColor(STATUS_BAR_PROMINENT_ITEM_HOVER_BACKGROUND);
-	if (statusBarProminentItemHoverBackground) {
-		collector.addRule(`.monaco-workbench .part.statusbar > .items-container > .statusbar-item a.status-bar-info:hover:not(.disabled) { background-color: ${statusBarProminentItemHoverBackground}; }`);
-	}
-});
-
 registerSingleton(IStatusbarService, StatusbarPart, InstantiationType.Eager);
diff --git a/src/vs/workbench/browser/parts/titlebar/media/menubarControl.css b/src/vs/workbench/browser/parts/titlebar/media/menubarControl.css
new file mode 100644
index 00000000000000..b41a6f925da742
--- /dev/null
+++ b/src/vs/workbench/browser/parts/titlebar/media/menubarControl.css
@@ -0,0 +1,61 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.monaco-workbench .menubar > .menubar-menu-button,
+.monaco-workbench .menubar .toolbar-toggle-more {
+	color: var(--vscode-titleBar-activeForeground);
+}
+
+.monaco-workbench .activitybar .menubar.compact > .menubar-menu-button,
+.monaco-workbench .activitybar .menubar.compact .toolbar-toggle-more {
+	color: var(--vscode-activityBar-inactiveForeground);
+}
+
+.monaco-workbench .activitybar .menubar.compact > .menubar-menu-button.open,
+.monaco-workbench .activitybar .menubar.compact > .menubar-menu-button:focus,
+.monaco-workbench .activitybar .menubar.compact:not(:focus-within) > .menubar-menu-button:hover,
+.monaco-workbench .activitybar .menubar.compact  > .menubar-menu-button.open .toolbar-toggle-more,
+.monaco-workbench .activitybar .menubar.compact > .menubar-menu-button:focus .toolbar-toggle-more,
+.monaco-workbench .activitybar .menubar.compact:not(:focus-within) > .menubar-menu-button:hover .toolbar-toggle-more {
+	color: var(--vscode-activityBar-foreground);
+}
+
+.monaco-workbench .menubar.inactive:not(.compact) > .menubar-menu-button,
+.monaco-workbench .menubar.inactive:not(.compact) > .menubar-menu-button .toolbar-toggle-more  {
+	color: var(--vscode-titleBar-inactiveForeground);
+}
+
+.monaco-workbench .menubar:not(.compact) > .menubar-menu-button.open,
+.monaco-workbench .menubar:not(.compact) > .menubar-menu-button:focus,
+.monaco-workbench .menubar:not(:focus-within):not(.compact) > .menubar-menu-button:hover,
+.monaco-workbench .menubar:not(.compact) > .menubar-menu-button.open .toolbar-toggle-more,
+.monaco-workbench .menubar:not(.compact) > .menubar-menu-button:focus .toolbar-toggle-more,
+.monaco-workbench .menubar:not(:focus-within):not(.compact) > .menubar-menu-button:hover .toolbar-toggle-more {
+	color: var(--vscode-menubar-selectionForeground);
+}
+
+.monaco-workbench .menubar:not(.compact) > .menubar-menu-button.open .menubar-menu-title,
+.monaco-workbench .menubar:not(.compact) > .menubar-menu-button:focus .menubar-menu-title,
+.monaco-workbench .menubar:not(:focus-within):not(.compact) > .menubar-menu-button:hover .menubar-menu-title {
+	background-color: var(--vscode-menubar-selectionBackground);
+}
+
+.monaco-workbench .menubar > .menubar-menu-button:hover .menubar-menu-title  {
+	outline: dashed 1px var(--vscode-menubar-selectionBorder);
+}
+
+.monaco-workbench .menubar > .menubar-menu-button.open .menubar-menu-title,
+.monaco-workbench .menubar > .menubar-menu-button:focus .menubar-menu-title {
+	outline: solid 1px var(--vscode-menubar-selectionBorder);
+}
+
+.monaco-workbench .menubar > .menubar-menu-button.open .menubar-menu-title,
+.monaco-workbench .menubar > .menubar-menu-button:focus .menubar-menu-title,
+.monaco-workbench .menubar > .menubar-menu-button:hover .menubar-menu-title {
+	outline-color: var(--vscode-menubar-selectionBorder);
+	outline-offset: -1px;
+}
+
+
diff --git a/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css b/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
index 0330a06673cdf3..ccdcbe261adefd 100644
--- a/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
+++ b/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
@@ -85,6 +85,10 @@
 	/* see #55435 */
 }
 
+.monaco-workbench .part.titlebar>.titlebar-container .monaco-toolbar .action-item {
+	margin-right: 4px;
+}
+
 /* Window Title Menu */
 .monaco-workbench .part.titlebar>.titlebar-container>.window-title>.command-center {
 	z-index: 2500;
@@ -124,7 +128,7 @@
 	border-bottom-left-radius: 6px;
 	border-top-right-radius: 6px;
 	border-bottom-right-radius: 6px;
-
+	height: 22px;
 	width: 38vw;
 	max-width: 600px;
 }
@@ -238,7 +242,6 @@
 
 .monaco-workbench.mac .part.titlebar>.window-controls-container {
 	width: 70px;
-	height: env(titlebar-area-height, 28px);
 }
 
 .monaco-workbench.web .part.titlebar>.window-controls-container {
@@ -309,3 +312,11 @@
 .monaco-workbench .part.titlebar>.titlebar-container>.layout-controls-container .codicon {
 	color: inherit;
 }
+
+.monaco-workbench .part.titlebar .window-controls-container .window-icon {
+	color: var(--vscode-titleBarActiveForeground);
+}
+
+.monaco-workbench .part.titlebar.inactive .window-controls-container .window-icon {
+	color: var(--vscode-titleBar-inactiveForeground);
+}
diff --git a/src/vs/workbench/browser/parts/titlebar/menubarControl.ts b/src/vs/workbench/browser/parts/titlebar/menubarControl.ts
index 7ccc25f481b404..cefba8ffe63084 100644
--- a/src/vs/workbench/browser/parts/titlebar/menubarControl.ts
+++ b/src/vs/workbench/browser/parts/titlebar/menubarControl.ts
@@ -3,11 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import 'vs/css!./media/menubarControl';
 import { localize } from 'vs/nls';
 import { IMenuService, MenuId, IMenu, SubmenuItemAction, registerAction2, Action2, MenuItemAction, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { registerThemingParticipant, IThemeService } from 'vs/platform/theme/common/themeService';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { MenuBarVisibility, getTitleBarStyle, IWindowOpenable, getMenuBarVisibility } from 'vs/platform/window/common/window';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IAction, Action, SubmenuAction, Separator, IActionRunner, ActionRunner, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from 'vs/base/common/actions';
 import { addDisposableListener, Dimension, EventType } from 'vs/base/browser/dom';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
@@ -17,9 +18,8 @@ import { Event, Emitter } from 'vs/base/common/event';
 import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { IRecentlyOpened, isRecentFolder, IRecent, isRecentWorkspace, IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
 import { RunOnceScheduler } from 'vs/base/common/async';
-import { MENUBAR_SELECTION_FOREGROUND, MENUBAR_SELECTION_BACKGROUND, MENUBAR_SELECTION_BORDER, TITLE_BAR_ACTIVE_FOREGROUND, TITLE_BAR_INACTIVE_FOREGROUND, ACTIVITY_BAR_FOREGROUND, ACTIVITY_BAR_INACTIVE_FOREGROUND } from 'vs/workbench/common/theme';
 import { URI } from 'vs/base/common/uri';
-import { ILabelService } from 'vs/platform/label/common/label';
+import { ILabelService, Verbosity } from 'vs/platform/label/common/label';
 import { IUpdateService, StateType } from 'vs/platform/update/common/update';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
@@ -102,8 +102,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
 		original: 'Terminal',
 		mnemonicTitle: localize({ key: 'mTerminal', comment: ['&& denotes a mnemonic'] }, "&&Terminal")
 	},
-	order: 7,
-	when: ContextKeyExpr.has('terminalProcessSupported')
+	order: 7
 });
 
 MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
@@ -121,7 +120,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
 	title: {
 		value: 'Preferences',
 		original: 'Preferences',
-		mnemonicTitle: localize('mPreferences', "Preferences")
+		mnemonicTitle: localize({ key: 'mPreferences', comment: ['&& denotes a mnemonic'] }, "Preferences")
 	},
 	when: IsMacNativeContext,
 	order: 9
@@ -318,12 +317,12 @@ export abstract class MenubarControl extends Disposable {
 
 		if (isRecentFolder(recent)) {
 			uri = recent.folderUri;
-			label = recent.label || this.labelService.getWorkspaceLabel(uri, { verbose: true });
+			label = recent.label || this.labelService.getWorkspaceLabel(uri, { verbose: Verbosity.LONG });
 			commandId = 'openRecentFolder';
 			openable = { folderUri: uri };
 		} else if (isRecentWorkspace(recent)) {
 			uri = recent.workspace.configPath;
-			label = recent.label || this.labelService.getWorkspaceLabel(recent.workspace, { verbose: true });
+			label = recent.label || this.labelService.getWorkspaceLabel(recent.workspace, { verbose: Verbosity.LONG });
 			commandId = 'openRecentWorkspace';
 			openable = { workspaceUri: uri };
 		} else {
@@ -421,98 +420,6 @@ export class CustomMenubarControl extends MenubarControl {
 		this.registerListeners();
 
 		this.registerActions();
-
-		registerThemingParticipant((theme, collector) => {
-			const menubarActiveWindowFgColor = theme.getColor(TITLE_BAR_ACTIVE_FOREGROUND);
-			if (menubarActiveWindowFgColor) {
-				collector.addRule(`
-				.monaco-workbench .menubar > .menubar-menu-button,
-				.monaco-workbench .menubar .toolbar-toggle-more {
-					color: ${menubarActiveWindowFgColor};
-				}
-				`);
-			}
-
-			const activityBarInactiveFgColor = theme.getColor(ACTIVITY_BAR_INACTIVE_FOREGROUND);
-			if (activityBarInactiveFgColor) {
-				collector.addRule(`
-				.monaco-workbench .activitybar .menubar.compact > .menubar-menu-button,
-				.monaco-workbench .activitybar .menubar.compact .toolbar-toggle-more {
-					color: ${activityBarInactiveFgColor};
-				}
-				`);
-			}
-
-			const activityBarFgColor = theme.getColor(ACTIVITY_BAR_FOREGROUND);
-			if (activityBarFgColor) {
-				collector.addRule(`
-				.monaco-workbench .activitybar .menubar.compact > .menubar-menu-button.open,
-				.monaco-workbench .activitybar .menubar.compact > .menubar-menu-button:focus,
-				.monaco-workbench .activitybar .menubar.compact:not(:focus-within) > .menubar-menu-button:hover,
-				.monaco-workbench .activitybar .menubar.compact  > .menubar-menu-button.open .toolbar-toggle-more,
-				.monaco-workbench .activitybar .menubar.compact > .menubar-menu-button:focus .toolbar-toggle-more,
-				.monaco-workbench .activitybar .menubar.compact:not(:focus-within) > .menubar-menu-button:hover .toolbar-toggle-more {
-					color: ${activityBarFgColor};
-				}
-			`);
-			}
-
-			const menubarInactiveWindowFgColor = theme.getColor(TITLE_BAR_INACTIVE_FOREGROUND);
-			if (menubarInactiveWindowFgColor) {
-				collector.addRule(`
-					.monaco-workbench .menubar.inactive:not(.compact) > .menubar-menu-button,
-					.monaco-workbench .menubar.inactive:not(.compact) > .menubar-menu-button .toolbar-toggle-more  {
-						color: ${menubarInactiveWindowFgColor};
-					}
-				`);
-			}
-
-			const menubarSelectedFgColor = theme.getColor(MENUBAR_SELECTION_FOREGROUND);
-			if (menubarSelectedFgColor) {
-				collector.addRule(`
-					.monaco-workbench .menubar:not(.compact) > .menubar-menu-button.open,
-					.monaco-workbench .menubar:not(.compact) > .menubar-menu-button:focus,
-					.monaco-workbench .menubar:not(:focus-within):not(.compact) > .menubar-menu-button:hover,
-					.monaco-workbench .menubar:not(.compact) > .menubar-menu-button.open .toolbar-toggle-more,
-					.monaco-workbench .menubar:not(.compact) > .menubar-menu-button:focus .toolbar-toggle-more,
-					.monaco-workbench .menubar:not(:focus-within):not(.compact) > .menubar-menu-button:hover .toolbar-toggle-more {
-						color: ${menubarSelectedFgColor};
-					}
-				`);
-			}
-
-			const menubarSelectedBgColor = theme.getColor(MENUBAR_SELECTION_BACKGROUND);
-			if (menubarSelectedBgColor) {
-				collector.addRule(`
-					.monaco-workbench .menubar:not(.compact) > .menubar-menu-button.open .menubar-menu-title,
-					.monaco-workbench .menubar:not(.compact) > .menubar-menu-button:focus .menubar-menu-title,
-					.monaco-workbench .menubar:not(:focus-within):not(.compact) > .menubar-menu-button:hover .menubar-menu-title {
-						background-color: ${menubarSelectedBgColor};
-					}
-				`);
-			}
-
-			const menubarSelectedBorderColor = theme.getColor(MENUBAR_SELECTION_BORDER);
-			if (menubarSelectedBorderColor) {
-				collector.addRule(`
-					.monaco-workbench .menubar > .menubar-menu-button:hover .menubar-menu-title  {
-						outline: dashed 1px;
-					}
-
-					.monaco-workbench .menubar > .menubar-menu-button.open .menubar-menu-title,
-					.monaco-workbench .menubar > .menubar-menu-button:focus .menubar-menu-title {
-						outline: solid 1px;
-					}
-
-					.monaco-workbench .menubar > .menubar-menu-button.open .menubar-menu-title,
-					.monaco-workbench .menubar > .menubar-menu-button:focus .menubar-menu-title,
-					.monaco-workbench .menubar > .menubar-menu-button:hover .menubar-menu-title {
-						outline-color: ${menubarSelectedBorderColor};
-						outline-offset: -1px;
-					}
-				`);
-			}
-		});
 	}
 
 	protected doUpdateMenubar(firstTime: boolean): void {
diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
index 62c9bb2dc3bfe4..1e7e6785d2eb6e 100644
--- a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
+++ b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
@@ -7,14 +7,14 @@ import 'vs/css!./media/titlebarpart';
 import { localize } from 'vs/nls';
 import { Part } from 'vs/workbench/browser/part';
 import { ITitleService, ITitleProperties } from 'vs/workbench/services/title/common/titleService';
-import { getZoomFactor, isWCOVisible } from 'vs/base/browser/browser';
+import { getZoomFactor, isWCOEnabled } from 'vs/base/browser/browser';
 import { MenuBarVisibility, getTitleBarStyle, getMenuBarVisibility } from 'vs/platform/window/common/window';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { IThemeService, registerThemingParticipant, ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { IThemeService, ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { TITLE_BAR_ACTIVE_BACKGROUND, TITLE_BAR_ACTIVE_FOREGROUND, TITLE_BAR_INACTIVE_FOREGROUND, TITLE_BAR_INACTIVE_BACKGROUND, TITLE_BAR_BORDER, WORKBENCH_BACKGROUND } from 'vs/workbench/common/theme';
 import { isMacintosh, isWindows, isLinux, isWeb, isNative } from 'vs/base/common/platform';
 import { Color } from 'vs/base/common/color';
@@ -48,7 +48,7 @@ export class TitlebarPart extends Part implements ITitleService {
 	readonly minimumWidth: number = 0;
 	readonly maximumWidth: number = Number.POSITIVE_INFINITY;
 	get minimumHeight(): number {
-		const value = this.isCommandCenterVisible || (isWeb && isWCOVisible()) ? 35 : 30;
+		const value = this.isCommandCenterVisible || (isWeb && isWCOEnabled()) ? 35 : 30;
 		return value / (this.useCounterZoom ? getZoomFactor() : 1);
 	}
 
@@ -463,26 +463,6 @@ export class TitlebarPart extends Part implements ITitleService {
 	}
 }
 
-registerThemingParticipant((theme, collector) => {
-	const titlebarActiveFg = theme.getColor(TITLE_BAR_ACTIVE_FOREGROUND);
-	if (titlebarActiveFg) {
-		collector.addRule(`
-		.monaco-workbench .part.titlebar .window-controls-container .window-icon {
-			color: ${titlebarActiveFg};
-		}
-		`);
-	}
-
-	const titlebarInactiveFg = theme.getColor(TITLE_BAR_INACTIVE_FOREGROUND);
-	if (titlebarInactiveFg) {
-		collector.addRule(`
-		.monaco-workbench .part.titlebar.inactive .window-controls-container .window-icon {
-				color: ${titlebarInactiveFg};
-			}
-		`);
-	}
-});
-
 
 class ToogleConfigAction extends Action2 {
 
diff --git a/src/vs/workbench/browser/parts/titlebar/windowTitle.ts b/src/vs/workbench/browser/parts/titlebar/windowTitle.ts
index d6e0cd2a935750..4413d3f80a7ba5 100644
--- a/src/vs/workbench/browser/parts/titlebar/windowTitle.ts
+++ b/src/vs/workbench/browser/parts/titlebar/windowTitle.ts
@@ -17,7 +17,7 @@ import { URI } from 'vs/base/common/uri';
 import { trim } from 'vs/base/common/strings';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { template } from 'vs/base/common/labels';
-import { ILabelService } from 'vs/platform/label/common/label';
+import { ILabelService, Verbosity as LabelVerbosity } from 'vs/platform/label/common/label';
 import { Emitter } from 'vs/base/common/event';
 import { RunOnceScheduler } from 'vs/base/common/async';
 import { IProductService } from 'vs/platform/product/common/productService';
@@ -226,6 +226,7 @@ export class WindowTitle extends Disposable {
 		const activeFolderMedium = editorFolderResource ? this.labelService.getUriLabel(editorFolderResource, { relative: true }) : '';
 		const activeFolderLong = editorFolderResource ? this.labelService.getUriLabel(editorFolderResource) : '';
 		const rootName = this.labelService.getWorkspaceLabel(workspace);
+		const rootNameShort = this.labelService.getWorkspaceLabel(workspace, { verbose: LabelVerbosity.SHORT });
 		const rootPath = root ? this.labelService.getUriLabel(root) : '';
 		const folderName = folder ? folder.name : '';
 		const folderPath = folder ? this.labelService.getUriLabel(folder.uri) : '';
@@ -243,6 +244,7 @@ export class WindowTitle extends Disposable {
 			activeFolderLong,
 			rootName,
 			rootPath,
+			rootNameShort,
 			folderName,
 			folderPath,
 			dirty,
diff --git a/src/vs/workbench/browser/parts/views/media/views.css b/src/vs/workbench/browser/parts/views/media/views.css
index 2b6c61184a95a5..2dc67f0fe64bb6 100644
--- a/src/vs/workbench/browser/parts/views/media/views.css
+++ b/src/vs/workbench/browser/parts/views/media/views.css
@@ -17,6 +17,14 @@
 
 /* Misc */
 
+.file-icon-themable-tree .monaco-list-row .content .monaco-highlighted-label .highlight,
+.monaco-tl-contents .monaco-highlighted-label .highlight {
+	color: unset !important;
+	background-color: var(--vscode-list-filterMatchBackground);
+	border: 1px dotted var(--vscode-list-filterMatchBorder);
+	box-sizing: border-box;
+}
+
 .monaco-workbench .tree-explorer-viewlet-tree-view {
 	height: 100%;
 }
@@ -266,7 +274,7 @@
 
 .panel > .title .monaco-action-bar .action-item.viewpane-filter-container {
 	max-width: 400px;
-	min-width: 300px;
+	min-width: 150px;
 	margin-right: 10px;
 }
 
diff --git a/src/vs/workbench/browser/parts/views/treeView.ts b/src/vs/workbench/browser/parts/views/treeView.ts
index 479ab7299d157d..6e7a33f8c14677 100644
--- a/src/vs/workbench/browser/parts/views/treeView.ts
+++ b/src/vs/workbench/browser/parts/views/treeView.ts
@@ -50,9 +50,8 @@ import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { IProgressService } from 'vs/platform/progress/common/progress';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { focusBorder, listFilterMatchHighlight, listFilterMatchHighlightBorder, textCodeBlockBackground, textLinkForeground } from 'vs/platform/theme/common/colorRegistry';
 import { ColorScheme } from 'vs/platform/theme/common/theme';
-import { FileThemeIcon, FolderThemeIcon, IThemeService, registerThemingParticipant, ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { FileThemeIcon, FolderThemeIcon, IThemeService, ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { DraggedTreeItemsIdentifier, fillEditorsDragData, LocalSelectionTransfer } from 'vs/workbench/browser/dnd';
 import { IResourceLabel, ResourceLabels } from 'vs/workbench/browser/labels';
 import { API_OPEN_DIFF_EDITOR_COMMAND_ID, API_OPEN_EDITOR_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
@@ -68,6 +67,8 @@ import { CodeDataTransfers } from 'vs/platform/dnd/browser/dnd';
 import { addExternalEditorsDropData, toVSDataTransfer } from 'vs/editor/browser/dnd';
 import { CheckboxStateHandler, TreeItemCheckbox } from 'vs/workbench/browser/parts/views/checkbox';
 import { setTimeout0 } from 'vs/base/common/platform';
+import { AriaRole } from 'vs/base/browser/ui/aria/aria';
+import { TrustedTelemetryValue } from 'vs/platform/telemetry/common/telemetryUtils';
 
 export class TreeViewPane extends ViewPane {
 
@@ -647,7 +648,7 @@ abstract class AbstractTreeView extends Disposable implements ITreeView {
 						return buildAriaLabel;
 					}
 				},
-				getRole(element: ITreeItem): string | undefined {
+				getRole(element: ITreeItem): AriaRole | undefined {
 					return element.accessibilityInformation?.role ?? 'treeitem';
 				},
 				getWidgetAriaLabel(): string {
@@ -908,6 +909,7 @@ abstract class AbstractTreeView extends Disposable implements ITreeView {
 		const tree = this.tree;
 		if (tree && this.visible) {
 			this.refreshing = true;
+			const oldSelection = tree.getSelection();
 			try {
 				await Promise.all(elements.map(element => tree.updateChildren(element, true, true)));
 			} catch (e) {
@@ -916,6 +918,10 @@ abstract class AbstractTreeView extends Disposable implements ITreeView {
 				// Ideally this is fixable, so log instead of ignoring so the error is preserved.
 				this.logService.error(e);
 			}
+			const newSelection = tree.getSelection();
+			if (oldSelection.length !== newSelection.length || oldSelection.some((value, index) => value.handle !== newSelection[index].handle)) {
+				this._onDidChangeSelection.fire(newSelection);
+			}
 			this.refreshing = false;
 			this._onDidCompleteRefresh.fire();
 			this.updateContentAreas();
@@ -1005,33 +1011,6 @@ class TreeDataSource implements IAsyncDataSource<ITreeItem, ITreeItem> {
 	}
 }
 
-// todo@jrieken,sandy make this proper and contributable from extensions
-registerThemingParticipant((theme, collector) => {
-
-	const matchBackgroundColor = theme.getColor(listFilterMatchHighlight);
-	if (matchBackgroundColor) {
-		collector.addRule(`.file-icon-themable-tree .monaco-list-row .content .monaco-highlighted-label .highlight { color: unset !important; background-color: ${matchBackgroundColor}; }`);
-		collector.addRule(`.monaco-tl-contents .monaco-highlighted-label .highlight { color: unset !important; background-color: ${matchBackgroundColor}; }`);
-	}
-	const matchBorderColor = theme.getColor(listFilterMatchHighlightBorder);
-	if (matchBorderColor) {
-		collector.addRule(`.file-icon-themable-tree .monaco-list-row .content .monaco-highlighted-label .highlight { color: unset !important; border: 1px dotted ${matchBorderColor}; box-sizing: border-box; }`);
-		collector.addRule(`.monaco-tl-contents .monaco-highlighted-label .highlight { color: unset !important; border: 1px dotted ${matchBorderColor}; box-sizing: border-box; }`);
-	}
-	const link = theme.getColor(textLinkForeground);
-	if (link) {
-		collector.addRule(`.tree-explorer-viewlet-tree-view > .message a { color: ${link}; }`);
-	}
-	const focusBorderColor = theme.getColor(focusBorder);
-	if (focusBorderColor) {
-		collector.addRule(`.tree-explorer-viewlet-tree-view > .message a:focus { outline: 1px solid ${focusBorderColor}; outline-offset: -1px; }`);
-	}
-	const codeBackground = theme.getColor(textCodeBlockBackground);
-	if (codeBackground) {
-		collector.addRule(`.tree-explorer-viewlet-tree-view > .message code { background-color: ${codeBackground}; }`);
-	}
-});
-
 interface ITreeExplorerTemplateData {
 	readonly elementDisposable: DisposableStore;
 	readonly container: HTMLElement;
@@ -1485,7 +1464,7 @@ export class CustomTreeView extends AbstractTreeView {
 	protected activate() {
 		if (!this.activated) {
 			type ExtensionViewTelemetry = {
-				extensionId: string;
+				extensionId: TrustedTelemetryValue<string>;
 				id: string;
 			};
 			type ExtensionViewTelemetryMeta = {
@@ -1495,7 +1474,7 @@ export class CustomTreeView extends AbstractTreeView {
 				comment: 'Helps to gain insights on what extension contributed views are most popular';
 			};
 			this.telemetryService.publicLog2<ExtensionViewTelemetry, ExtensionViewTelemetryMeta>('Extension:ViewActivate', {
-				extensionId: this.extensionId,
+				extensionId: new TrustedTelemetryValue(this.extensionId),
 				id: this.id,
 			});
 			this.createTree();
@@ -1571,6 +1550,7 @@ export class CustomTreeViewDragAndDrop implements ITreeDragAndDrop<ITreeItem> {
 		this.dragCancellationToken = new CancellationTokenSource();
 		this.treeViewsDragAndDropService.addDragOperationTransfer(uuid, this.handleDragAndLog(this.dndController, itemHandles, uuid, this.dragCancellationToken.token));
 		this.treeItemsTransfer.setData([new DraggedTreeItemsIdentifier(uuid)], DraggedTreeItemsIdentifier.prototype);
+		originalEvent.dataTransfer.clearData(Mimes.text);
 		if (this.dndController.dragMimeTypes.find((element) => element === Mimes.uriList)) {
 			// Add the type that the editor knows
 			originalEvent.dataTransfer?.setData(DataTransfers.RESOURCES, '');
diff --git a/src/vs/workbench/browser/parts/views/viewFilter.ts b/src/vs/workbench/browser/parts/views/viewFilter.ts
index 9dc6431198301b..7b9825aa8f04bd 100644
--- a/src/vs/workbench/browser/parts/views/viewFilter.ts
+++ b/src/vs/workbench/browser/parts/views/viewFilter.ts
@@ -230,7 +230,7 @@ export class FilterWidget extends Widget {
 
 	private onInputKeyDown(event: StandardKeyboardEvent, filterInputBox: HistoryInputBox) {
 		let handled = false;
-		if (event.equals(KeyCode.Tab)) {
+		if (event.equals(KeyCode.Tab) && !this.toolbar.isEmpty()) {
 			this.toolbar.focus();
 			handled = true;
 		}
diff --git a/src/vs/workbench/browser/parts/views/viewPane.ts b/src/vs/workbench/browser/parts/views/viewPane.ts
index de16d32b0aaa6b..c11f99ac058e8f 100644
--- a/src/vs/workbench/browser/parts/views/viewPane.ts
+++ b/src/vs/workbench/browser/parts/views/viewPane.ts
@@ -45,8 +45,6 @@ import { FilterWidget, IFilterWidgetOptions } from 'vs/workbench/browser/parts/v
 import { BaseActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { defaultButtonStyles, defaultProgressBarStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 
 export interface IViewPaneOptions extends IPaneOptions {
 	id: string;
@@ -85,25 +83,14 @@ class ViewWelcomeController {
 
 	private defaultItem: IItem | undefined;
 	private items: IItem[] = [];
-	get contents(): Promise<IViewContentDescriptor[]> {
+	get contents(): IViewContentDescriptor[] {
 		const visibleItems = this.items.filter(v => v.visible);
 
 		if (visibleItems.length === 0 && this.defaultItem) {
-			return Promise.resolve([this.defaultItem.descriptor]);
+			return [this.defaultItem.descriptor];
 		}
 
-		const workspace = this.workspaceContextService.getWorkspace();
-		const workspaceFolder = workspace.folders.length > 0 ? workspace.folders[0] : undefined;
-
-		return Promise.all(visibleItems.map(async (v) => {
-			return {
-				content: await this.configurationResolverService.resolveWithInteractionReplace(workspaceFolder, v.descriptor.content),
-				when: v.descriptor.when,
-				group: v.descriptor.group,
-				order: v.descriptor.order,
-				precondition: v.descriptor.precondition
-			};
-		}));
+		return visibleItems.map(v => v.descriptor);
 	}
 
 	private disposables = new DisposableStore();
@@ -111,8 +98,6 @@ class ViewWelcomeController {
 	constructor(
 		private id: string,
 		@IContextKeyService private contextKeyService: IContextKeyService,
-		@IConfigurationResolverService private readonly configurationResolverService: IConfigurationResolverService,
-		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService
 	) {
 		contextKeyService.onDidChangeContext(this.onDidChangeContext, this, this.disposables);
 		Event.filter(viewsRegistry.onDidChangeViewWelcomeContent, id => id === this.id)(this.onDidChangeViewWelcomeContent, this, this.disposables);
@@ -243,7 +228,7 @@ export abstract class ViewPane extends Pane implements IView {
 		this.menuActions = this._register(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, this.scopedContextKeyService])).createInstance(CompositeMenuActions, options.titleMenuId ?? MenuId.ViewTitle, MenuId.ViewTitleContext, { shouldForwardArgs: !options.donotForwardArgs }));
 		this._register(this.menuActions.onDidChange(() => this.updateActions()));
 
-		this.viewWelcomeController = this.instantiationService.createInstance(ViewWelcomeController, this.id);
+		this.viewWelcomeController = new ViewWelcomeController(this.id, contextKeyService);
 	}
 
 	override get headerVisible(): boolean {
@@ -318,9 +303,12 @@ export abstract class ViewPane extends Pane implements IView {
 
 		this._register(addDisposableListener(actions, EventType.CLICK, e => e.preventDefault()));
 
-		this._register(this.viewDescriptorService.getViewContainerModel(this.viewDescriptorService.getViewContainerByViewId(this.id)!)!.onDidChangeContainerInfo(({ title }) => {
-			this.updateTitle(this.title);
-		}));
+		const viewContainerModel = this.viewDescriptorService.getViewContainerByViewId(this.id);
+		if (viewContainerModel) {
+			this._register(this.viewDescriptorService.getViewContainerModel(viewContainerModel).onDidChangeContainerInfo(({ title }) => this.updateTitle(this.title)));
+		} else {
+			console.error(`View container model not found for view ${this.id}`);
+		}
 
 		const onDidRelevantConfigurationChange = Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration(ViewPane.AlwaysShowActionsConfig));
 		this._register(onDidRelevantConfigurationChange(this.updateActionsVisibility, this));
@@ -564,7 +552,7 @@ export abstract class ViewPane extends Pane implements IView {
 		// Subclasses to implement for saving state
 	}
 
-	private async updateViewWelcome(): Promise<void> {
+	private updateViewWelcome(): void {
 		this.viewWelcomeDisposable.dispose();
 
 		if (!this.shouldShowWelcome()) {
@@ -574,7 +562,7 @@ export abstract class ViewPane extends Pane implements IView {
 			return;
 		}
 
-		const contents = await this.viewWelcomeController.contents;
+		const contents = this.viewWelcomeController.contents;
 
 		if (contents.length === 0) {
 			this.bodyContainer.classList.remove('welcome');
@@ -704,9 +692,11 @@ export abstract class FilterViewPane extends ViewPane {
 			this.updateActions();
 			if (!shouldShowFilterInHeader) {
 				append(this.filterContainer!, this.filterWidget.element);
-				height = height - 44;
 			}
 		}
+		if (!shouldShowFilterInHeader) {
+			height = height - 44;
+		}
 		this.filterWidget.layout(width);
 		this.layoutBodyContent(height, width);
 	}
diff --git a/src/vs/workbench/browser/parts/views/viewPaneContainer.ts b/src/vs/workbench/browser/parts/views/viewPaneContainer.ts
index fced1ffb0e3a2d..47da5fabdd195e 100644
--- a/src/vs/workbench/browser/parts/views/viewPaneContainer.ts
+++ b/src/vs/workbench/browser/parts/views/viewPaneContainer.ts
@@ -1072,8 +1072,7 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
 		}
 		if (!this.areExtensionsReady) {
 			if (this.visibleViewsCountFromCache === undefined) {
-				// TODO @sbatten fix hack for #91367
-				return this.viewDescriptorService.getViewContainerLocation(this.viewContainer) === ViewContainerLocation.Panel;
+				return this.paneItems[0].pane.isExpanded();
 			}
 			// Check in cache so that view do not jump. See #29609
 			return this.visibleViewsCountFromCache === 1;
diff --git a/src/vs/workbench/browser/style.ts b/src/vs/workbench/browser/style.ts
index 31d0aa0344000e..d70a5c0e797a67 100644
--- a/src/vs/workbench/browser/style.ts
+++ b/src/vs/workbench/browser/style.ts
@@ -5,122 +5,24 @@
 
 import 'vs/css!./media/style';
 import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { iconForeground, foreground, selectionBackground, focusBorder, listHighlightForeground, inputPlaceholderForeground, toolbarHoverBackground, toolbarActiveBackground, toolbarHoverOutline, listFocusHighlightForeground } from 'vs/platform/theme/common/colorRegistry';
 import { WORKBENCH_BACKGROUND, TITLE_BAR_ACTIVE_BACKGROUND } from 'vs/workbench/common/theme';
 import { isWeb, isIOS, isMacintosh, isWindows } from 'vs/base/common/platform';
 import { createMetaElement } from 'vs/base/browser/dom';
 import { isSafari, isStandalone } from 'vs/base/browser/browser';
-import { isHighContrast } from 'vs/platform/theme/common/theme';
+import { selectionBackground } from 'vs/platform/theme/common/colorRegistry';
 
 registerThemingParticipant((theme, collector) => {
 
-	// Foreground
-	const windowForeground = theme.getColor(foreground);
-	if (windowForeground) {
-		collector.addRule(`.monaco-workbench { color: ${windowForeground}; }`);
-	}
-
-	// Background (We need to set the workbench background color so that on Windows we get subpixel-antialiasing)
+	// Background (helps for subpixel-antialiasing on Windows)
 	const workbenchBackground = WORKBENCH_BACKGROUND(theme);
 	collector.addRule(`.monaco-workbench { background-color: ${workbenchBackground}; }`);
 
-	// Icon defaults
-	const iconForegroundColor = theme.getColor(iconForeground);
-	if (iconForegroundColor) {
-		collector.addRule(`.codicon { color: ${iconForegroundColor}; }`);
-	}
-
-	// Selection
+	// Selection (do NOT remove - https://github.com/microsoft/vscode/issues/169662)
 	const windowSelectionBackground = theme.getColor(selectionBackground);
 	if (windowSelectionBackground) {
 		collector.addRule(`.monaco-workbench ::selection { background-color: ${windowSelectionBackground}; }`);
 	}
 
-	// Input placeholder
-	const placeholderForeground = theme.getColor(inputPlaceholderForeground);
-	if (placeholderForeground) {
-		collector.addRule(`
-			.monaco-workbench input::placeholder { color: ${placeholderForeground}; }
-			.monaco-workbench input::-webkit-input-placeholder  { color: ${placeholderForeground}; }
-			.monaco-workbench input::-moz-placeholder { color: ${placeholderForeground}; }
-		`);
-		collector.addRule(`
-			.monaco-workbench textarea::placeholder { color: ${placeholderForeground}; }
-			.monaco-workbench textarea::-webkit-input-placeholder { color: ${placeholderForeground}; }
-			.monaco-workbench textarea::-moz-placeholder { color: ${placeholderForeground}; }
-		`);
-	}
-
-	// List highlight
-	const listHighlightForegroundColor = theme.getColor(listHighlightForeground);
-	if (listHighlightForegroundColor) {
-		collector.addRule(`
-			.monaco-workbench .monaco-list .monaco-list-row .monaco-highlighted-label .highlight {
-				color: ${listHighlightForegroundColor};
-			}
-		`);
-	}
-
-	// List highlight w/ focus
-	const listHighlightFocusForegroundColor = theme.getColor(listFocusHighlightForeground);
-	if (listHighlightFocusForegroundColor) {
-		collector.addRule(`
-			.monaco-workbench .monaco-list .monaco-list-row.focused .monaco-highlighted-label .highlight {
-				color: ${listHighlightFocusForegroundColor};
-			}
-		`);
-	}
-
-	// Focus outline
-	const focusOutline = theme.getColor(focusBorder);
-	if (focusOutline) {
-		collector.addRule(`
-		.monaco-workbench [tabindex="0"]:focus,
-		.monaco-workbench [tabindex="-1"]:focus,
-		.monaco-workbench .synthetic-focus,
-		.monaco-workbench select:focus,
-		.monaco-workbench .monaco-list:not(.element-focused):focus:before,
-		.monaco-workbench input[type="button"]:focus,
-		.monaco-workbench input[type="text"]:focus,
-		.monaco-workbench button:focus,
-		.monaco-workbench textarea:focus,
-		.monaco-workbench input[type="search"]:focus,
-		.monaco-workbench input[type="checkbox"]:focus {
-			outline-color: ${focusOutline};
-		}
-		`);
-	}
-
-	// High Contrast theme overwrites for outline
-	if (isHighContrast(theme.type)) {
-		collector.addRule(`
-		.hc-black [tabindex="0"]:focus,
-		.hc-black [tabindex="-1"]:focus,
-		.hc-black .synthetic-focus,
-		.hc-black select:focus,
-		.hc-black input[type="button"]:focus,
-		.hc-black input[type="text"]:focus,
-		.hc-black textarea:focus,
-		.hc-black input[type="checkbox"]:focus,
-		.hc-light [tabindex="0"]:focus,
-		.hc-light [tabindex="-1"]:focus,
-		.hc-light .synthetic-focus,
-		.hc-light select:focus,
-		.hc-light input[type="button"]:focus,
-		.hc-light input[type="text"]:focus,
-		.hc-light textarea:focus,
-		.hc-light input[type="checkbox"]:focus {
-			outline-style: solid;
-			outline-width: 1px;
-		}
-
-		.hc-black .synthetic-focus input {,
-		.hc-light .synthetic-focus input
-			background: transparent; /* Search input focus fix when in high contrast */
-		}
-		`);
-	}
-
 	// Update <meta name="theme-color" content=""> based on selected theme
 	if (isWeb) {
 		const titleBackground = theme.getColor(TITLE_BAR_ACTIVE_BACKGROUND);
@@ -156,39 +58,6 @@ registerThemingParticipant((theme, collector) => {
 	if (isIOS && isStandalone()) {
 		collector.addRule(`body { background-color: ${workbenchBackground}; }`);
 	}
-
-	// Action bars
-	const toolbarHoverBackgroundColor = theme.getColor(toolbarHoverBackground);
-	if (toolbarHoverBackgroundColor) {
-		collector.addRule(`
-		.monaco-action-bar:not(.vertical) .action-label:not(.disabled):hover {
-			background-color: ${toolbarHoverBackgroundColor};
-		}
-		.monaco-action-bar:not(.vertical) .monaco-dropdown-with-primary:not(.disabled):hover {
-			background-color: ${toolbarHoverBackgroundColor};
-		}
-	`);
-	}
-
-	const toolbarActiveBackgroundColor = theme.getColor(toolbarActiveBackground);
-	if (toolbarActiveBackgroundColor) {
-		collector.addRule(`
-		.monaco-action-bar:not(.vertical) .action-item.active .action-label:not(.disabled),
-		.monaco-action-bar:not(.vertical) .monaco-dropdown.active .action-label:not(.disabled) {
-			background-color: ${toolbarActiveBackgroundColor};
-		}
-	`);
-	}
-
-	const toolbarHoverOutlineColor = theme.getColor(toolbarHoverOutline);
-	if (toolbarHoverOutlineColor) {
-		collector.addRule(`
-			.monaco-action-bar:not(.vertical) .action-item .action-label:hover:not(.disabled) {
-				outline: 1px dashed ${toolbarHoverOutlineColor};
-				outline-offset: -1px;
-			}
-		`);
-	}
 });
 
 /**
diff --git a/src/vs/workbench/browser/web.api.ts b/src/vs/workbench/browser/web.api.ts
index ec253d96a2440e..36a8438f4b07cb 100644
--- a/src/vs/workbench/browser/web.api.ts
+++ b/src/vs/workbench/browser/web.api.ts
@@ -147,6 +147,8 @@ export interface IWorkbenchConstructionOptions {
 
 	/**
 	 * A provider for resource URIs.
+	 *
+	 * *Note*: This will only be invoked after the `connectionToken` is resolved.
 	 */
 	readonly resourceUriProvider?: IResourceUriProvider;
 
diff --git a/src/vs/workbench/browser/web.main.ts b/src/vs/workbench/browser/web.main.ts
index b9df7a2429304e..d46792f28375ad 100644
--- a/src/vs/workbench/browser/web.main.ts
+++ b/src/vs/workbench/browser/web.main.ts
@@ -5,6 +5,7 @@
 
 import { mark } from 'vs/base/common/performance';
 import { domContentLoaded, detectFullscreen, getCookieValue } from 'vs/base/browser/dom';
+import { assertIsDefined } from 'vs/base/common/types';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { ILogService, ConsoleLogger, MultiplexLogService, getLogLevel, ILoggerService } from 'vs/platform/log/common/log';
 import { ConsoleLogInAutomationLogger } from 'vs/platform/log/browser/log';
@@ -22,7 +23,7 @@ import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteA
 import { IWorkbenchFileService } from 'vs/workbench/services/files/common/files';
 import { FileService } from 'vs/platform/files/common/fileService';
 import { Schemas, connectionTokenCookieName } from 'vs/base/common/network';
-import { IAnyWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { IAnyWorkspaceIdentifier, IWorkspaceContextService, UNKNOWN_EMPTY_WINDOW_WORKSPACE } from 'vs/platform/workspace/common/workspace';
 import { IWorkbenchConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { setFullscreen } from 'vs/base/browser/browser';
@@ -144,7 +145,7 @@ export class BrowserMain extends Disposable {
 			const remoteExplorerService = accessor.get(IRemoteExplorerService);
 			const labelService = accessor.get(ILabelService);
 
-			const embedderLogger = instantiationService.createInstance(DelayedLogChannel, 'webEmbedder', productService.embedderIdentifier || localize('vscode.dev', "vscode.dev"), joinPath(dirname(environmentService.logFile), `webEmbedder.log`));
+			let logger: DelayedLogChannel | undefined = undefined;
 
 			return {
 				commands: {
@@ -165,15 +166,19 @@ export class BrowserMain extends Disposable {
 				},
 				logger: {
 					log: (level, message) => {
-						embedderLogger.log(level, message);
+						if (!logger) {
+							logger = instantiationService.createInstance(DelayedLogChannel, 'webEmbedder', productService.embedderIdentifier || productService.nameShort, joinPath(dirname(environmentService.logFile), 'webEmbedder.log'));
+						}
+
+						logger.log(level, message);
 					}
 				},
 				window: {
 					withProgress: (options, task) => progressService.withProgress(options, task)
 				},
 				workspace: {
-					openTunnel: async (tunnelOptions) => {
-						const tunnel = await remoteExplorerService.forward({
+					openTunnel: async tunnelOptions => {
+						const tunnel = assertIsDefined(await remoteExplorerService.forward({
 							remote: tunnelOptions.remoteAddress,
 							local: tunnelOptions.localAddressPort,
 							name: tunnelOptions.label,
@@ -188,16 +193,15 @@ export class BrowserMain extends Disposable {
 							elevateIfNeeded: undefined,
 							onAutoForward: undefined,
 							requireLocalPort: undefined,
-							protocol: tunnelOptions.protocol === TunnelProtocol.Https ? tunnelOptions.protocol : TunnelProtocol.Http,
-
-						});
-						if (!tunnel) {
-							throw new Error('cannot open tunnel');
-						}
+							protocol: tunnelOptions.protocol === TunnelProtocol.Https ? tunnelOptions.protocol : TunnelProtocol.Http
+						}));
 
 						return new class extends DisposableTunnel implements ITunnel {
 							declare localAddress: string;
-						}({ port: tunnel.tunnelRemotePort, host: tunnel.tunnelRemoteHost }, tunnel.localAddress, () => tunnel.dispose());
+						}({
+							port: tunnel.tunnelRemotePort,
+							host: tunnel.tunnelRemoteHost
+						}, tunnel.localAddress, () => tunnel.dispose());
 					}
 				},
 				shutdown: () => lifecycleService.shutdown()
@@ -297,8 +301,7 @@ export class BrowserMain extends Disposable {
 			}
 		}
 
-		const lastActiveProfile = environmentService.lastActiveProfile ? userDataProfilesService.profiles.find(p => p.id === environmentService.lastActiveProfile) : undefined;
-		const currentProfile = userDataProfilesService.getOrSetProfileForWorkspace(isWorkspaceIdentifier(workspace) || isSingleFolderWorkspaceIdentifier(workspace) ? workspace : 'empty-window', lastActiveProfile ?? userDataProfilesService.defaultProfile);
+		const currentProfile = userDataProfilesService.getProfileForWorkspace(workspace) ?? userDataProfilesService.defaultProfile;
 		const userDataProfileService = new UserDataProfileService(currentProfile, userDataProfilesService);
 		serviceCollection.set(IUserDataProfileService, userDataProfileService);
 
@@ -558,6 +561,6 @@ export class BrowserMain extends Disposable {
 		}
 
 		// Empty window workspace
-		return { id: 'empty-window' };
+		return UNKNOWN_EMPTY_WINDOW_WORKSPACE;
 	}
 }
diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts
index 7db24af657bc6f..2d2eb4b0df9aa3 100644
--- a/src/vs/workbench/browser/workbench.contribution.ts
+++ b/src/vs/workbench/browser/workbench.contribution.ts
@@ -187,17 +187,17 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 			},
 			'workbench.editor.enablePreview': {
 				'type': 'boolean',
-				'description': localize('enablePreview', "Controls whether opened editors show as preview editors. Preview editors do not stay open, are reused until explicitly set to be kept open (via double click or editing), and show file names in italics."),
+				'description': localize('enablePreview', "Controls whether opened editors show as preview editors. Preview editors do not stay open, are reused until explicitly set to be kept open (via double-click or editing), and show file names in italics."),
 				'default': true
 			},
 			'workbench.editor.enablePreviewFromQuickOpen': {
 				'type': 'boolean',
-				'markdownDescription': localize('enablePreviewFromQuickOpen', "Controls whether editors opened from Quick Open show as preview editors. Preview editors do not stay open, and are reused until explicitly set to be kept open (via double click or editing). This value is ignored when `#workbench.editor.enablePreview#` is disabled."),
+				'markdownDescription': localize('enablePreviewFromQuickOpen', "Controls whether editors opened from Quick Open show as preview editors. Preview editors do not stay open, and are reused until explicitly set to be kept open (via double-click or editing). When enabled, hold Ctrl before selection to open an editor as a non-preview. This value is ignored when `#workbench.editor.enablePreview#` is disabled."),
 				'default': false
 			},
 			'workbench.editor.enablePreviewFromCodeNavigation': {
 				'type': 'boolean',
-				'markdownDescription': localize('enablePreviewFromCodeNavigation', "Controls whether editors remain in preview when a code navigation is started from them. Preview editors do not stay open, and are reused until explicitly set to be kept open (via double click or editing). This value is ignored when `#workbench.editor.enablePreview#` is disabled."),
+				'markdownDescription': localize('enablePreviewFromCodeNavigation', "Controls whether editors remain in preview when a code navigation is started from them. Preview editors do not stay open, and are reused until explicitly set to be kept open (via double-click or editing). This value is ignored when `#workbench.editor.enablePreview#` is disabled."),
 				'default': false
 			},
 			'workbench.editor.closeOnFileDelete': {
@@ -484,7 +484,8 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 		localize('activeFolderLong', "`${activeFolderLong}`: the full path of the folder the file is contained in (e.g. /Users/Development/myFolder/myFileFolder)."),
 		localize('folderName', "`${folderName}`: name of the workspace folder the file is contained in (e.g. myFolder)."),
 		localize('folderPath', "`${folderPath}`: file path of the workspace folder the file is contained in (e.g. /Users/Development/myFolder)."),
-		localize('rootName', "`${rootName}`: name of the opened workspace or folder (e.g. myFolder or myWorkspace)."),
+		localize('rootName', "`${rootName}`: name of the workspace with optional remote name and workspace indicator if applicable (e.g. myFolder, myRemoteFolder [SSH] or myWorkspace (Workspace))."),
+		localize('rootNameShort', "`${rootNameShort}`: shortened name of the workspace without suffixes (e.g. myFolder, myRemoteFolder or myWorkspace)."),
 		localize('rootPath', "`${rootPath}`: file path of the opened workspace or folder (e.g. /Users/Development/myWorkspace)."),
 		localize('appName', "`${appName}`: e.g. VS Code."),
 		localize('remoteName', "`${remoteName}`: e.g. SSH"),
diff --git a/src/vs/workbench/common/configuration.ts b/src/vs/workbench/common/configuration.ts
index d25d5728cef89f..ec14cab3484ccd 100644
--- a/src/vs/workbench/common/configuration.ts
+++ b/src/vs/workbench/common/configuration.ts
@@ -12,6 +12,13 @@ import { ConfigurationTarget, IConfigurationOverrides, IConfigurationService, IC
 import { Disposable } from 'vs/base/common/lifecycle';
 import { Emitter } from 'vs/base/common/event';
 
+export const applicationConfigurationNodeBase = Object.freeze<IConfigurationNode>({
+	'id': 'application',
+	'order': 100,
+	'title': localize('applicationConfigurationTitle', "Application"),
+	'type': 'object'
+});
+
 export const workbenchConfigurationNodeBase = Object.freeze<IConfigurationNode>({
 	'id': 'workbench',
 	'order': 7,
diff --git a/src/vs/workbench/common/theme.ts b/src/vs/workbench/common/theme.ts
index 63f16597454551..2e7d0fed7466ef 100644
--- a/src/vs/workbench/common/theme.ts
+++ b/src/vs/workbench/common/theme.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { localize } from 'vs/nls';
-import { registerColor, editorBackground, contrastBorder, transparent, editorWidgetBackground, textLinkForeground, lighten, darken, focusBorder, activeContrastBorder, editorWidgetForeground, editorErrorForeground, editorWarningForeground, editorInfoForeground, treeIndentGuidesStroke, errorForeground, listActiveSelectionBackground, listActiveSelectionForeground, editorForeground, toolbarHoverBackground, inputBorder } from 'vs/platform/theme/common/colorRegistry';
+import { registerColor, editorBackground, contrastBorder, transparent, editorWidgetBackground, textLinkForeground, lighten, darken, focusBorder, activeContrastBorder, editorWidgetForeground, editorErrorForeground, editorWarningForeground, editorInfoForeground, treeIndentGuidesStroke, errorForeground, listActiveSelectionBackground, listActiveSelectionForeground, editorForeground, toolbarHoverBackground, inputBorder, widgetBorder } from 'vs/platform/theme/common/colorRegistry';
 import { IColorTheme } from 'vs/platform/theme/common/themeService';
 import { Color } from 'vs/base/common/color';
 import { ColorScheme } from 'vs/platform/theme/common/theme';
@@ -799,15 +799,15 @@ export const MENUBAR_SELECTION_BORDER = registerColor('menubar.selectionBorder',
 // < --- Notifications --- >
 
 export const NOTIFICATIONS_CENTER_BORDER = registerColor('notificationCenter.border', {
-	dark: null,
-	light: null,
+	dark: widgetBorder,
+	light: widgetBorder,
 	hcDark: contrastBorder,
 	hcLight: contrastBorder
 }, localize('notificationCenterBorder', "Notifications center border color. Notifications slide in from the bottom right of the window."));
 
 export const NOTIFICATIONS_TOAST_BORDER = registerColor('notificationToast.border', {
-	dark: null,
-	light: null,
+	dark: widgetBorder,
+	light: widgetBorder,
 	hcDark: contrastBorder,
 	hcLight: contrastBorder
 }, localize('notificationToastBorder', "Notification toast border color. Notifications slide in from the bottom right of the window."));
diff --git a/src/vs/workbench/contrib/audioCues/browser/audioCueDebuggerContribution.ts b/src/vs/workbench/contrib/audioCues/browser/audioCueDebuggerContribution.ts
index 84e1a657153768..6c11b4f497ce35 100644
--- a/src/vs/workbench/contrib/audioCues/browser/audioCueDebuggerContribution.ts
+++ b/src/vs/workbench/contrib/audioCues/browser/audioCueDebuggerContribution.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { autorunWithStore } from 'vs/base/common/observable';
-import { IAudioCueService, AudioCue } from 'vs/platform/audioCues/browser/audioCueService';
+import { autorunWithStore, observableFromEvent } from 'vs/base/common/observable';
+import { IAudioCueService, AudioCue, AudioCueService } from 'vs/platform/audioCues/browser/audioCueService';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { IDebugService, IDebugSession } from 'vs/workbench/contrib/debug/common/debug';
 
@@ -15,12 +15,16 @@ export class AudioCueLineDebuggerContribution
 
 	constructor(
 		@IDebugService debugService: IDebugService,
-		@IAudioCueService private readonly audioCueService: IAudioCueService,
+		@IAudioCueService private readonly audioCueService: AudioCueService,
 	) {
 		super();
 
+		const isEnabled = observableFromEvent(
+			audioCueService.onEnabledChanged(AudioCue.onDebugBreak),
+			() => audioCueService.isEnabled(AudioCue.onDebugBreak)
+		);
 		this._register(autorunWithStore((reader, store) => {
-			if (!audioCueService.isEnabled(AudioCue.onDebugBreak).read(reader)) {
+			if (!isEnabled.read(reader)) {
 				return;
 			}
 
diff --git a/src/vs/workbench/contrib/audioCues/browser/audioCueLineFeatureContribution.ts b/src/vs/workbench/contrib/audioCues/browser/audioCueLineFeatureContribution.ts
index c3a895a3ecb13f..1b183550cf6053 100644
--- a/src/vs/workbench/contrib/audioCues/browser/audioCueLineFeatureContribution.ts
+++ b/src/vs/workbench/contrib/audioCues/browser/audioCueLineFeatureContribution.ts
@@ -17,6 +17,7 @@ import { GhostTextController } from 'vs/editor/contrib/inlineCompletions/browser
 import { CursorChangeReason } from 'vs/editor/common/cursorEvents';
 import { autorun, autorunDelta, constObservable, debouncedObservable, derived, IObservable, observableFromEvent, observableFromPromise, wasEventTriggeredRecently } from 'vs/base/common/observable';
 import { AudioCue, IAudioCueService } from 'vs/platform/audioCues/browser/audioCueService';
+import { CachedFunction } from 'vs/base/common/cache';
 
 export class AudioCueLineFeatureContribution
 	extends Disposable
@@ -31,6 +32,11 @@ export class AudioCueLineFeatureContribution
 		this.instantiationService.createInstance(InlineCompletionLineFeature),
 	];
 
+	private readonly isEnabledCache = new CachedFunction<AudioCue, IObservable<boolean>>((cue) => observableFromEvent(
+		this.audioCueService.onEnabledChanged(AudioCue.onDebugBreak),
+		() => this.audioCueService.isEnabled(AudioCue.onDebugBreak)
+	));
+
 	constructor(
 		@IEditorService private readonly editorService: IEditorService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
@@ -42,7 +48,7 @@ export class AudioCueLineFeatureContribution
 			'someAudioCueFeatureIsEnabled',
 			(reader) =>
 				this.features.some((feature) =>
-					this.audioCueService.isEnabled(feature.audioCue).read(reader)
+					this.isEnabledCache.get(feature.audioCue).read(reader)
 				)
 		);
 
@@ -111,7 +117,7 @@ export class AudioCueLineFeatureContribution
 			const isFeaturePresent = derived(
 				`isPresentInLine:${feature.audioCue.name}`,
 				(reader) => {
-					if (!this.audioCueService.isEnabled(feature.audioCue).read(reader)) {
+					if (!this.isEnabledCache.get(feature.audioCue).read(reader)) {
 						return false;
 					}
 					const lineNumber = debouncedLineNumber.read(reader);
diff --git a/src/vs/workbench/contrib/audioCues/browser/commands.ts b/src/vs/workbench/contrib/audioCues/browser/commands.ts
index 834c481cc5dab7..b2400bca2e32df 100644
--- a/src/vs/workbench/contrib/audioCues/browser/commands.ts
+++ b/src/vs/workbench/contrib/audioCues/browser/commands.ts
@@ -34,8 +34,8 @@ export class ShowAudioCueHelp extends Action2 {
 
 		const items: (IQuickPickItem & { audioCue: AudioCue })[] = AudioCue.allAudioCues.map((cue, idx) => ({
 			label: accessibilityService.isScreenReaderOptimized() ?
-				`${cue.name}${audioCueService.isEnabled(cue).get() ? '' : ' (' + localize('disabled', "Disabled") + ')'}`
-				: `${audioCueService.isEnabled(cue).get() ? '$(check)' : '     '} ${cue.name}`,
+				`${cue.name}${audioCueService.isEnabled(cue) ? '' : ' (' + localize('disabled', "Disabled") + ')'}`
+				: `${audioCueService.isEnabled(cue) ? '$(check)' : '     '} ${cue.name}`,
 			audioCue: cue,
 			buttons: [{
 				iconClass: Codicon.settingsGear.classNames,
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits.ts b/src/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits.ts
index c2dc0915eada9f..2877663da9f945 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits.ts
@@ -12,8 +12,10 @@ import { ResourceEdit } from 'vs/editor/browser/services/bulkEditService';
 import { WorkspaceEditMetadata } from 'vs/editor/common/languages';
 import { IProgress } from 'vs/platform/progress/common/progress';
 import { UndoRedoGroup, UndoRedoSource } from 'vs/platform/undoRedo/common/undoRedo';
-import { ICellPartialMetadataEdit, ICellReplaceEdit, IDocumentMetadataEdit, IWorkspaceNotebookCellEdit } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { getNotebookEditorFromEditorPane } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { ICellPartialMetadataEdit, ICellReplaceEdit, IDocumentMetadataEdit, ISelectionState, IWorkspaceNotebookCellEdit, SelectionStateType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookEditorModelResolverService } from 'vs/workbench/contrib/notebook/common/notebookEditorModelResolverService';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 
 export class ResourceNotebookCellEdit extends ResourceEdit implements IWorkspaceNotebookCellEdit {
 
@@ -50,6 +52,7 @@ export class BulkCellEdits {
 		private readonly _progress: IProgress<void>,
 		private readonly _token: CancellationToken,
 		private readonly _edits: ResourceNotebookCellEdit[],
+		@IEditorService private readonly _editorService: IEditorService,
 		@INotebookEditorModelResolverService private readonly _notebookModelService: INotebookEditorModelResolverService,
 	) { }
 
@@ -72,8 +75,14 @@ export class BulkCellEdits {
 
 			// apply edits
 			const edits = group.map(entry => entry.cellEdit);
-			const computeUndo = !ref.object.isReadonly;
-			ref.object.notebook.applyEdits(edits, true, undefined, () => undefined, this._undoRedoGroup, computeUndo);
+			const computeUndo = !ref.object.isReadonly();
+			const editor = getNotebookEditorFromEditorPane(this._editorService.activeEditorPane);
+			const initialSelectionState: ISelectionState | undefined = editor?.textModel?.uri.toString() === ref.object.notebook.uri.toString() ? {
+				kind: SelectionStateType.Index,
+				focus: editor.getFocus(),
+				selections: editor.getSelections()
+			} : undefined;
+			ref.object.notebook.applyEdits(edits, true, initialSelectionState, () => undefined, this._undoRedoGroup, computeUndo);
 			ref.dispose();
 
 			this._progress.report(undefined);
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane.ts b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane.ts
index ac7a2b01767470..fb31ddafa47294 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane.ts
@@ -156,7 +156,7 @@ export class BulkEditPane extends ViewPane {
 		btnConfirm.label = localize('ok', 'Apply');
 		btnConfirm.onDidClick(() => this.accept(), this, this._disposables);
 
-		const btnCancel = buttonBar.addButton(defaultButtonStyles /*{  secondary: true } */);
+		const btnCancel = buttonBar.addButton({ ...defaultButtonStyles, secondary: true });
 		btnCancel.label = localize('cancel', 'Discard');
 		btnCancel.onDidClick(() => this.discard(), this, this._disposables);
 
@@ -281,6 +281,8 @@ export class BulkEditPane extends ViewPane {
 		const [first] = this._tree.getFocus();
 		if ((first instanceof FileElement || first instanceof TextEditElement) && !first.isDisabled()) {
 			first.setChecked(!first.isChecked());
+		} else if (first instanceof CategoryElement) {
+			first.setChecked(!first.isChecked());
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPreview.ts b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPreview.ts
index bfd13e9ae16770..af94e6daa68f22 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPreview.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPreview.ts
@@ -83,7 +83,7 @@ export const enum BulkFileOperationType {
 
 export class BulkFileOperation {
 
-	type: BulkFileOperationType = 0;
+	type = 0;
 	textEdits: BulkTextEdit[] = [];
 	originalEdits = new Map<number, ResourceTextEdit | ResourceFileEdit>();
 	newUri?: URI;
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree.ts b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree.ts
index fbeb5b5cb6cb8c..6c3d35ec0252ad 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree.ts
@@ -30,6 +30,7 @@ import { ILanguageConfigurationService } from 'vs/editor/common/languages/langua
 import { ILanguageService } from 'vs/editor/common/languages/language';
 import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
 import { SnippetParser } from 'vs/editor/contrib/snippet/browser/snippetParser';
+import { AriaRole } from 'vs/base/browser/ui/aria/aria';
 
 // --- VIEW MODEL
 
@@ -38,12 +39,32 @@ export interface ICheckable {
 	setChecked(value: boolean): void;
 }
 
-export class CategoryElement {
+export class CategoryElement implements ICheckable {
 
 	constructor(
 		readonly parent: BulkFileOperations,
 		readonly category: BulkCategory
 	) { }
+
+	isChecked(): boolean {
+		const model = this.parent;
+		let checked = true;
+		for (const file of this.category.fileOperations) {
+			for (const edit of file.originalEdits.values()) {
+				checked = checked && model.checked.isChecked(edit);
+			}
+		}
+		return checked;
+	}
+
+	setChecked(value: boolean): void {
+		const model = this.parent;
+		for (const file of this.category.fileOperations) {
+			for (const edit of file.originalEdits.values()) {
+				model.checked.updateChecked(edit, value);
+			}
+		}
+	}
 }
 
 export class FileElement implements ICheckable {
@@ -285,7 +306,7 @@ export class BulkEditAccessibilityProvider implements IListAccessibilityProvider
 		return localize('bulkEdit', "Bulk Edit");
 	}
 
-	getRole(_element: BulkEditElement): string {
+	getRole(_element: BulkEditElement): AriaRole {
 		return 'checkbox';
 	}
 
diff --git a/src/vs/workbench/contrib/codeEditor/browser/accessibility/accessibility.ts b/src/vs/workbench/contrib/codeEditor/browser/accessibility/accessibility.ts
index 29b21c4dee17d5..cd410ac1219a90 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/accessibility/accessibility.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/accessibility/accessibility.ts
@@ -21,13 +21,13 @@ import { IEditorOptions, EditorOption } from 'vs/editor/common/config/editorOpti
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { ToggleTabFocusModeAction } from 'vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { AccessibilitySupport } from 'vs/platform/accessibility/common/accessibility';
+import { AccessibilitySupport, IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
 import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { NEW_UNTITLED_FILE_COMMAND_ID } from 'vs/workbench/contrib/files/browser/fileConstants';
@@ -120,7 +120,7 @@ class AccessibilityHelpWidget extends Widget implements IOverlayWidget {
 			if (e.equals(KeyMod.CtrlCmd | KeyCode.KeyE)) {
 				alert(nls.localize('emergencyConfOn', "Now changing the setting `editor.accessibilitySupport` to 'on'."));
 
-				this._configurationService.updateValue('editor.accessibilitySupport', 'on');
+				this._configurationService.updateValue('editor.accessibilitySupport', 'on', ConfigurationTarget.USER);
 
 				e.preventDefault();
 				e.stopPropagation();
@@ -339,9 +339,9 @@ class ToggleScreenReaderMode extends Action2 {
 	}
 
 	async run(accessor: ServicesAccessor): Promise<void> {
+		const accessibiiltyService = accessor.get(IAccessibilityService);
 		const configurationService = accessor.get(IConfigurationService);
-		const value = configurationService.getValue('editor.accessibilitySupport');
-		configurationService.updateValue('editor.accessibilitySupport', value === 'on' ? 'off' : 'on');
+		configurationService.updateValue('editor.accessibilitySupport', accessibiiltyService.isScreenReaderOptimized() ? 'off' : 'on', ConfigurationTarget.USER);
 	}
 }
 
diff --git a/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.ts b/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.ts
index ea2d9242176537..fc069818220b82 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.ts
@@ -190,6 +190,13 @@ export abstract class SimpleFindWidget extends Widget {
 				this.updateResultCount();
 				this.updateButtons(this._foundMatch);
 			}));
+			this._register(this._findInput.onDidOptionChange(async () => {
+				this._foundMatch = this._onInputChanged();
+				await this.updateResultCount();
+				this.updateButtons(this._foundMatch);
+				this.focusFindBox();
+				this._delayedUpdateHistory();
+			}));
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.css b/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.css
index d58a12221afebb..0dc4b15d0b2cb2 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.css
+++ b/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.css
@@ -8,6 +8,10 @@
 	user-select: text;
 	-webkit-user-select: text;
 	padding: 10px;
+	border: 1px solid var(--vscode-editorHoverWidget-border);
+}
+.hc-black .tokens-inspect-widget, .hc-light .tokens-inspect-widget {
+	border-width: 2px;
 }
 
 .monaco-editor .token-inspect-widget {
diff --git a/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts b/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts
index 1857e89328194d..e2059ecf3eaebc 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts
@@ -20,18 +20,15 @@ import { SemanticTokensLegend, SemanticTokens } from 'vs/editor/common/languages
 import { FontStyle, ColorId, StandardTokenType, TokenMetadata } from 'vs/editor/common/encodedTokenAttributes';
 import { ILanguageService } from 'vs/editor/common/languages/language';
 import { INotificationService } from 'vs/platform/notification/common/notification';
-import { editorHoverBorder } from 'vs/platform/theme/common/colorRegistry';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { findMatchingThemeRule } from 'vs/workbench/services/textMate/common/TMHelper';
 import { ITextMateService } from 'vs/workbench/services/textMate/browser/textMate';
-import type { IGrammar, IToken, StackElement } from 'vscode-textmate';
+import type { IGrammar, IToken, StateStack } from 'vscode-textmate';
 import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
 import { ColorThemeData, TokenStyleDefinitions, TokenStyleDefinition, TextMateThemingRuleDefinitions } from 'vs/workbench/services/themes/common/colorThemeData';
 import { SemanticTokenRule, TokenStyleData, TokenStyle } from 'vs/platform/theme/common/tokenClassificationRegistry';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { SEMANTIC_HIGHLIGHTING_SETTING_ID, IEditorSemanticHighlightingOptions } from 'vs/editor/common/services/modelService';
-import { isHighContrast } from 'vs/platform/theme/common/theme';
 import { Schemas } from 'vs/base/common/network';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
 
@@ -514,8 +511,8 @@ class InspectEditorTokensWidget extends Disposable implements IContentWidget {
 		};
 	}
 
-	private _getStateBeforeLine(grammar: IGrammar, lineNumber: number): StackElement | null {
-		let state: StackElement | null = null;
+	private _getStateBeforeLine(grammar: IGrammar, lineNumber: number): StateStack | null {
+		let state: StateStack | null = null;
 
 		for (let i = 1; i < lineNumber; i++) {
 			const tokenizationResult = grammar.tokenizeLine(this._model.getLineContent(i), state);
@@ -670,11 +667,3 @@ class InspectEditorTokensWidget extends Disposable implements IContentWidget {
 
 registerEditorContribution(InspectEditorTokensController.ID, InspectEditorTokensController, EditorContributionInstantiation.Lazy);
 registerEditorAction(InspectEditorTokens);
-
-registerThemingParticipant((theme, collector) => {
-	const border = theme.getColor(editorHoverBorder);
-	if (border) {
-		const borderWidth = isHighContrast(theme.type) ? 2 : 1;
-		collector.addRule(`.monaco-editor .token-inspect-widget { border: ${borderWidth}px solid ${border}; }`);
-	}
-});
diff --git a/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts b/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts
index 4dc2a79bf336d2..d6be4855c01078 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { localize } from 'vs/nls';
-import { IKeyMods, IQuickPickSeparator, IQuickInputService, IQuickPick } from 'vs/platform/quickinput/common/quickInput';
+import { IKeyMods, IQuickPickSeparator, IQuickInputService, IQuickPick, ItemActivation } from 'vs/platform/quickinput/common/quickInput';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IRange } from 'vs/editor/common/core/range';
 import { Registry } from 'vs/platform/registry/common/platform';
@@ -261,7 +261,7 @@ class GotoSymbolAction extends Action2 {
 	}
 
 	run(accessor: ServicesAccessor) {
-		accessor.get(IQuickInputService).quickAccess.show(GotoSymbolQuickAccessProvider.PREFIX);
+		accessor.get(IQuickInputService).quickAccess.show(GotoSymbolQuickAccessProvider.PREFIX, { itemActivation: ItemActivation.NONE });
 	}
 }
 
diff --git a/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.ts b/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.ts
index 0b3d3b07c15fbc..939c8c056611c7 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.ts
@@ -358,10 +358,18 @@ class CodeActionOnSaveParticipant implements ITextFileSaveParticipant {
 
 		for (const codeActionKind of codeActionsOnSave) {
 			const actionsToRun = await this.getActionsToRun(model, codeActionKind, excludes, getActionProgress, token);
+			if (token.isCancellationRequested) {
+				actionsToRun.dispose();
+				return;
+			}
+
 			try {
 				for (const action of actionsToRun.validActions) {
 					progress.report({ message: localize('codeAction.apply', "Applying code action '{0}'.", action.action.title) });
-					await this.instantiationService.invokeFunction(applyCodeAction, action, ApplyCodeActionReason.OnSave);
+					await this.instantiationService.invokeFunction(applyCodeAction, action, ApplyCodeActionReason.OnSave, {}, token);
+					if (token.isCancellationRequested) {
+						return;
+					}
 				}
 			} catch {
 				// Failure to apply a code action should not block other on save actions
diff --git a/src/vs/workbench/contrib/codeEditor/browser/untitledTextEditorHint/untitledTextEditorHint.ts b/src/vs/workbench/contrib/codeEditor/browser/untitledTextEditorHint/untitledTextEditorHint.ts
index 6539a6441eccb5..d9722e1f4058be 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/untitledTextEditorHint/untitledTextEditorHint.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/untitledTextEditorHint/untitledTextEditorHint.ts
@@ -107,7 +107,13 @@ class UntitledTextEditorHintContentWidget implements IContentWidget {
 			this.domNode = $('.untitled-hint');
 			this.domNode.style.width = 'max-content';
 
-			const hintMsg = localize({ key: 'message', comment: ['Presereve double-square brackets and their order'] }, '[[Select a language]], or [[open a different editor]] to get started.\nStart typing to dismiss or [[don\'t show]] this again.');
+			const hintMsg = localize({
+				key: 'message',
+				comment: [
+					'Preserve double-square brackets and their order',
+					'language refers to a programming language'
+				]
+			}, '[[Select a language]], or [[open a different editor]] to get started.\nStart typing to dismiss or [[don\'t show]] this again.');
 			const hintHandler: IContentActionHandler = {
 				disposables: this.toDispose,
 				callback: (index, event) => {
@@ -141,7 +147,7 @@ class UntitledTextEditorHintContentWidget implements IContentWidget {
 			}
 
 			// the actual command handlers...
-			const languageOnClickOrTap = async (e: MouseEvent) => {
+			const languageOnClickOrTap = async (e: UIEvent) => {
 				e.stopPropagation();
 				// Need to focus editor before so current editor becomes active and the command is properly executed
 				this.editor.focus();
@@ -149,7 +155,7 @@ class UntitledTextEditorHintContentWidget implements IContentWidget {
 				this.editor.focus();
 			};
 
-			const chooseEditorOnClickOrTap = async (e: MouseEvent) => {
+			const chooseEditorOnClickOrTap = async (e: UIEvent) => {
 				e.stopPropagation();
 
 				const activeEditorInput = this.editorGroupsService.activeGroup.activeEditor;
diff --git a/src/vs/workbench/contrib/comments/browser/commentMenus.ts b/src/vs/workbench/contrib/comments/browser/commentMenus.ts
index 479e5156b12ed8..c53852bb8cc4a6 100644
--- a/src/vs/workbench/contrib/comments/browser/commentMenus.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentMenus.ts
@@ -23,6 +23,10 @@ export class CommentMenus implements IDisposable {
 		return this.getMenu(MenuId.CommentThreadActions, contextKeyService);
 	}
 
+	getCommentEditorActions(contextKeyService: IContextKeyService): IMenu {
+		return this.getMenu(MenuId.CommentEditorActions, contextKeyService);
+	}
+
 	getCommentThreadAdditionalActions(contextKeyService: IContextKeyService): IMenu {
 		return this.getMenu(MenuId.CommentThreadAdditionalActions, contextKeyService);
 	}
diff --git a/src/vs/workbench/contrib/comments/browser/commentNode.ts b/src/vs/workbench/contrib/comments/browser/commentNode.ts
index e55ce947175a4c..a791cb800feae0 100644
--- a/src/vs/workbench/contrib/comments/browser/commentNode.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentNode.ts
@@ -67,6 +67,7 @@ export class CommentNode<T extends IRange | ICellRange> extends Disposable {
 	protected actionRunner?: IActionRunner;
 	protected toolbar: ToolBar | undefined;
 	private _commentFormActions: CommentFormActions | null = null;
+	private _commentEditorActions: CommentFormActions | null = null;
 
 	private readonly _onDidClick = new Emitter<CommentNode<T>>();
 
@@ -469,8 +470,16 @@ export class CommentNode<T extends IRange | ICellRange> extends Disposable {
 		this._body.classList.add('hidden');
 		this._commentEditContainer = dom.append(this._commentDetailsContainer, dom.$('.edit-container'));
 		this.createCommentEditor(this._commentEditContainer);
+
 		const formActions = dom.append(this._commentEditContainer, dom.$('.form-actions'));
+		const otherActions = dom.append(formActions, dom.$('.other-actions'));
+		this.createCommentWidgetFormActions(otherActions);
+		const editorActions = dom.append(formActions, dom.$('.editor-actions'));
+		this.createCommentWidgetEditorActions(editorActions);
+
+	}
 
+	private createCommentWidgetFormActions(container: HTMLElement) {
 		const menus = this.commentService.getCommentMenus(this.owner);
 		const menu = menus.getCommentActions(this.comment, this._contextKeyService);
 
@@ -479,7 +488,7 @@ export class CommentNode<T extends IRange | ICellRange> extends Disposable {
 			this._commentFormActions?.setActions(menu);
 		}));
 
-		this._commentFormActions = new CommentFormActions(formActions, (action: IAction): void => {
+		this._commentFormActions = new CommentFormActions(container, (action: IAction): void => {
 			const text = this._commentEditor!.getValue();
 
 			action.run({
@@ -496,6 +505,32 @@ export class CommentNode<T extends IRange | ICellRange> extends Disposable {
 		this._commentFormActions.setActions(menu);
 	}
 
+	private createCommentWidgetEditorActions(container: HTMLElement) {
+		const menus = this.commentService.getCommentMenus(this.owner);
+		const menu = menus.getCommentEditorActions(this._contextKeyService);
+
+		this._register(menu);
+		this._register(menu.onDidChange(() => {
+			this._commentEditorActions?.setActions(menu);
+		}));
+
+		this._commentEditorActions = new CommentFormActions(container, (action: IAction): void => {
+			const text = this._commentEditor!.getValue();
+
+			action.run({
+				thread: this.commentThread,
+				commentUniqueId: this.comment.uniqueIdInThread,
+				text: text,
+				$mid: MarshalledId.CommentThreadNode
+			});
+
+			this._commentEditor?.focus();
+		});
+
+		this._register(this._commentEditorActions);
+		this._commentEditorActions.setActions(menu, true);
+	}
+
 	setFocus(focused: boolean, visible: boolean = false) {
 		if (focused) {
 			this._domNode.focus();
diff --git a/src/vs/workbench/contrib/comments/browser/commentReply.ts b/src/vs/workbench/contrib/comments/browser/commentReply.ts
index 3efe67224b91ec..81f80a1a8e097e 100644
--- a/src/vs/workbench/contrib/comments/browser/commentReply.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentReply.ts
@@ -40,8 +40,10 @@ export class CommentReply<T extends IRange | ICellRange> extends Disposable {
 	commentEditorIsEmpty: IContextKey<boolean>;
 	private _error!: HTMLElement;
 	private _formActions: HTMLElement | null;
+	private _editorActions: HTMLElement | null;
 	private _commentThreadDisposables: IDisposable[] = [];
 	private _commentFormActions!: CommentFormActions;
+	private _commentEditorActions!: CommentFormActions;
 	private _reviewThreadReplyButton!: HTMLElement;
 
 	constructor(
@@ -103,9 +105,11 @@ export class CommentReply<T extends IRange | ICellRange> extends Disposable {
 			}
 		}
 		this._error = dom.append(this.form, dom.$('.validation-error.hidden'));
-
-		this._formActions = dom.append(this.form, dom.$('.form-actions'));
-		this.createCommentWidgetActions(this._formActions, model);
+		const formActions = dom.append(this.form, dom.$('.form-actions'));
+		this._formActions = dom.append(formActions, dom.$('.other-actions'));
+		this.createCommentWidgetFormActions(this._formActions, model);
+		this._editorActions = dom.append(formActions, dom.$('.editor-actions'));
+		this.createCommentWidgetEditorActions(this._editorActions, model);
 	}
 
 	public updateCommentThread(commentThread: languages.CommentThread<IRange | ICellRange>) {
@@ -241,7 +245,7 @@ export class CommentReply<T extends IRange | ICellRange> extends Disposable {
 	/**
 	 * Command based actions.
 	 */
-	private createCommentWidgetActions(container: HTMLElement, model: ITextModel) {
+	private createCommentWidgetFormActions(container: HTMLElement, model: ITextModel) {
 		const menu = this._commentMenus.getCommentThreadActions(this._contextKeyService);
 
 		this._register(menu);
@@ -265,6 +269,29 @@ export class CommentReply<T extends IRange | ICellRange> extends Disposable {
 		this._commentFormActions.setActions(menu);
 	}
 
+	private createCommentWidgetEditorActions(container: HTMLElement, model: ITextModel) {
+		const editorMenu = this._commentMenus.getCommentEditorActions(this._contextKeyService);
+		this._register(editorMenu);
+		this._register(editorMenu.onDidChange(() => {
+			this._commentEditorActions.setActions(editorMenu);
+		}));
+
+		this._commentEditorActions = new CommentFormActions(container, async (action: IAction) => {
+			this._actionRunDelegate?.();
+
+			action.run({
+				thread: this._commentThread,
+				text: this.commentEditor.getValue(),
+				$mid: MarshalledId.CommentThreadReply
+			});
+
+			this.focusCommentEditor();
+		});
+
+		this._register(this._commentEditorActions);
+		this._commentEditorActions.setActions(editorMenu, true);
+	}
+
 	private get isReplyExpanded(): boolean {
 		return this.form.classList.contains('expand');
 	}
diff --git a/src/vs/workbench/contrib/comments/browser/commentService.ts b/src/vs/workbench/contrib/comments/browser/commentService.ts
index 6ae9934eee30d6..9cc60c34c0014d 100644
--- a/src/vs/workbench/contrib/comments/browser/commentService.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentService.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as nls from 'vs/nls';
 import { CommentThreadChangedEvent, CommentInfo, Comment, CommentReaction, CommentingRanges, CommentThread, CommentOptions } from 'vs/editor/common/languages';
 import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { Event, Emitter } from 'vs/base/common/event';
@@ -16,9 +17,15 @@ import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
 import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { COMMENTS_SECTION, ICommentsConfiguration } from 'vs/workbench/contrib/comments/common/commentsConfiguration';
+import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 
 export const ICommentService = createDecorator<ICommentService>('commentService');
 
+export const WorkspaceHasCommenting = new RawContextKey<boolean>('workspaceHasCommenting', false, {
+	description: nls.localize('hasCommentingProvider', "Whether the open workspace has either comments or commenting ranges."),
+	type: 'boolean'
+});
+
 interface IResourceCommentThreadEvent {
 	resource: URI;
 	commentInfos: ICommentInfo[];
@@ -145,15 +152,18 @@ export class CommentService extends Disposable implements ICommentService {
 	private _commentControls = new Map<string, ICommentController>();
 	private _commentMenus = new Map<string, CommentMenus>();
 	private _isCommentingEnabled: boolean = true;
+	private _workspaceHasCommenting: IContextKey<boolean>;
 
 	constructor(
 		@IInstantiationService protected readonly instantiationService: IInstantiationService,
 		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
-		@IConfigurationService private readonly configurationService: IConfigurationService
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IContextKeyService contextKeyService: IContextKeyService
 	) {
 		super();
 		this._handleConfiguration();
 		this._handleZenMode();
+		this._workspaceHasCommenting = WorkspaceHasCommenting.bindTo(contextKeyService);
 	}
 
 	private _handleConfiguration() {
@@ -209,10 +219,16 @@ export class CommentService extends Disposable implements ICommentService {
 	}
 
 	setDocumentComments(resource: URI, commentInfos: ICommentInfo[]): void {
+		if (commentInfos.length) {
+			this._workspaceHasCommenting.set(true);
+		}
 		this._onDidSetResourceCommentInfos.fire({ resource, commentInfos });
 	}
 
 	setWorkspaceComments(owner: string, commentsByResource: CommentThread[]): void {
+		if (commentsByResource.length) {
+			this._workspaceHasCommenting.set(true);
+		}
 		this._onDidSetAllCommentThreads.fire({ ownerId: owner, commentThreads: commentsByResource });
 	}
 
@@ -280,6 +296,7 @@ export class CommentService extends Disposable implements ICommentService {
 	}
 
 	updateCommentingRanges(ownerId: string) {
+		this._workspaceHasCommenting.set(true);
 		this._onDidUpdateCommentingRanges.fire({ owner: ownerId });
 	}
 
diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadRangeDecorator.ts b/src/vs/workbench/contrib/comments/browser/commentThreadRangeDecorator.ts
index 77cbdaf69e65f1..b685642dc222d4 100644
--- a/src/vs/workbench/contrib/comments/browser/commentThreadRangeDecorator.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentThreadRangeDecorator.ts
@@ -66,7 +66,7 @@ export class CommentThreadRangeDecorator extends Disposable {
 	}
 
 	private updateCurrent(thread: CommentThread<IRange> | undefined) {
-		if (!this.editor) {
+		if (!this.editor || (thread?.resource && (thread.resource?.toString() !== this.editor.getModel()?.uri.toString()))) {
 			return;
 		}
 		this.currentThreadCollapseStateListener?.dispose();
diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts b/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts
index 8c07cd661fe9ef..370a60796b9739 100644
--- a/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts
@@ -64,7 +64,7 @@ export class CommentThreadWidget<T extends IRange | ICellRange = IRange> extends
 			collapse: () => void;
 		},
 		@ICommentService private commentService: ICommentService,
-		@IContextMenuService readonly contextMenuService: IContextMenuService
+		@IContextMenuService contextMenuService: IContextMenuService
 	) {
 		super();
 
diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts b/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts
index fd493a4644190b..1bd0dd8c8d8291 100644
--- a/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts
@@ -169,7 +169,7 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 		return undefined;
 	}
 
-	protected override revealLine(lineNumber: number) {
+	protected override revealRange() {
 		// we don't do anything here as we always do the reveal ourselves.
 	}
 
diff --git a/src/vs/workbench/contrib/comments/browser/comments.contribution.ts b/src/vs/workbench/contrib/comments/browser/comments.contribution.ts
index dc38d303d1821e..be4563479777c4 100644
--- a/src/vs/workbench/contrib/comments/browser/comments.contribution.ts
+++ b/src/vs/workbench/contrib/comments/browser/comments.contribution.ts
@@ -38,7 +38,7 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
 		'comments.visible': {
 			type: 'boolean',
 			default: true,
-			description: nls.localize('comments.visible', "Controls the visibility of the comments bar and comment threads in editors that have commenting ranges and comments.")
+			description: nls.localize('comments.visible', "Controls the visibility of the comments bar and comment threads in editors that have commenting ranges and comments. Comments are still accessible via the Comments view and will cause commenting to be toggled on in the same way running the command \"Comments: Toggle Editor Commenting\" toggles comments.")
 		}
 	}
 });
diff --git a/src/vs/workbench/contrib/comments/browser/commentsEditorContribution.ts b/src/vs/workbench/contrib/comments/browser/commentsEditorContribution.ts
index 75f63a51ed0380..b6d69dfd83299d 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsEditorContribution.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsEditorContribution.ts
@@ -15,22 +15,18 @@ import { IActiveCodeEditor, ICodeEditor, IEditorMouseEvent, isCodeEditor, isDiff
 import { EditorAction, EditorContributionInstantiation, registerEditorAction, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { IRange, Range } from 'vs/editor/common/core/range';
-import { IEditorContribution, IModelChangedEvent } from 'vs/editor/common/editorCommon';
+import { IEditorContribution } from 'vs/editor/common/editorCommon';
 import { IModelDecorationOptions, IModelDeltaDecoration } from 'vs/editor/common/model';
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 import * as languages from 'vs/editor/common/languages';
-import { peekViewResultsBackground, peekViewResultsSelectionBackground, peekViewTitleBackground } from 'vs/editor/contrib/peekView/browser/peekView';
 import * as nls from 'vs/nls';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { IQuickInputService, IQuickPickItem, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
-import { editorForeground } from 'vs/platform/theme/common/colorRegistry';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { STATUS_BAR_ITEM_ACTIVE_BACKGROUND, STATUS_BAR_ITEM_HOVER_BACKGROUND } from 'vs/workbench/common/theme';
-import { CommentGlyphWidget, overviewRulerCommentingRangeForeground } from 'vs/workbench/contrib/comments/browser/commentGlyphWidget';
-import { ICommentInfo, ICommentService } from 'vs/workbench/contrib/comments/browser/commentService';
+import { CommentGlyphWidget } from 'vs/workbench/contrib/comments/browser/commentGlyphWidget';
+import { ICommentInfo, ICommentService, WorkspaceHasCommenting } from 'vs/workbench/contrib/comments/browser/commentService';
 import { isMouseUpEventDragFromMouseDown, parseMouseDownInfoFromEvent, ReviewZoneWidget } from 'vs/workbench/contrib/comments/browser/commentThreadZoneWidget';
 import { ctxCommentEditorFocused, SimpleCommentEditor } from 'vs/workbench/contrib/comments/browser/simpleCommentEditor';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -47,7 +43,6 @@ import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/cont
 import { Position } from 'vs/editor/common/core/position';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { CommentThreadRangeDecorator } from 'vs/workbench/contrib/comments/browser/commentThreadRangeDecorator';
-import { commentThreadRangeActiveBackground, commentThreadRangeActiveBorder, commentThreadRangeBackground, commentThreadRangeBorder } from 'vs/workbench/contrib/comments/browser/commentColors';
 import { ICursorSelectionChangedEvent } from 'vs/editor/common/cursorEvents';
 import { CommentsPanel } from 'vs/workbench/contrib/comments/browser/commentsView';
 import { withNullAsUndefined, withUndefinedAsNull } from 'vs/base/common/types';
@@ -314,11 +309,6 @@ const ActiveCursorHasCommentingRange = new RawContextKey<boolean>('activeCursorH
 	type: 'boolean'
 });
 
-const WorkspaceHasCommenting = new RawContextKey<boolean>('workspaceHasCommenting', false, {
-	description: nls.localize('hasCommentingProvider', "Whether the open workspace has either comments or commenting ranges."),
-	type: 'boolean'
-});
-
 export class CommentController implements IEditorContribution {
 	private readonly globalToDispose = new DisposableStore();
 	private readonly localToDispose = new DisposableStore();
@@ -337,18 +327,17 @@ export class CommentController implements IEditorContribution {
 	private _pendingCommentCache: { [key: string]: { [key: string]: string } };
 	private _editorDisposables: IDisposable[] = [];
 	private _activeCursorHasCommentingRange: IContextKey<boolean>;
-	private _workspaceHasCommenting: IContextKey<boolean>;
 
 	constructor(
 		editor: ICodeEditor,
 		@ICommentService private readonly commentService: ICommentService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@ICodeEditorService private readonly codeEditorService: ICodeEditorService,
-		@IContextMenuService readonly contextMenuService: IContextMenuService,
+		@IContextMenuService private readonly contextMenuService: IContextMenuService,
 		@IQuickInputService private readonly quickInputService: IQuickInputService,
 		@IViewsService private readonly viewsService: IViewsService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IContextKeyService readonly contextKeyService: IContextKeyService,
+		@IContextKeyService contextKeyService: IContextKeyService,
 		@IEditorService private readonly editorService: IEditorService
 	) {
 		this._commentInfos = [];
@@ -356,7 +345,6 @@ export class CommentController implements IEditorContribution {
 		this._pendingCommentCache = {};
 		this._computePromise = null;
 		this._activeCursorHasCommentingRange = ActiveCursorHasCommentingRange.bindTo(contextKeyService);
-		this._workspaceHasCommenting = WorkspaceHasCommenting.bindTo(contextKeyService);
 
 		if (editor instanceof EmbeddedCodeEditorWidget) {
 			return;
@@ -388,11 +376,6 @@ export class CommentController implements IEditorContribution {
 				this.setComments(e.commentInfos.filter(commentInfo => commentInfo !== null));
 			}
 		}));
-		this.globalToDispose.add(this.commentService.onDidSetAllCommentThreads(e => {
-			if (e.commentThreads.length > 0) {
-				this._workspaceHasCommenting.set(true);
-			}
-		}));
 
 		this.globalToDispose.add(this.commentService.onDidChangeCommentingEnabled(e => {
 			if (e) {
@@ -408,7 +391,8 @@ export class CommentController implements IEditorContribution {
 			}
 		}));
 
-		this.globalToDispose.add(this.editor.onDidChangeModel(e => this.onModelChanged(e)));
+		this.globalToDispose.add(this.editor.onDidChangeModel(_ => this.onModelChanged()));
+		this.onModelChanged();
 		this.codeEditorService.registerDecorationType('comment-controller', COMMENTEDITOR_DECORATION_KEY, {});
 		this.beginCompute();
 	}
@@ -624,7 +608,7 @@ export class CommentController implements IEditorContribution {
 		this.editor = null!; // Strict null override - nulling out in dispose
 	}
 
-	public onModelChanged(e: IModelChangedEvent): void {
+	public onModelChanged(): void {
 		this.localToDispose.clear();
 
 		this.removeCommentWidgetsAndStoreCache();
@@ -951,7 +935,6 @@ export class CommentController implements IEditorContribution {
 		});
 
 		if (hasCommentsOrRanges && !this._commentingRangeSpaceReserved && this.commentService.isCommentingEnabled) {
-			this._workspaceHasCommenting.set(true);
 			this._commentingRangeSpaceReserved = true;
 			const { lineDecorationsWidth, extraEditorClassName } = this.getExistingCommentEditorOptions(this.editor);
 			const newOptions = this.getWithCommentsEditorOptions(this.editor, extraEditorClassName, lineDecorationsWidth);
@@ -975,9 +958,6 @@ export class CommentController implements IEditorContribution {
 		this.removeCommentWidgetsAndStoreCache();
 
 		this._commentInfos.forEach(info => {
-			if (info.threads.length > 0) {
-				this._workspaceHasCommenting.set(true);
-			}
 			const providerCacheStore = this._pendingCommentCache[info.owner];
 			info.threads = info.threads.filter(thread => !thread.isDisposed);
 			info.threads.forEach(thread => {
@@ -1227,104 +1207,3 @@ function getActiveController(accessor: ServicesAccessor): CommentController | un
 	return controller;
 }
 
-registerThemingParticipant((theme, collector) => {
-	const peekViewBackground = theme.getColor(peekViewResultsBackground);
-	if (peekViewBackground) {
-		collector.addRule(
-			`.monaco-editor .review-widget,` +
-			`.monaco-editor .review-widget {` +
-			`	background-color: ${peekViewBackground};` +
-			`}`);
-	}
-
-	const monacoEditorBackground = theme.getColor(peekViewTitleBackground);
-	if (monacoEditorBackground) {
-		collector.addRule(
-			`.review-widget .body .comment-form .review-thread-reply-button {` +
-			`	background-color: ${monacoEditorBackground}` +
-			`}`
-		);
-	}
-
-	const monacoEditorForeground = theme.getColor(editorForeground);
-	if (monacoEditorForeground) {
-		collector.addRule(
-			`.review-widget .body .monaco-editor {` +
-			`	color: ${monacoEditorForeground}` +
-			`}` +
-			`.review-widget .body .comment-form .review-thread-reply-button {` +
-			`	color: ${monacoEditorForeground};` +
-			`	font-size: inherit` +
-			`}`
-		);
-	}
-
-	const selectionBackground = theme.getColor(peekViewResultsSelectionBackground);
-
-	if (selectionBackground) {
-		collector.addRule(
-			`@keyframes monaco-review-widget-focus {` +
-			`	0% { background: ${selectionBackground}; }` +
-			`	100% { background: transparent; }` +
-			`}` +
-			`.review-widget .body .review-comment.focus {` +
-			`	animation: monaco-review-widget-focus 3s ease 0s;` +
-			`}`
-		);
-	}
-
-	const commentingRangeForeground = theme.getColor(overviewRulerCommentingRangeForeground);
-	if (commentingRangeForeground) {
-		collector.addRule(`
-			.monaco-editor .comment-diff-added,
-			.monaco-editor .comment-range-glyph.multiline-add {
-				border-left-color: ${commentingRangeForeground};
-			}
-			.monaco-editor .comment-diff-added:before,
-			.monaco-editor .comment-range-glyph.line-hover:before {
-				background: ${commentingRangeForeground};
-			}
-			.monaco-editor .comment-thread:before {
-				background: ${commentingRangeForeground};
-			}
-		`);
-	}
-
-	const statusBarItemHoverBackground = theme.getColor(STATUS_BAR_ITEM_HOVER_BACKGROUND);
-	if (statusBarItemHoverBackground) {
-		collector.addRule(`.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label.active:hover { background-color: ${statusBarItemHoverBackground};}`);
-	}
-
-	const statusBarItemActiveBackground = theme.getColor(STATUS_BAR_ITEM_ACTIVE_BACKGROUND);
-	if (statusBarItemActiveBackground) {
-		collector.addRule(`.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label:active { background-color: ${statusBarItemActiveBackground}; border: 1px solid transparent;}`);
-	}
-
-	const commentThreadRangeBackgroundColor = theme.getColor(commentThreadRangeBackground);
-	if (commentThreadRangeBackgroundColor) {
-		collector.addRule(`.monaco-editor .comment-thread-range { background-color: ${commentThreadRangeBackgroundColor};}`);
-	}
-
-	const commentThreadRangeBorderColor = theme.getColor(commentThreadRangeBorder);
-	if (commentThreadRangeBorderColor) {
-		collector.addRule(`.monaco-editor .comment-thread-range {
-		border-color: ${commentThreadRangeBorderColor};
-		border-width: 1px;
-		border-style: solid;
-		box-sizing: border-box; }`);
-	}
-
-	const commentThreadRangeActiveBackgroundColor = theme.getColor(commentThreadRangeActiveBackground);
-	if (commentThreadRangeActiveBackgroundColor) {
-		collector.addRule(`.monaco-editor .comment-thread-range-current { background-color: ${commentThreadRangeActiveBackgroundColor};}`);
-	}
-
-	const commentThreadRangeActiveBorderColor = theme.getColor(commentThreadRangeActiveBorder);
-	if (commentThreadRangeActiveBorderColor) {
-		collector.addRule(`.monaco-editor .comment-thread-range-current {
-		border-color: ${commentThreadRangeActiveBorderColor};
-		border-width: 1px;
-		border-style: solid;
-		box-sizing: border-box; }`);
-	}
-});
diff --git a/src/vs/workbench/contrib/comments/browser/commentsView.ts b/src/vs/workbench/contrib/comments/browser/commentsView.ts
index ef3b9aab7789cb..ab12b1641d61b2 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsView.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsView.ts
@@ -78,8 +78,8 @@ export class CommentsPanel extends FilterViewPane implements ICommentsView {
 		@ICommentService private readonly commentService: ICommentService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
-		@IActivityService readonly activityService: IActivityService,
-		@IStorageService readonly storageService: IStorageService
+		@IActivityService private readonly activityService: IActivityService,
+		@IStorageService storageService: IStorageService
 	) {
 		const stateMemento = new Memento(VIEW_STORAGE_ID, storageService);
 		const viewState = stateMemento.getMemento(StorageScope.WORKSPACE, StorageTarget.USER);
diff --git a/src/vs/workbench/contrib/comments/browser/media/review.css b/src/vs/workbench/contrib/comments/browser/media/review.css
index ef33e562093c1d..0d7041f472c77d 100644
--- a/src/vs/workbench/contrib/comments/browser/media/review.css
+++ b/src/vs/workbench/contrib/comments/browser/media/review.css
@@ -8,6 +8,10 @@
 	position: absolute;
 }
 
+.monaco-editor .review-widget,
+.monaco-editor .review-widget {
+	background-color: var(--vscode-peekViewResult-background);
+}
 .review-widget .hidden {
 	display: none !important;
 }
@@ -21,6 +25,19 @@
 	display: flex;
 }
 
+@keyframes monaco-review-widget-focus {
+	0% {
+		background: var(--vscode-peekViewResult-selectionBackground);
+	}
+
+	100% {
+		background: transparent;
+	}
+}
+
+.review-widget .body .review-comment.focus {
+	animation: monaco-review-widget-focus 3s ease 0s;
+}
 .review-widget .body .review-comment .comment-actions {
 	margin-left: auto;
 }
@@ -183,6 +200,14 @@
 	opacity: 0.6;
 }
 
+.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label.active:hover {
+	background-color: var(--vscode-statusBarItem-hoverBackground);
+}
+
+.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label:active {
+	background-color: var(--vscode-statusBarItem-activeBackground);
+	border: 1px solid transparent;
+}
 .review-widget .body .review-comment .review-comment-contents a {
 	cursor: pointer;
 }
@@ -253,7 +278,7 @@
 
 .review-widget .body .comment-additional-actions .section-separator {
 	border-top: 1px solid var(--vscode-menu-separatorBackground);
-	margin: 14px 0;
+	margin: 10px 0 14px;
 }
 
 .review-widget .body .comment-additional-actions .button-bar {
@@ -282,6 +307,9 @@
 	align-items: center;
 }
 
+.review-widget .body .monaco-editor {
+	color: var(--vscode-editor-foreground);
+}
 .review-widget .body .comment-form.expand .review-thread-reply-button {
 	display: none;
 }
@@ -305,6 +333,10 @@
 	white-space: nowrap;
 	border: 0px;
 	outline: 1px solid transparent;
+	background-color: var(--vscode-peekViewTitle-background);
+	color: var(--vscode--editor-foreground);
+	font-size: inherit;
+	font-family: var(--monaco-monospace-font);
 }
 
 .review-widget .body .comment-form .review-thread-reply-button:focus {
@@ -344,7 +376,6 @@
 	width: auto;
 	padding: 4px 10px;
 	margin-left: 5px;
-	margin-bottom: 5px;
 }
 
 .review-widget .body .form-actions .monaco-text-button {
@@ -425,6 +456,37 @@ div.preview.inline .monaco-editor .comment-range-glyph {
 	border-left-style: solid;
 }
 
+.monaco-editor .comment-diff-added,
+.monaco-editor .comment-range-glyph.multiline-add {
+	border-left-color: var(--vscode-editorGutter-commentRangeForeground);
+}
+
+.monaco-editor .comment-diff-added:before,
+.monaco-editor .comment-range-glyph.line-hover:before {
+	background: var(--vscode-editorGutter-commentRangeForeground);
+}
+
+.monaco-editor .comment-thread:before {
+	background: var(--vscode-editorGutter-commentRangeForeground);
+}
+
+.monaco-editor .comment-thread-range,
+.monaco-editor .comment-thread-range-current {
+	border-width: 1px;
+	border-style: solid;
+	box-sizing: border-box;
+}
+
+.monaco-editor .comment-thread-range {
+	background-color: var(--vscode-editorCommentsWidget-rangeBackground);
+	border-color: var(--vscode-editorCommentsWidget-rangeBorder);
+}
+
+.monaco-editor .comment-thread-range-current {
+	background-color: var(--vscode-editorCommentsWidget-rangeActiveBackground);
+	border-color: var(--vscode-editorCommentsWidget-rangeActiveBorder);
+}
+
 .monaco-editor .margin-view-overlays .comment-range-glyph.line-hover,
 .monaco-editor .margin-view-overlays .comment-range-glyph.comment-thread {
 	margin-left: 13px;
diff --git a/src/vs/workbench/contrib/comments/browser/simpleCommentEditor.ts b/src/vs/workbench/contrib/comments/browser/simpleCommentEditor.ts
index b1baca4d50a3d4..708ac4e0be297d 100644
--- a/src/vs/workbench/contrib/comments/browser/simpleCommentEditor.ts
+++ b/src/vs/workbench/contrib/comments/browser/simpleCommentEditor.ts
@@ -49,7 +49,6 @@ export class SimpleCommentEditor extends CodeEditorWidget {
 		@ILanguageFeaturesService languageFeaturesService: ILanguageFeaturesService,
 	) {
 		const codeEditorWidgetOptions: ICodeEditorWidgetOptions = {
-			isSimpleWidget: true,
 			contributions: <IEditorContributionDescription[]>[
 				{ id: MenuPreventer.ID, ctor: MenuPreventer, instantiation: EditorContributionInstantiation.BeforeFirstInteraction },
 				{ id: ContextMenuController.ID, ctor: ContextMenuController, instantiation: EditorContributionInstantiation.BeforeFirstInteraction },
diff --git a/src/vs/workbench/contrib/debug/browser/baseDebugView.ts b/src/vs/workbench/contrib/debug/browser/baseDebugView.ts
index 479332bd147fb2..7dde04a8bb477d 100644
--- a/src/vs/workbench/contrib/debug/browser/baseDebugView.ts
+++ b/src/vs/workbench/contrib/debug/browser/baseDebugView.ts
@@ -204,6 +204,7 @@ export abstract class AbstractExpressionsRenderer implements ITreeRenderer<IExpr
 		nameElement.style.display = 'none';
 		valueElement.style.display = 'none';
 		inputBoxContainer.style.display = 'initial';
+		dom.clearNode(inputBoxContainer);
 
 		const inputBox = new InputBox(inputBoxContainer, this.contextViewService, { ...options, inputBoxStyles: defaultInputBoxStyles });
 
diff --git a/src/vs/workbench/contrib/debug/browser/breakpointsView.ts b/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
index 8706a1c8918cdb..d555eb5bca8b29 100644
--- a/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
+++ b/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
@@ -7,6 +7,7 @@ import * as dom from 'vs/base/browser/dom';
 import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { Gesture } from 'vs/base/browser/touch';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
+import { AriaRole } from 'vs/base/browser/ui/aria/aria';
 import { IconLabel } from 'vs/base/browser/ui/iconLabel/iconLabel';
 import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
 import { IListContextMenuEvent, IListRenderer, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
@@ -1010,7 +1011,7 @@ class BreakpointsAccessibilityProvider implements IListAccessibilityProvider<Bre
 		return localize('breakpoints', "Breakpoints");
 	}
 
-	getRole() {
+	getRole(): AriaRole {
 		return 'checkbox';
 	}
 
diff --git a/src/vs/workbench/contrib/debug/browser/callStackView.ts b/src/vs/workbench/contrib/debug/browser/callStackView.ts
index 1660bbd749ddc6..093ddd82233a22 100644
--- a/src/vs/workbench/contrib/debug/browser/callStackView.ts
+++ b/src/vs/workbench/contrib/debug/browser/callStackView.ts
@@ -5,6 +5,7 @@
 
 import * as dom from 'vs/base/browser/dom';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
+import { AriaRole } from 'vs/base/browser/ui/aria/aria';
 import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
 import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
 import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
@@ -1042,12 +1043,12 @@ class CallStackAccessibilityProvider implements IListAccessibilityProvider<CallS
 		return localize({ comment: ['Debug is a noun in this context, not a verb.'], key: 'callStackAriaLabel' }, "Debug Call Stack");
 	}
 
-	getWidgetRole(): string {
+	getWidgetRole(): AriaRole {
 		// Use treegrid as a role since each element can have additional actions inside #146210
 		return 'treegrid';
 	}
 
-	getRole(_element: CallStackItem): string | undefined {
+	getRole(_element: CallStackItem): AriaRole | undefined {
 		return 'row';
 	}
 
diff --git a/src/vs/workbench/contrib/debug/browser/debug.contribution.ts b/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
index 731a1839b27c5c..30173c4b03e314 100644
--- a/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
+++ b/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
@@ -9,7 +9,7 @@ import { isMacintosh, isWeb } from 'vs/base/common/platform';
 import { URI } from 'vs/base/common/uri';
 import 'vs/css!./media/debug.contribution';
 import 'vs/css!./media/debugHover';
-import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
+import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import * as nls from 'vs/nls';
 import { ICommandActionTitle, Icon } from 'vs/platform/action/common/action';
@@ -49,7 +49,7 @@ import { StatusBarColorProvider } from 'vs/workbench/contrib/debug/browser/statu
 import { ADD_TO_WATCH_ID, BREAK_WHEN_VALUE_CHANGES_ID, BREAK_WHEN_VALUE_IS_ACCESSED_ID, BREAK_WHEN_VALUE_IS_READ_ID, COPY_EVALUATE_PATH_ID, COPY_VALUE_ID, SET_VARIABLE_ID, VariablesView, VIEW_MEMORY_ID } from 'vs/workbench/contrib/debug/browser/variablesView';
 import { ADD_WATCH_ID, ADD_WATCH_LABEL, REMOVE_WATCH_EXPRESSIONS_COMMAND_ID, REMOVE_WATCH_EXPRESSIONS_LABEL, WatchExpressionsView } from 'vs/workbench/contrib/debug/browser/watchExpressionsView';
 import { WelcomeView } from 'vs/workbench/contrib/debug/browser/welcomeView';
-import { BREAKPOINTS_VIEW_ID, BREAKPOINT_EDITOR_CONTRIBUTION_ID, CALLSTACK_VIEW_ID, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED, CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_CAN_VIEW_MEMORY, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_STATE, CONTEXT_DEBUG_UX, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_IN_DEBUG_MODE, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, CONTEXT_LOADED_SCRIPTS_SUPPORTED, CONTEXT_RESTART_FRAME_SUPPORTED, CONTEXT_SET_EXPRESSION_SUPPORTED, CONTEXT_SET_VARIABLE_SUPPORTED, CONTEXT_STACK_FRAME_SUPPORTS_RESTART, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_WATCH_ITEM_TYPE, DEBUG_PANEL_ID, DISASSEMBLY_VIEW_ID, EDITOR_CONTRIBUTION_ID, getStateLabel, IDebugService, INTERNAL_CONSOLE_OPTIONS_SCHEMA, LOADED_SCRIPTS_VIEW_ID, REPL_VIEW_ID, State, VARIABLES_VIEW_ID, VIEWLET_ID, WATCH_VIEW_ID } from 'vs/workbench/contrib/debug/common/debug';
+import { BREAKPOINTS_VIEW_ID, BREAKPOINT_EDITOR_CONTRIBUTION_ID, CALLSTACK_VIEW_ID, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED, CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_CAN_VIEW_MEMORY, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_HAS_DEBUGGED, CONTEXT_DEBUG_STATE, CONTEXT_DEBUG_UX, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_IN_DEBUG_MODE, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, CONTEXT_LOADED_SCRIPTS_SUPPORTED, CONTEXT_RESTART_FRAME_SUPPORTED, CONTEXT_SET_EXPRESSION_SUPPORTED, CONTEXT_SET_VARIABLE_SUPPORTED, CONTEXT_STACK_FRAME_SUPPORTS_RESTART, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_WATCH_ITEM_TYPE, DEBUG_PANEL_ID, DISASSEMBLY_VIEW_ID, EDITOR_CONTRIBUTION_ID, getStateLabel, IDebugService, INTERNAL_CONSOLE_OPTIONS_SCHEMA, LOADED_SCRIPTS_VIEW_ID, REPL_VIEW_ID, State, VARIABLES_VIEW_ID, VIEWLET_ID, WATCH_VIEW_ID } from 'vs/workbench/contrib/debug/common/debug';
 import { DebugContentProvider } from 'vs/workbench/contrib/debug/common/debugContentProvider';
 import { DebugLifecycle } from 'vs/workbench/contrib/debug/common/debugLifecycle';
 import { DisassemblyViewInput } from 'vs/workbench/contrib/debug/common/disassemblyViewInput';
@@ -90,9 +90,9 @@ Registry.as<IQuickAccessRegistry>(QuickAccessExtensions.Quickaccess).registerQui
 	helpEntries: [{ description: nls.localize('tasksQuickAccessHelp', "Show All Debug Consoles"), commandId: SELECT_DEBUG_CONSOLE_ID }]
 });
 
-registerEditorContribution('editor.contrib.callStack', LazyCallStackEditorContribution);
-registerEditorContribution(BREAKPOINT_EDITOR_CONTRIBUTION_ID, LazyBreakpointEditorContribution);
-registerEditorContribution(EDITOR_CONTRIBUTION_ID, LazyDebugEditorContribution);
+registerEditorContribution('editor.contrib.callStack', LazyCallStackEditorContribution, EditorContributionInstantiation.Eager);
+registerEditorContribution(BREAKPOINT_EDITOR_CONTRIBUTION_ID, LazyBreakpointEditorContribution, EditorContributionInstantiation.Eager);
+registerEditorContribution(EDITOR_CONTRIBUTION_ID, LazyDebugEditorContribution, EditorContributionInstantiation.Eager);
 
 const registerDebugCommandPaletteItem = (id: string, title: ICommandActionTitle, when?: ContextKeyExpression, precondition?: ContextKeyExpression) => {
 	MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
@@ -224,7 +224,6 @@ MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
 		original: 'Run',
 		mnemonicTitle: nls.localize({ key: 'mRun', comment: ['&& denotes a mnemonic'] }, "&&Run")
 	},
-	when: ContextKeyExpr.or(CONTEXT_DEBUGGERS_AVAILABLE),
 	order: 6
 });
 
@@ -356,7 +355,6 @@ MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
 		id: 'debug.installAdditionalDebuggers',
 		title: nls.localize({ key: 'miInstallAdditionalDebuggers', comment: ['&& denotes a mnemonic'] }, "&&Install Additional Debuggers...")
 	},
-	when: CONTEXT_DEBUGGERS_AVAILABLE,
 	order: 1
 });
 
@@ -409,7 +407,7 @@ const viewsRegistry = Registry.as<IViewsRegistry>(ViewExtensions.ViewsRegistry);
 viewsRegistry.registerViews([{ id: VARIABLES_VIEW_ID, name: nls.localize('variables', "Variables"), containerIcon: icons.variablesViewIcon, ctorDescriptor: new SyncDescriptor(VariablesView), order: 10, weight: 40, canToggleVisibility: true, canMoveView: true, focusCommand: { id: 'workbench.debug.action.focusVariablesView' }, when: CONTEXT_DEBUG_UX.isEqualTo('default') }], viewContainer);
 viewsRegistry.registerViews([{ id: WATCH_VIEW_ID, name: nls.localize('watch', "Watch"), containerIcon: icons.watchViewIcon, ctorDescriptor: new SyncDescriptor(WatchExpressionsView), order: 20, weight: 10, canToggleVisibility: true, canMoveView: true, focusCommand: { id: 'workbench.debug.action.focusWatchView' }, when: CONTEXT_DEBUG_UX.isEqualTo('default') }], viewContainer);
 viewsRegistry.registerViews([{ id: CALLSTACK_VIEW_ID, name: nls.localize('callStack', "Call Stack"), containerIcon: icons.callStackViewIcon, ctorDescriptor: new SyncDescriptor(CallStackView), order: 30, weight: 30, canToggleVisibility: true, canMoveView: true, focusCommand: { id: 'workbench.debug.action.focusCallStackView' }, when: CONTEXT_DEBUG_UX.isEqualTo('default') }], viewContainer);
-viewsRegistry.registerViews([{ id: BREAKPOINTS_VIEW_ID, name: nls.localize('breakpoints', "Breakpoints"), containerIcon: icons.breakpointsViewIcon, ctorDescriptor: new SyncDescriptor(BreakpointsView), order: 40, weight: 20, canToggleVisibility: true, canMoveView: true, focusCommand: { id: 'workbench.debug.action.focusBreakpointsView' }, when: ContextKeyExpr.or(CONTEXT_BREAKPOINTS_EXIST, CONTEXT_DEBUG_UX.isEqualTo('default')) }], viewContainer);
+viewsRegistry.registerViews([{ id: BREAKPOINTS_VIEW_ID, name: nls.localize('breakpoints', "Breakpoints"), containerIcon: icons.breakpointsViewIcon, ctorDescriptor: new SyncDescriptor(BreakpointsView), order: 40, weight: 20, canToggleVisibility: true, canMoveView: true, focusCommand: { id: 'workbench.debug.action.focusBreakpointsView' }, when: ContextKeyExpr.or(CONTEXT_BREAKPOINTS_EXIST, CONTEXT_DEBUG_UX.isEqualTo('default'), CONTEXT_HAS_DEBUGGED) }], viewContainer);
 viewsRegistry.registerViews([{ id: WelcomeView.ID, name: WelcomeView.LABEL, containerIcon: icons.runViewIcon, ctorDescriptor: new SyncDescriptor(WelcomeView), order: 1, weight: 40, canToggleVisibility: true, when: CONTEXT_DEBUG_UX.isEqualTo('simple') }], viewContainer);
 viewsRegistry.registerViews([{ id: LOADED_SCRIPTS_VIEW_ID, name: nls.localize('loadedScripts', "Loaded Scripts"), containerIcon: icons.loadedScriptsViewIcon, ctorDescriptor: new SyncDescriptor(LoadedScriptsView), order: 35, weight: 5, canToggleVisibility: true, canMoveView: true, collapsed: true, when: ContextKeyExpr.and(CONTEXT_LOADED_SCRIPTS_SUPPORTED, CONTEXT_DEBUG_UX.isEqualTo('default')) }], viewContainer);
 
@@ -578,6 +576,11 @@ configurationRegistry.registerConfiguration({
 			type: 'boolean',
 			default: false,
 			description: nls.localize('debug.autoExpandLazyVariables', "Automatically show values for variables that are lazily resolved by the debugger, such as getters.")
+		},
+		'debug.enableStatusBarColor': {
+			type: 'boolean',
+			description: nls.localize('debug.enableStatusBarColor', "Color status bar when debugger is active"),
+			default: true
 		}
 	}
 });
diff --git a/src/vs/workbench/contrib/debug/browser/debugCommands.ts b/src/vs/workbench/contrib/debug/browser/debugCommands.ts
index b33e1b7a7a4689..46414b4767664b 100644
--- a/src/vs/workbench/contrib/debug/browser/debugCommands.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugCommands.ts
@@ -156,6 +156,8 @@ function getFrame(debugService: IDebugService, context: CallStackContext | unkno
 				return thread.getCallStack().find(sf => sf.getId() === context.frameId);
 			}
 		}
+	} else {
+		return debugService.getViewModel().focusedStackFrame;
 	}
 
 	return undefined;
@@ -299,7 +301,8 @@ CommandsRegistry.registerCommand({
 	handler: async (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
 		const textResourcePropertiesService = accessor.get(ITextResourcePropertiesService);
 		const clipboardService = accessor.get(IClipboardService);
-		const frame = getFrame(accessor.get(IDebugService), context);
+		const debugService = accessor.get(IDebugService);
+		const frame = getFrame(debugService, context);
 		if (frame) {
 			const eol = textResourcePropertiesService.getEOL(frame.source.uri);
 			await clipboardService.writeText(frame.thread.getCallStack().map(sf => sf.toString()).join(eol));
@@ -458,7 +461,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 		} else {
 			const showSubSessions = configurationService.getValue<IDebugConfiguration>('debug').showSubSessionsInToolBar;
 			// Stop should be sent to the root parent session
-			while (!showSubSessions && session && session.parentSession) {
+			while (!showSubSessions && session.lifecycleManagedByParent && session.parentSession) {
 				session = session.parentSession;
 			}
 			session.removeReplExpressions();
@@ -605,7 +608,7 @@ async function stopHandler(accessor: ServicesAccessor, _: string, context: CallS
 	const configurationService = accessor.get(IConfigurationService);
 	const showSubSessions = configurationService.getValue<IDebugConfiguration>('debug').showSubSessionsInToolBar;
 	// Stop should be sent to the root parent session
-	while (!showSubSessions && session && session.parentSession) {
+	while (!showSubSessions && session && session.lifecycleManagedByParent && session.parentSession) {
 		session = session.parentSession;
 	}
 
diff --git a/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts b/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts
index fe3d0e298423d2..2d370a42a7c128 100644
--- a/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts
@@ -468,8 +468,12 @@ export class ConfigurationManager implements IConfigurationManager {
 	}
 }
 
-abstract class AbstractLaunch {
+abstract class AbstractLaunch implements ILaunch {
+	abstract readonly uri: uri;
+	abstract readonly name: string;
+	abstract readonly workspace: IWorkspaceFolder | undefined;
 	protected abstract getConfig(): IGlobalConfig | undefined;
+	abstract openConfigFile(options: { preserveFocus: boolean; type?: string | undefined; suppressInitialConfigs?: boolean | undefined }, token?: CancellationToken | undefined): Promise<{ editor: IEditorPane | null; created: boolean }>;
 
 	constructor(
 		protected configurationManager: ConfigurationManager,
diff --git a/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts b/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
index 3ea12d46cd55b7..90976464bb3cd1 100644
--- a/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
@@ -243,6 +243,7 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 	private hoverPosition: Position | null = null;
 	private mouseDown = false;
 	private exceptionWidgetVisible: IContextKey<boolean>;
+	private gutterIsHovered = false;
 
 	private exceptionWidget: ExceptionWidget | undefined;
 	private configurationWidget: FloatingClickWidget | undefined;
@@ -298,14 +299,11 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 		this.toDispose.push(this.debugService.getViewModel().onWillUpdateViews(() => this.updateInlineValuesScheduler.schedule()));
 		this.toDispose.push(this.debugService.getViewModel().onDidEvaluateLazyExpression(() => this.updateInlineValuesScheduler.schedule()));
 		this.toDispose.push(this.editor.onDidChangeModel(async () => {
-			const stackFrame = this.debugService.getViewModel().focusedStackFrame;
-			const model = this.editor.getModel();
-			if (model) {
-				this.applyHoverConfiguration(model, stackFrame);
-			}
+			this.updateHoverConfiguration();
 			this.toggleExceptionWidget();
 			this.hideHoverWidget();
 			this._wordToLineNumbersMap = undefined;
+			const stackFrame = this.debugService.getViewModel().focusedStackFrame;
 			await this.updateInlineValueDecorations(stackFrame);
 		}));
 		this.toDispose.push(this.editor.onDidScrollChange(() => {
@@ -332,6 +330,14 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 		return this._wordToLineNumbersMap;
 	}
 
+	private updateHoverConfiguration(): void {
+		const stackFrame = this.debugService.getViewModel().focusedStackFrame;
+		const model = this.editor.getModel();
+		if (model) {
+			this.applyHoverConfiguration(model, stackFrame);
+		}
+	}
+
 	private applyHoverConfiguration(model: ITextModel, stackFrame: IStackFrame | undefined): void {
 		if (stackFrame && this.uriIdentityService.extUri.isEqual(model.uri, stackFrame.source.uri)) {
 			if (this.altListener) {
@@ -466,10 +472,21 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 		const target = mouseEvent.target;
 		const stopKey = env.isMacintosh ? 'metaKey' : 'ctrlKey';
 
+		if (!this.altPressed) {
+			if (target.type === MouseTargetType.GUTTER_GLYPH_MARGIN) {
+				this.editor.updateOptions({ hover: { enabled: true } });
+				this.gutterIsHovered = true;
+			} else if (this.gutterIsHovered) {
+				this.gutterIsHovered = false;
+				this.updateHoverConfiguration();
+			}
+		}
+
 		if (target.type === MouseTargetType.CONTENT_WIDGET && target.detail === DebugHoverWidget.ID && !(<any>mouseEvent.event)[stopKey]) {
 			// mouse moved on top of debug hover widget
 			return;
 		}
+
 		if (target.type === MouseTargetType.CONTENT_TEXT) {
 			if (target.position && !Position.equals(target.position, this.hoverPosition)) {
 				this.hoverPosition = target.position;
diff --git a/src/vs/workbench/contrib/debug/browser/debugService.ts b/src/vs/workbench/contrib/debug/browser/debugService.ts
index 8dd9418a7adc64..82ac3f6473a974 100644
--- a/src/vs/workbench/contrib/debug/browser/debugService.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugService.ts
@@ -39,7 +39,7 @@ import { ConfigurationManager } from 'vs/workbench/contrib/debug/browser/debugCo
 import { DebugMemoryFileSystemProvider } from 'vs/workbench/contrib/debug/browser/debugMemory';
 import { DebugSession } from 'vs/workbench/contrib/debug/browser/debugSession';
 import { DebugTaskRunner, TaskRunResult } from 'vs/workbench/contrib/debug/browser/debugTaskRunner';
-import { CALLSTACK_VIEW_ID, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_DEBUG_STATE, CONTEXT_DEBUG_TYPE, CONTEXT_DEBUG_UX, CONTEXT_DISASSEMBLY_VIEW_FOCUS, CONTEXT_IN_DEBUG_MODE, debuggerDisabledMessage, DEBUG_MEMORY_SCHEME, getStateLabel, IAdapterManager, IBreakpoint, IBreakpointData, ICompound, IConfig, IConfigurationManager, IDebugConfiguration, IDebugModel, IDebugService, IDebugSession, IDebugSessionOptions, IEnablement, IExceptionBreakpoint, IGlobalConfig, ILaunch, IStackFrame, IThread, IViewModel, REPL_VIEW_ID, State, VIEWLET_ID } from 'vs/workbench/contrib/debug/common/debug';
+import { CALLSTACK_VIEW_ID, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_HAS_DEBUGGED, CONTEXT_DEBUG_STATE, CONTEXT_DEBUG_TYPE, CONTEXT_DEBUG_UX, CONTEXT_DISASSEMBLY_VIEW_FOCUS, CONTEXT_IN_DEBUG_MODE, debuggerDisabledMessage, DEBUG_MEMORY_SCHEME, getStateLabel, IAdapterManager, IBreakpoint, IBreakpointData, ICompound, IConfig, IConfigurationManager, IDebugConfiguration, IDebugModel, IDebugService, IDebugSession, IDebugSessionOptions, IEnablement, IExceptionBreakpoint, IGlobalConfig, ILaunch, IStackFrame, IThread, IViewModel, REPL_VIEW_ID, State, VIEWLET_ID } from 'vs/workbench/contrib/debug/common/debug';
 import { DebugCompoundRoot } from 'vs/workbench/contrib/debug/common/debugCompoundRoot';
 import { Debugger } from 'vs/workbench/contrib/debug/common/debugger';
 import { Breakpoint, DataBreakpoint, DebugModel, FunctionBreakpoint, InstructionBreakpoint } from 'vs/workbench/contrib/debug/common/debugModel';
@@ -75,6 +75,7 @@ export class DebugService implements IDebugService {
 	private debugState!: IContextKey<string>;
 	private inDebugMode!: IContextKey<boolean>;
 	private debugUx!: IContextKey<string>;
+	private hasDebugged!: IContextKey<boolean>;
 	private breakpointsExist!: IContextKey<boolean>;
 	private disassemblyViewFocus!: IContextKey<boolean>;
 	private breakpointsToSendOnResourceSaved: Set<URI>;
@@ -202,6 +203,7 @@ export class DebugService implements IDebugService {
 			contextKeyService.bufferChangeEvents(() => {
 				this.debugType = CONTEXT_DEBUG_TYPE.bindTo(contextKeyService);
 				this.debugState = CONTEXT_DEBUG_STATE.bindTo(contextKeyService);
+				this.hasDebugged = CONTEXT_HAS_DEBUGGED.bindTo(contextKeyService);
 				this.inDebugMode = CONTEXT_IN_DEBUG_MODE.bindTo(contextKeyService);
 				this.debugUx = CONTEXT_DEBUG_UX.bindTo(contextKeyService);
 				this.debugUx.set(this.debugStorage.loadDebugUxState());
@@ -339,8 +341,8 @@ export class DebugService implements IDebugService {
 		}
 
 		this.lazySetup();
-
 		this.startInitializingState(options);
+		this.hasDebugged.set(true);
 		try {
 			// make sure to save all files and that the configuration is up to date
 			await this.extensionService.activateByEvent('onDebug');
diff --git a/src/vs/workbench/contrib/debug/browser/debugSession.ts b/src/vs/workbench/contrib/debug/browser/debugSession.ts
index 6a09845b9443a9..a63727275236b8 100644
--- a/src/vs/workbench/contrib/debug/browser/debugSession.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugSession.ts
@@ -10,7 +10,7 @@ import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cance
 import { canceled } from 'vs/base/common/errors';
 import { Emitter, Event } from 'vs/base/common/event';
 import { normalizeDriveLetter } from 'vs/base/common/labels';
-import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { DisposableStore, dispose, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
 import { mixin } from 'vs/base/common/objects';
 import * as platform from 'vs/base/common/platform';
 import * as resources from 'vs/base/common/resources';
@@ -40,6 +40,7 @@ import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecy
 import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
 
 export class DebugSession implements IDebugSession {
+	parentSession: IDebugSession | undefined;
 
 	private _subId: string | undefined;
 	raw: RawDebugSession | undefined; // used in tests
@@ -93,16 +94,18 @@ export class DebugSession implements IDebugSession {
 		@IWorkbenchEnvironmentService private readonly workbenchEnvironmentService: IWorkbenchEnvironmentService,
 	) {
 		this._options = options || {};
+		this.parentSession = this._options.parentSession;
 		if (this.hasSeparateRepl()) {
 			this.repl = new ReplModel(this.configurationService);
 		} else {
 			this.repl = (this.parentSession as DebugSession).repl;
 		}
 
-		const toDispose: IDisposable[] = [];
-		toDispose.push(this.repl.onDidChangeElements(() => this._onDidChangeREPLElements.fire()));
+		const toDispose = new DisposableStore();
+		const replListener = toDispose.add(new MutableDisposable());
+		replListener.value = this.repl.onDidChangeElements(() => this._onDidChangeREPLElements.fire());
 		if (lifecycleService) {
-			toDispose.push(lifecycleService.onWillShutdown(() => {
+			toDispose.add(lifecycleService.onWillShutdown(() => {
 				this.shutdown();
 				dispose(toDispose);
 			}));
@@ -110,7 +113,7 @@ export class DebugSession implements IDebugSession {
 
 		const compoundRoot = this._options.compoundRoot;
 		if (compoundRoot) {
-			toDispose.push(compoundRoot.onDidSessionStop(() => this.terminate()));
+			toDispose.add(compoundRoot.onDidSessionStop(() => this.terminate()));
 		}
 		this.passFocusScheduler = new RunOnceScheduler(() => {
 			// If there is some session or thread that is stopped pass focus to it
@@ -130,6 +133,18 @@ export class DebugSession implements IDebugSession {
 				}
 			}
 		}, 800);
+
+		const parent = this._options.parentSession;
+		if (parent) {
+			toDispose.add(parent.onDidEndAdapter(() => {
+				// copy the parent repl and get a new detached repl for this child
+				if (!this.hasSeparateRepl()) {
+					this.repl = this.repl.clone();
+					replListener.value = this.repl.onDidChangeElements(() => this._onDidChangeREPLElements.fire());
+				}
+				this.parentSession = undefined;
+			}));
+		}
 	}
 
 	getId(): string {
@@ -156,8 +171,8 @@ export class DebugSession implements IDebugSession {
 		return this._configuration.unresolved;
 	}
 
-	get parentSession(): IDebugSession | undefined {
-		return this._options.parentSession;
+	get lifecycleManagedByParent(): boolean {
+		return !!this._options.lifecycleManagedByParent;
 	}
 
 	get compact(): boolean {
diff --git a/src/vs/workbench/contrib/debug/browser/debugStatus.ts b/src/vs/workbench/contrib/debug/browser/debugStatus.ts
index 1addcfce1eced8..8d16f4d5494e59 100644
--- a/src/vs/workbench/contrib/debug/browser/debugStatus.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugStatus.ts
@@ -18,8 +18,8 @@ export class DebugStatusContribution implements IWorkbenchContribution {
 
 	constructor(
 		@IStatusbarService private readonly statusBarService: IStatusbarService,
-		@IDebugService readonly debugService: IDebugService,
-		@IConfigurationService readonly configurationService: IConfigurationService
+		@IDebugService private readonly debugService: IDebugService,
+		@IConfigurationService configurationService: IConfigurationService
 	) {
 
 		const addStatusBarEntry = () => {
diff --git a/src/vs/workbench/contrib/debug/browser/debugTitle.ts b/src/vs/workbench/contrib/debug/browser/debugTitle.ts
index 88985905400a93..1727597dab584d 100644
--- a/src/vs/workbench/contrib/debug/browser/debugTitle.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugTitle.ts
@@ -14,9 +14,9 @@ export class DebugTitleContribution implements IWorkbenchContribution {
 	private toDispose: IDisposable[] = [];
 
 	constructor(
-		@IDebugService readonly debugService: IDebugService,
-		@IHostService readonly hostService: IHostService,
-		@ITitleService readonly titleService: ITitleService
+		@IDebugService debugService: IDebugService,
+		@IHostService hostService: IHostService,
+		@ITitleService titleService: ITitleService
 	) {
 		const updateTitle = () => {
 			if (debugService.state === State.Stopped && !hostService.hasFocus) {
diff --git a/src/vs/workbench/contrib/debug/browser/debugToolBar.ts b/src/vs/workbench/contrib/debug/browser/debugToolBar.ts
index 32b27bc55edec9..d599dec0369447 100644
--- a/src/vs/workbench/contrib/debug/browser/debugToolBar.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugToolBar.ts
@@ -27,7 +27,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { contrastBorder, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
+import { widgetBorder, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
 import { IThemeService, Themable, ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { FocusSessionActionViewItem } from 'vs/workbench/contrib/debug/browser/debugActionViewItems';
@@ -195,7 +195,7 @@ export class DebugToolBar extends Themable implements IWorkbenchContribution {
 			const widgetShadowColor = this.getColor(widgetShadow);
 			this.$el.style.boxShadow = widgetShadowColor ? `0 0 8px 2px ${widgetShadowColor}` : '';
 
-			const contrastBorderColor = this.getColor(contrastBorder);
+			const contrastBorderColor = this.getColor(widgetBorder);
 			const borderColor = this.getColor(debugToolBarBorder);
 
 			if (contrastBorderColor) {
diff --git a/src/vs/workbench/contrib/debug/browser/disassemblyView.ts b/src/vs/workbench/contrib/debug/browser/disassemblyView.ts
index ad0e1185498389..8d2275c45084ed 100644
--- a/src/vs/workbench/contrib/debug/browser/disassemblyView.ts
+++ b/src/vs/workbench/contrib/debug/browser/disassemblyView.ts
@@ -581,7 +581,7 @@ class InstructionRenderer extends Disposable implements ITableRenderer<IDisassem
 		@IThemeService themeService: IThemeService,
 		@IEditorService private readonly editorService: IEditorService,
 		@ITextModelService private readonly textModelService: ITextModelService,
-		@IUriIdentityService readonly uriService: IUriIdentityService,
+		@IUriIdentityService private readonly uriService: IUriIdentityService,
 	) {
 		super();
 
diff --git a/src/vs/workbench/contrib/debug/browser/linkDetector.ts b/src/vs/workbench/contrib/debug/browser/linkDetector.ts
index 4615c12f47a68a..abfca65cb23dd8 100644
--- a/src/vs/workbench/contrib/debug/browser/linkDetector.ts
+++ b/src/vs/workbench/contrib/debug/browser/linkDetector.ts
@@ -17,6 +17,7 @@ import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { localize } from 'vs/nls';
 import { ITunnelService } from 'vs/platform/tunnel/common/tunnel';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 
 const CONTROL_CODES = '\\u0000-\\u0020\\u007f-\\u009f';
 const WEB_LINK_REGEX = new RegExp('(?:[a-zA-Z][a-zA-Z0-9+.-]{2,}:\\/\\/|data:|www\\.)[^\\s' + CONTROL_CODES + '"]{2,}[^\\s' + CONTROL_CODES + '"\')}\\],:;.!?]', 'ug');
@@ -45,7 +46,8 @@ export class LinkDetector {
 		@IOpenerService private readonly openerService: IOpenerService,
 		@IPathService private readonly pathService: IPathService,
 		@ITunnelService private readonly tunnelService: ITunnelService,
-		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService
+		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
+		@IConfigurationService private readonly configurationService: IConfigurationService
 	) {
 		// noop
 	}
@@ -140,7 +142,7 @@ export class LinkDetector {
 				return;
 			}
 
-			this.openerService.open(url, { allowTunneling: !!this.environmentService.remoteAuthority });
+			this.openerService.open(url, { allowTunneling: (!!this.environmentService.remoteAuthority && this.configurationService.getValue('remote.forwardOnOpen')) });
 		});
 
 		return link;
diff --git a/src/vs/workbench/contrib/debug/browser/media/debugToolBar.css b/src/vs/workbench/contrib/debug/browser/media/debugToolBar.css
index 746a06f7318e5e..f32eaab62f8ef8 100644
--- a/src/vs/workbench/contrib/debug/browser/media/debugToolBar.css
+++ b/src/vs/workbench/contrib/debug/browser/media/debugToolBar.css
@@ -9,6 +9,7 @@
 	height: 32px;
 	display: flex;
 	padding-left: 7px;
+	border-radius: 4px;
 }
 
 .monaco-workbench .debug-toolbar .monaco-action-bar .action-item {
diff --git a/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts b/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts
index 49b0b302764d74..75e7543ff6c0cc 100644
--- a/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts
+++ b/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts
@@ -573,7 +573,7 @@ export class RawDebugSession implements IDisposable {
 				} catch (e) {
 					// Catch the potential 'disconnect' error - no need to show it to the user since the adapter is shutting down
 				} finally {
-					this.stopAdapter(error);
+					await this.stopAdapter(error);
 				}
 			} else {
 				return this.stopAdapter(error);
diff --git a/src/vs/workbench/contrib/debug/browser/repl.ts b/src/vs/workbench/contrib/debug/browser/repl.ts
index 5a4847afacc00b..7c8bc6a43f99ce 100644
--- a/src/vs/workbench/contrib/debug/browser/repl.ts
+++ b/src/vs/workbench/contrib/debug/browser/repl.ts
@@ -176,6 +176,11 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 			}
 			this.multiSessionRepl.set(this.isMultiSessionView);
 		}));
+		this._register(this.debugService.onDidEndSession(async session => {
+			// Update view, since orphaned sessions might now be separate
+			await Promise.resolve(); // allow other listeners to go first, so sessions can update parents
+			this.multiSessionRepl.set(this.isMultiSessionView);
+		}));
 		this._register(this.themeService.onDidColorThemeChange(() => {
 			this.refreshReplElements(false);
 			if (this.isVisible()) {
@@ -486,10 +491,6 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 		this.replInput.layout({ width: width - 30, height: replInputHeight });
 	}
 
-	override shouldShowFilterInHeader(): boolean {
-		return true;
-	}
-
 	collapseAll(): void {
 		this.tree.collapseAll();
 	}
@@ -646,6 +647,9 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 		const config = this.configurationService.getValue<IDebugConfiguration>('debug');
 		options.acceptSuggestionOnEnter = config.console.acceptSuggestionOnEnter === 'on' ? 'on' : 'off';
 		options.ariaLabel = localize('debugConsole', "Debug Console");
+		// We must respect some accessibility related settings
+		options.accessibilitySupport = this.configurationService.getValue<'auto' | 'off' | 'on'>('editor.accessibilitySupport');
+		options.cursorBlinking = this.configurationService.getValue<'blink' | 'smooth' | 'phase' | 'expand' | 'solid'>('editor.cursorBlinking');
 
 		this.replInput = this.scopedInstantiationService.createInstance(CodeEditorWidget, this.replInputContainer, options, getSimpleCodeEditorWidgetOptions());
 
diff --git a/src/vs/workbench/contrib/debug/browser/replViewer.ts b/src/vs/workbench/contrib/debug/browser/replViewer.ts
index a6e3d3361dc7d1..bea244d9893fc3 100644
--- a/src/vs/workbench/contrib/debug/browser/replViewer.ts
+++ b/src/vs/workbench/contrib/debug/browser/replViewer.ts
@@ -11,12 +11,13 @@ import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
 import { IAsyncDataSource, ITreeNode, ITreeRenderer } from 'vs/base/browser/ui/tree/tree';
 import { createMatches, FuzzyScore } from 'vs/base/common/filters';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { basename } from 'vs/base/common/path';
 import severity from 'vs/base/common/severity';
 import { localize } from 'vs/nls';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { ILabelService } from 'vs/platform/label/common/label';
-import { attachBadgeStyler } from 'vs/platform/theme/common/styler';
+import { defaultCountBadgeStyles } from 'vs/platform/theme/browser/defaultStyles';
 import { IThemeService, ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { AbstractExpressionsRenderer, IExpressionTemplateData, IInputBoxOptions, renderExpressionValue, renderVariable } from 'vs/workbench/contrib/debug/browser/baseDebugView';
 import { handleANSIOutput } from 'vs/workbench/contrib/debug/browser/debugANSIHandling';
@@ -164,11 +165,10 @@ export class ReplSimpleElementsRenderer implements ITreeRenderer<SimpleReplEleme
 
 		data.container = container;
 		data.countContainer = dom.append(expression, $('.count-badge-wrapper'));
-		data.count = new CountBadge(data.countContainer);
+		data.count = new CountBadge(data.countContainer, {}, defaultCountBadgeStyles);
 		data.value = dom.append(expression, $('span.value'));
 		data.source = dom.append(expression, $('.source'));
 		data.toDispose = [];
-		data.toDispose.push(attachBadgeStyler(data.count, this.themeService));
 		data.toDispose.push(dom.addDisposableListener(data.source, 'click', e => {
 			e.preventDefault();
 			e.stopPropagation();
@@ -197,7 +197,7 @@ export class ReplSimpleElementsRenderer implements ITreeRenderer<SimpleReplEleme
 		templateData.value.appendChild(result);
 
 		templateData.value.classList.add((element.severity === severity.Warning) ? 'warn' : (element.severity === severity.Error) ? 'error' : (element.severity === severity.Ignore) ? 'ignore' : 'info');
-		templateData.source.textContent = element.sourceData ? `${element.sourceData.source.name}:${element.sourceData.lineNumber}` : '';
+		templateData.source.textContent = element.sourceData ? `${basename(element.sourceData.source.name)}:${element.sourceData.lineNumber}` : '';
 		templateData.source.title = element.sourceData ? `${this.labelService.getUriLabel(element.sourceData.source.uri)}:${element.sourceData.lineNumber}` : '';
 		templateData.getReplElementSource = () => element.sourceData;
 	}
diff --git a/src/vs/workbench/contrib/debug/browser/statusbarColorProvider.ts b/src/vs/workbench/contrib/debug/browser/statusbarColorProvider.ts
index 0932492fc82bbd..eff654458ba23b 100644
--- a/src/vs/workbench/contrib/debug/browser/statusbarColorProvider.ts
+++ b/src/vs/workbench/contrib/debug/browser/statusbarColorProvider.ts
@@ -6,11 +6,12 @@
 import { localize } from 'vs/nls';
 import { registerColor } from 'vs/platform/theme/common/colorRegistry';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IDebugService, State, IDebugSession } from 'vs/workbench/contrib/debug/common/debug';
+import { IDebugService, State, IDebugSession, IDebugConfiguration } from 'vs/workbench/contrib/debug/common/debug';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { STATUS_BAR_FOREGROUND, STATUS_BAR_BORDER } from 'vs/workbench/common/theme';
 import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
 import { IStatusbarService } from 'vs/workbench/services/statusbar/browser/statusbar';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 
 // colors for theming
 
@@ -61,15 +62,26 @@ export class StatusBarColorProvider implements IWorkbenchContribution {
 	constructor(
 		@IDebugService private readonly debugService: IDebugService,
 		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
-		@IStatusbarService private readonly statusbarService: IStatusbarService
+		@IStatusbarService private readonly statusbarService: IStatusbarService,
+		@IConfigurationService private readonly configurationService: IConfigurationService
 	) {
 		this.debugService.onDidChangeState(this.update, this, this.disposables);
 		this.contextService.onDidChangeWorkbenchState(this.update, this, this.disposables);
+		this.configurationService.onDidChangeConfiguration((e) => {
+			if (e.affectsConfiguration('debug.enableStatusBarColor')) {
+				this.update();
+			}
+		});
 		this.update();
 	}
 
 	protected update(): void {
-		this.enabled = isStatusbarInDebugMode(this.debugService.state, this.debugService.getModel().getSessions());
+		const decorateStatusBar: boolean = this.configurationService.getValue<IDebugConfiguration>('debug').enableStatusBarColor;
+		if (!decorateStatusBar) {
+			this.enabled = false;
+		} else {
+			this.enabled = isStatusbarInDebugMode(this.debugService.state, this.debugService.getModel().getSessions());
+		}
 	}
 
 	dispose(): void {
diff --git a/src/vs/workbench/contrib/debug/common/debug.ts b/src/vs/workbench/contrib/debug/common/debug.ts
index 53cae1e89554fd..ea8b97eed80da6 100644
--- a/src/vs/workbench/contrib/debug/common/debug.ts
+++ b/src/vs/workbench/contrib/debug/common/debug.ts
@@ -43,6 +43,7 @@ export const CONTEXT_DEBUG_CONFIGURATION_TYPE = new RawContextKey<string>('debug
 export const CONTEXT_DEBUG_STATE = new RawContextKey<string>('debugState', 'inactive', { type: 'string', description: nls.localize('debugState', "State that the focused debug session is in. One of the following: 'inactive', 'initializing', 'stopped' or 'running'.") });
 export const CONTEXT_DEBUG_UX_KEY = 'debugUx';
 export const CONTEXT_DEBUG_UX = new RawContextKey<string>(CONTEXT_DEBUG_UX_KEY, 'default', { type: 'string', description: nls.localize('debugUX', "Debug UX state. When there are no debug configurations it is 'simple', otherwise 'default'. Used to decide when to show welcome views in the debug viewlet.") });
+export const CONTEXT_HAS_DEBUGGED = new RawContextKey<boolean>('hasDebugged', false, { type: 'boolean', description: nls.localize('hasDebugged', "True when a debug session has been started at least once, false otherwise.") });
 export const CONTEXT_IN_DEBUG_MODE = new RawContextKey<boolean>('inDebugMode', false, { type: 'boolean', description: nls.localize('inDebugMode', "True when debugging, false otherwise.") });
 export const CONTEXT_IN_DEBUG_REPL = new RawContextKey<boolean>('inDebugRepl', false, { type: 'boolean', description: nls.localize('inDebugRepl', "True when focus is in the debug console, false otherwise.") });
 export const CONTEXT_BREAKPOINT_WIDGET_VISIBLE = new RawContextKey<boolean>('breakpointWidgetVisible', false, { type: 'boolean', description: nls.localize('breakpointWidgetVisibile', "True when breakpoint editor zone widget is visible, false otherwise.") });
@@ -304,6 +305,7 @@ export interface IDebugSession extends ITreeElement {
 	readonly suppressDebugToolbar: boolean;
 	readonly suppressDebugStatusbar: boolean;
 	readonly suppressDebugView: boolean;
+	readonly lifecycleManagedByParent: boolean;
 
 	setSubId(subId: string | undefined): void;
 
@@ -665,6 +667,7 @@ export interface IDebugConfiguration {
 		showSourceCode: boolean;
 	};
 	autoExpandLazyVariables: boolean;
+	enableStatusBarColor: boolean;
 }
 
 export interface IGlobalConfig {
diff --git a/src/vs/workbench/contrib/debug/common/replModel.ts b/src/vs/workbench/contrib/debug/common/replModel.ts
index d8a19a273b2342..9b4dccd308d02b 100644
--- a/src/vs/workbench/contrib/debug/common/replModel.ts
+++ b/src/vs/workbench/contrib/debug/common/replModel.ts
@@ -297,4 +297,11 @@ export class ReplModel {
 			this._onDidChangeElements.fire();
 		}
 	}
+
+	/** Returns a new REPL model that's a copy of this one. */
+	clone() {
+		const newRepl = new ReplModel(this.configurationService);
+		newRepl.replElements = this.replElements.slice();
+		return newRepl;
+	}
 }
diff --git a/src/vs/workbench/contrib/debug/test/common/mockDebug.ts b/src/vs/workbench/contrib/debug/test/common/mockDebug.ts
index fe909c8daaa8ae..dfce2fc8436a5c 100644
--- a/src/vs/workbench/contrib/debug/test/common/mockDebug.ts
+++ b/src/vs/workbench/contrib/debug/test/common/mockDebug.ts
@@ -197,6 +197,10 @@ export class MockSession implements IDebugSession {
 		return false;
 	}
 
+	get lifecycleManagedByParent(): boolean {
+		return false;
+	}
+
 	stepInTargets(frameId: number): Promise<{ id: number; label: string }[]> {
 		throw new Error('Method not implemented.');
 	}
diff --git a/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts b/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts
index df195c40ccd906..7e0f9ef19f1b68 100644
--- a/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts
+++ b/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts
@@ -18,7 +18,7 @@ import { URI } from 'vs/base/common/uri';
 import { basename, joinPath, relativePath } from 'vs/base/common/resources';
 import { encodeBase64 } from 'vs/base/common/buffer';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
+import { IProgress, IProgressService, IProgressStep, ProgressLocation } from 'vs/platform/progress/common/progress';
 import { EditSessionsWorkbenchService } from 'vs/workbench/contrib/editSessions/browser/editSessionsStorageService';
 import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { UserDataSyncErrorCode, UserDataSyncStoreError } from 'vs/platform/userDataSync/common/userDataSync';
@@ -46,7 +46,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { EditSessionsDataViews } from 'vs/workbench/contrib/editSessions/browser/editSessionsViews';
 import { EditSessionsFileSystemProvider } from 'vs/workbench/contrib/editSessions/browser/editSessionsFileSystemProvider';
 import { isNative } from 'vs/base/common/platform';
-import { WorkspaceFolderCountContext } from 'vs/workbench/common/contextkeys';
+import { VirtualWorkspaceContext, WorkspaceFolderCountContext } from 'vs/workbench/common/contextkeys';
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 import { equals } from 'vs/base/common/objects';
 import { EditSessionIdentityMatch, IEditSessionIdentityService } from 'vs/platform/workspace/common/editSessions';
@@ -59,6 +59,8 @@ import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/co
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { ILocalizedString } from 'vs/platform/action/common/action';
 import { Codicon } from 'vs/base/common/codicons';
+import { CancellationError } from 'vs/base/common/errors';
+import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
 
 registerSingleton(IEditSessionsLogService, EditSessionsLogService, InstantiationType.Delayed);
 registerSingleton(IEditSessionsStorageService, EditSessionsWorkbenchService, InstantiationType.Delayed);
@@ -73,17 +75,17 @@ const openLocalFolderCommand: IAction2Options = {
 	id: '_workbench.editSessions.actions.continueEditSession.openLocalFolder',
 	title: { value: localize('continue edit session in local folder', "Open In Local Folder"), original: 'Open In Local Folder' },
 	category: EDIT_SESSION_SYNC_CATEGORY,
-	precondition: IsWebContext
+	precondition: ContextKeyExpr.and(IsWebContext.toNegated(), VirtualWorkspaceContext)
 };
 const showOutputChannelCommand: IAction2Options = {
 	id: 'workbench.editSessions.actions.showOutputChannel',
 	title: { value: localize('show log', 'Show Log'), original: 'Show Log' },
 	category: EDIT_SESSION_SYNC_CATEGORY
 };
-const resumingProgressOptions = {
+const resumeProgressOptionsTitle = `[${localize('resuming working changes window', 'Resuming working changes...')}](command:${showOutputChannelCommand.id})`;
+const resumeProgressOptions = {
 	location: ProgressLocation.Window,
 	type: 'syncing',
-	title: `[${localize('resuming working changes window', 'Resuming working changes...')}](command:${showOutputChannelCommand.id})`
 };
 const queryParamName = 'editSessionId';
 
@@ -121,6 +123,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 		@IStorageService private readonly storageService: IStorageService,
 		@IActivityService private readonly activityService: IActivityService,
 		@IEditorService private readonly editorService: IEditorService,
+		@IRemoteAgentService private readonly remoteAgentService: IRemoteAgentService,
 	) {
 		super();
 
@@ -139,17 +142,17 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 	}
 
 	private async autoResumeEditSession() {
-		const shouldAutoResumeOnReload = this.configurationService.getValue('workbench.editSessions.autoResume') === 'onReload';
+		const shouldAutoResumeOnReload = this.configurationService.getValue('workbench.cloudChanges.autoResume') === 'onReload';
 
 		if (this.environmentService.editSessionId !== undefined) {
 			this.logService.info(`Resuming cloud changes, reason: found editSessionId ${this.environmentService.editSessionId} in environment service...`);
-			await this.progressService.withProgress(resumingProgressOptions, async () => await this.resumeEditSession(this.environmentService.editSessionId).finally(() => this.environmentService.editSessionId = undefined));
+			await this.progressService.withProgress(resumeProgressOptions, async (progress) => await this.resumeEditSession(this.environmentService.editSessionId, undefined, undefined, progress).finally(() => this.environmentService.editSessionId = undefined));
 		} else if (shouldAutoResumeOnReload && this.editSessionsStorageService.isSignedIn) {
 			this.logService.info('Resuming cloud changes, reason: cloud changes enabled...');
 			// Attempt to resume edit session based on edit workspace identifier
 			// Note: at this point if the user is not signed into edit sessions,
 			// we don't want them to be prompted to sign in and should just return early
-			await this.progressService.withProgress(resumingProgressOptions, async () => await this.resumeEditSession(undefined, true));
+			await this.progressService.withProgress(resumeProgressOptions, async (progress) => await this.resumeEditSession(undefined, true, undefined, progress));
 		} else if (shouldAutoResumeOnReload) {
 			// The application has previously launched via a protocol URL Continue On flow
 			const hasApplicationLaunchedFromContinueOnFlow = this.storageService.getBoolean(EditSessionsContribution.APPLICATION_LAUNCHED_VIA_CONTINUE_ON_STORAGE_KEY, StorageScope.APPLICATION, false);
@@ -160,7 +163,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 				// attempt a resume if we are in a pending state and the user just signed in
 				const disposable = this.editSessionsStorageService.onDidSignIn(async () => {
 					disposable.dispose();
-					await this.progressService.withProgress(resumingProgressOptions, async () => await this.resumeEditSession(undefined, true));
+					await this.progressService.withProgress(resumeProgressOptions, async (progress) => await this.resumeEditSession(undefined, true, undefined, progress));
 					this.storageService.remove(EditSessionsContribution.APPLICATION_LAUNCHED_VIA_CONTINUE_ON_STORAGE_KEY, StorageScope.APPLICATION);
 					this.environmentService.continueOn = undefined;
 				});
@@ -174,7 +177,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 				this.storageService.store(EditSessionsContribution.APPLICATION_LAUNCHED_VIA_CONTINUE_ON_STORAGE_KEY, true, StorageScope.APPLICATION, StorageTarget.MACHINE);
 				await this.editSessionsStorageService.initialize(true);
 				if (this.editSessionsStorageService.isSignedIn) {
-					await this.progressService.withProgress(resumingProgressOptions, async () => await this.resumeEditSession(undefined, true));
+					await this.progressService.withProgress(resumeProgressOptions, async (progress) => await this.resumeEditSession(undefined, true, undefined, progress));
 				} else {
 					handlePendingEditSessions();
 				}
@@ -198,7 +201,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 	}
 
 	private async autoStoreEditSession() {
-		if (this.configurationService.getValue('workbench.experimental.editSessions.autoStore') === 'onShutdown') {
+		if (this.configurationService.getValue('workbench.experimental.cloudChanges.autoStore') === 'onShutdown') {
 			const cancellationTokenSource = new CancellationTokenSource();
 			await this.progressService.withProgress({
 				location: ProgressLocation.Window,
@@ -374,7 +377,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 			}
 
 			async run(accessor: ServicesAccessor, editSessionId?: string): Promise<void> {
-				await that.progressService.withProgress(resumingProgressOptions, async () => await that.resumeEditSession(editSessionId));
+				await that.progressService.withProgress({ ...resumeProgressOptions, title: resumeProgressOptionsTitle }, async () => await that.resumeEditSession(editSessionId));
 			}
 		}));
 	}
@@ -412,14 +415,17 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 		}));
 	}
 
-	async resumeEditSession(ref?: string, silent?: boolean, force?: boolean): Promise<void> {
+	async resumeEditSession(ref?: string, silent?: boolean, force?: boolean, progress?: IProgress<IProgressStep>): Promise<void> {
+		// Wait for the remote environment to become available, if any
+		await this.remoteAgentService.getEnvironment();
+
 		// Edit sessions are not currently supported in empty workspaces
 		// https://github.com/microsoft/vscode/issues/159220
 		if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
 			return;
 		}
 
-		this.logService.info(ref !== undefined ? `Resuming changes from cloud with ref ${ref}...` : 'Resuming changes from cloud...');
+		this.logService.info(ref !== undefined ? `Resuming changes from cloud with ref ${ref}...` : 'Checking for pending cloud changes...');
 
 		if (silent && !(await this.editSessionsStorageService.initialize(false, true))) {
 			return;
@@ -435,6 +441,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 
 		performance.mark('code/willResumeEditSessionFromIdentifier');
 
+		progress?.report({ message: localize('checkingForWorkingChanges', 'Checking for pending cloud changes...') });
 		const data = await this.editSessionsStorageService.read(ref);
 		if (!data) {
 			if (ref === undefined && !silent) {
@@ -445,6 +452,8 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 			this.logService.info(ref !== undefined ? `Aborting resuming changes from cloud as no edit session content is available to be applied from ref ${ref}.` : `Aborting resuming edit session as no edit session content is available to be applied`);
 			return;
 		}
+
+		progress?.report({ message: resumeProgressOptionsTitle });
 		const editSession = data.editSession;
 		ref = data.ref;
 
@@ -529,7 +538,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 							folderRoot = f;
 							break;
 						} else if (match === EditSessionIdentityMatch.Partial &&
-							this.configurationService.getValue('workbench.experimental.editSessions.partialMatches.enabled') === true
+							this.configurationService.getValue('workbench.experimental.cloudChanges.partialMatches.enabled') === true
 						) {
 							if (!force) {
 								// Surface partially matching edit session
@@ -805,7 +814,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 
 			async run(accessor: ServicesAccessor): Promise<URI | undefined> {
 				const selection = await that.fileDialogService.showOpenDialog({
-					title: localize('continueEditSession.openLocalFolder.title', 'Select a local folder to continue your edit session in'),
+					title: localize('continueEditSession.openLocalFolder.title.v2', 'Select a local folder to continue working in'),
 					canSelectFolders: true,
 					canSelectMany: false,
 					canSelectFiles: false,
@@ -819,6 +828,10 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 				});
 			}
 		}));
+
+		if (getVirtualWorkspaceLocation(this.contextService.getWorkspace()) !== undefined && isNative) {
+			this.generateStandaloneOptionCommand(openLocalFolderCommand.id, localize('continueWorkingOn.existingLocalFolder', 'Continue Working in Existing Local Folder'), undefined, openLocalFolderCommand.precondition);
+		}
 	}
 
 	private async pickContinueEditSessionDestination(): Promise<string | undefined> {
@@ -842,8 +855,8 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 			quickPick.show();
 
 			quickPick.onDidTriggerItemButton(async (e) => {
-				if (e.item.description !== undefined) {
-					const uri = URI.isUri(e.item.description) ? URI.parse(e.item.description) : await this.commandService.executeCommand(e.item.description);
+				if (e.item.documentation !== undefined) {
+					const uri = URI.isUri(e.item.documentation) ? URI.parse(e.item.documentation) : await this.commandService.executeCommand(e.item.documentation);
 					void this.openerService.open(uri, { openExternal: true });
 				}
 			});
@@ -881,7 +894,11 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 			this.telemetryService.publicLog2<EvaluateContinueOnDestinationEvent, EvaluateContinueOnDestinationClassification>('continueOn.openDestination.outcome', { selection: command, outcome: 'invalidDestination' });
 			return undefined;
 		} catch (ex) {
-			this.telemetryService.publicLog2<EvaluateContinueOnDestinationEvent, EvaluateContinueOnDestinationClassification>('continueOn.openDestination.outcome', { selection: command, outcome: 'unknownError' });
+			if (ex instanceof CancellationError) {
+				this.telemetryService.publicLog2<EvaluateContinueOnDestinationEvent, EvaluateContinueOnDestinationClassification>('continueOn.openDestination.outcome', { selection: command, outcome: 'cancelled' });
+			} else {
+				this.telemetryService.publicLog2<EvaluateContinueOnDestinationEvent, EvaluateContinueOnDestinationClassification>('continueOn.openDestination.outcome', { selection: command, outcome: 'unknownError' });
+			}
 			return undefined;
 		}
 	}
@@ -910,7 +927,7 @@ class ContinueEditSessionItem implements IQuickPickItem {
 		public readonly command: string,
 		public readonly description?: string,
 		public readonly when?: ContextKeyExpression,
-		documentation?: string,
+		public readonly documentation?: string,
 	) {
 		if (documentation !== undefined) {
 			this.buttons = [{
@@ -971,73 +988,56 @@ workbenchRegistry.registerWorkbenchContribution(EditSessionsContribution, Lifecy
 Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).registerConfiguration({
 	...workbenchConfigurationNodeBase,
 	'properties': {
-		'workbench.experimental.editSessions.autoStore': {
+		'workbench.experimental.cloudChanges.autoStore': {
 			enum: ['onShutdown', 'off'],
 			enumDescriptions: [
-				localize('autoStore.onShutdown', "Automatically store current edit session on window close."),
-				localize('autoStore.off', "Never attempt to automatically store an edit session.")
+				localize('autoStoreWorkingChanges.onShutdown', "Automatically store current working changes in the cloud on window close."),
+				localize('autoStoreWorkingChanges.off', "Never attempt to automatically store working changes in the cloud.")
 			],
 			'type': 'string',
 			'tags': ['experimental', 'usesOnlineServices'],
 			'default': 'off',
-			'markdownDescription': localize('autoStore', "Controls whether to automatically store an available edit session for the current workspace."),
+			'markdownDescription': localize('autoStoreWorkingChangesDescription', "Controls whether to automatically store available working changes in the cloud for the current workspace."),
 		},
-		'workbench.editSessions.autoResume': {
+		'workbench.cloudChanges.autoResume': {
 			enum: ['onReload', 'off'],
 			enumDescriptions: [
-				localize('autoResume.onReload', "Automatically resume available edit session on window reload."),
-				localize('autoResume.off', "Never attempt to resume an edit session.")
+				localize('autoResumeWorkingChanges.onReload', "Automatically resume available working changes from the cloud on window reload."),
+				localize('autoResumeWorkingChanges.off', "Never attempt to resume working changes from the cloud.")
 			],
 			'type': 'string',
 			'tags': ['usesOnlineServices'],
 			'default': 'onReload',
-			'markdownDescription': localize('autoResume', "Controls whether to automatically resume an available edit session for the current workspace."),
+			'markdownDescription': localize('autoResumeWorkingChanges', "Controls whether to automatically resume available working changes stored in the cloud for the current workspace."),
 		},
-		'workbench.editSessions.continueOn': {
+		'workbench.cloudChanges.continueOn': {
 			enum: ['prompt', 'off'],
 			enumDescriptions: [
-				localize('continueOn.promptForAuth', 'Prompt the user to sign in to store edit sessions with Continue Working On.'),
-				localize('continueOn.off', 'Do not use edit sessions with Continue Working On unless the user has already turned on edit sessions.')
+				localize('continueOnCloudChanges.promptForAuth', 'Prompt the user to sign in to store working changes in the cloud with Continue Working On.'),
+				localize('continueOnCloudChanges.off', 'Do not store working changes in the cloud with Continue Working On unless the user has already turned on Cloud Changes.')
 			],
 			type: 'string',
 			tags: ['usesOnlineServices'],
 			default: 'prompt',
-			markdownDescription: localize('continueOn', 'Controls whether to prompt the user to store edit sessions when using Continue Working On.')
+			markdownDescription: localize('continueOnCloudChanges', 'Controls whether to prompt the user to store working changes in the cloud when using Continue Working On.')
 		},
-		'workbench.experimental.editSessions.continueOn': {
-			enum: ['prompt', 'off'],
-			enumDescriptions: [
-				localize('continueOn.promptForAuth', 'Prompt the user to sign in to store edit sessions with Continue Working On.'),
-				localize('continueOn.off', 'Do not use edit sessions with Continue Working On unless the user has already turned on edit sessions.')
-			],
-			type: 'string',
-			tags: ['experimental', 'usesOnlineServices'],
-			default: 'prompt',
-			markdownDeprecationMessage: localize('continueOnDeprecated', 'This setting is deprecated in favor of {0}.', '`#workbench.experimental.continueOn#`'),
-			markdownDescription: localize('continueOn', 'Controls whether to prompt the user to store edit sessions when using Continue Working On.')
+		'workbench.experimental.editSessions.autoStore': {
+			markdownDeprecationMessage: localize('editSessionsAutoStoreDeprecated', 'This setting is deprecated in favor of {0}.', '`#workbench.experimental.cloudChanges.autoStore#`')
 		},
-		'workbench.experimental.editSessions.enabled': {
-			'type': 'boolean',
-			'tags': ['experimental', 'usesOnlineServices'],
-			'default': true,
-			'markdownDeprecationMessage': localize('editSessionsEnabledDeprecated', "This setting is deprecated as Edit Sessions are no longer experimental. Please see {0} and {1} for configuring behavior related to Edit Sessions.", '`#workbench.editSessions.autoResume#`', '`#workbench.editSessions.continueOn#`')
+		'workbench.editSessions.autoResume': {
+			markdownDeprecationMessage: localize('editSessionsAutoResumeDeprecated', 'This setting is deprecated in favor of {0}.', '`#workbench.cloudChanges.autoResume#`')
 		},
-		'workbench.experimental.editSessions.autoResume': {
-			enum: ['onReload', 'off'],
-			enumDescriptions: [
-				localize('autoResume.onReload', "Automatically resume available edit session on window reload."),
-				localize('autoResume.off', "Never attempt to resume an edit session.")
-			],
-			'type': 'string',
-			'tags': ['experimental', 'usesOnlineServices'],
-			'default': 'onReload',
-			'markdownDeprecationMessage': localize('autoResumeDeprecated', "This setting is deprecated in favor of {0}.", '`#workbench.editSessions.autoResume#`')
+		'workbench.editSessions.continueOn': {
+			markdownDeprecationMessage: localize('editSessionsContinueOnDeprecated', 'This setting is deprecated in favor of {0}.', '`#workbench.cloudChanges.continueOn#`')
 		},
-		'workbench.experimental.editSessions.partialMatches.enabled': {
+		'workbench.experimental.cloudChanges.partialMatches.enabled': {
 			'type': 'boolean',
 			'tags': ['experimental', 'usesOnlineServices'],
-			'default': true,
-			'markdownDescription': localize('editSessionsPartialMatchesEnabled', "Controls whether to surface edit sessions which partially match the current session.")
+			'default': false,
+			'markdownDescription': localize('cloudChangesPartialMatchesEnabled', "Controls whether to surface cloud changes which partially match the current session.")
+		},
+		'workbench.experimental.editSessions.partialMatches.enabled': {
+			markdownDeprecationMessage: localize('editSessionsPartialMatchesDeprecation', 'This setting is deprecated in favor of {0}.', '`#workbench.experimental.cloudChanges.partialMatches.enabled#`')
 		}
 	}
 });
diff --git a/src/vs/workbench/contrib/editSessions/browser/editSessionsViews.ts b/src/vs/workbench/contrib/editSessions/browser/editSessionsViews.ts
index 9862af319a8fe6..28e28ff88fcf5a 100644
--- a/src/vs/workbench/contrib/editSessions/browser/editSessionsViews.ts
+++ b/src/vs/workbench/contrib/editSessions/browser/editSessionsViews.ts
@@ -56,13 +56,9 @@ export class EditSessionsDataViews extends Disposable {
 
 		viewsRegistry.registerViewWelcomeContent(viewId, {
 			content: localize(
-				'noEditSessions',
-				'You have no stored edit sessions to display.\n{0}',
-				localize(
-					{ key: 'storeEditSessionCommand', comment: ['Please do not translate the word "command", it is part of our internal syntax which must not change'] },
-					'[{0}](command:workbench.editSessions.actions.store)',
-					localize('storeEditSessionTitle', 'Store Edit Session')
-				)
+				'noStoredChanges',
+				'You have no stored changes in the cloud to display.\n{0}',
+				`[${localize('storeWorkingChangesTitle', 'Store Working Changes')}](command:workbench.editSessions.actions.store)`,
 			),
 			when: ContextKeyExpr.equals(EDIT_SESSIONS_COUNT_KEY, 0),
 			order: 1
@@ -72,7 +68,7 @@ export class EditSessionsDataViews extends Disposable {
 			constructor() {
 				super({
 					id: 'workbench.editSessions.actions.resume',
-					title: localize('workbench.editSessions.actions.resume', "Resume Edit Session"),
+					title: localize('workbench.editSessions.actions.resume.v2', "Resume Working Changes"),
 					icon: Codicon.desktopDownload,
 					menu: {
 						id: MenuId.ViewItemContext,
@@ -94,7 +90,7 @@ export class EditSessionsDataViews extends Disposable {
 			constructor() {
 				super({
 					id: 'workbench.editSessions.actions.store',
-					title: localize('workbench.editSessions.actions.store', "Store Edit Session"),
+					title: localize('workbench.editSessions.actions.store.v2', "Store Working Changes"),
 					icon: Codicon.cloudUpload,
 				});
 			}
@@ -110,7 +106,7 @@ export class EditSessionsDataViews extends Disposable {
 			constructor() {
 				super({
 					id: 'workbench.editSessions.actions.delete',
-					title: localize('workbench.editSessions.actions.delete', "Delete Edit Session"),
+					title: localize('workbench.editSessions.actions.delete.v2', "Delete Working Changes"),
 					icon: Codicon.trash,
 					menu: {
 						id: MenuId.ViewItemContext,
@@ -125,7 +121,7 @@ export class EditSessionsDataViews extends Disposable {
 				const dialogService = accessor.get(IDialogService);
 				const editSessionStorageService = accessor.get(IEditSessionsStorageService);
 				const result = await dialogService.confirm({
-					message: localize('confirm delete', 'Are you sure you want to permanently delete the edit session with ref {0}? You cannot undo this action.', editSessionId),
+					message: localize('confirm delete.v2', 'Are you sure you want to permanently delete your working changes with ref {0}? You cannot undo this action.', editSessionId),
 					type: 'warning',
 					title: EDIT_SESSIONS_TITLE
 				});
diff --git a/src/vs/workbench/contrib/editSessions/test/browser/editSessions.test.ts b/src/vs/workbench/contrib/editSessions/test/browser/editSessions.test.ts
index 2d2170549a72b2..b8aae469f45e4f 100644
--- a/src/vs/workbench/contrib/editSessions/test/browser/editSessions.test.ts
+++ b/src/vs/workbench/contrib/editSessions/test/browser/editSessions.test.ts
@@ -40,6 +40,7 @@ import { IEditorService, ISaveAllEditorsOptions } from 'vs/workbench/services/ed
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
+import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
 
 const folderName = 'test-folder';
 const folderUri = URI.file(`/${folderName}`);
@@ -83,6 +84,11 @@ suite('Edit session sync', () => {
 				return { choice: 1 };
 			}
 		});
+		instantiationService.stub(IRemoteAgentService, new class extends mock<IRemoteAgentService>() {
+			override async getEnvironment() {
+				return null;
+			}
+		});
 		instantiationService.stub(IConfigurationService, new TestConfigurationService({ workbench: { experimental: { editSessions: { enabled: true } } } }));
 		instantiationService.stub(IWorkspaceContextService, new class extends mock<IWorkspaceContextService>() {
 			override getWorkspace() {
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
index 881c6a4f448f52..d5d4f0c3e7326b 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
@@ -17,7 +17,7 @@ import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IExtensionRecommendationsService } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
-import { IExtensionManifest, IKeyBinding, IView, IViewContainer } from 'vs/platform/extensions/common/extensions';
+import { ExtensionIdentifier, IExtensionManifest, IKeyBinding, IView, IViewContainer } from 'vs/platform/extensions/common/extensions';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { ResolvedKeybinding } from 'vs/base/common/keybindings';
 import { ExtensionsInput, IExtensionEditorOptions } from 'vs/workbench/contrib/extensions/common/extensionsInput';
@@ -593,7 +593,7 @@ export class ExtensionEditor extends EditorPane {
 		if (extension.dependencies.length) {
 			template.navbar.push(ExtensionEditorTab.Dependencies, localize('dependencies', "Dependencies"), localize('dependenciestooltip', "Lists extensions this extension depends on"));
 		}
-		if (manifest && manifest.extensionPack?.length && !this.shallRenderAsExensionPack(manifest)) {
+		if (manifest && manifest.extensionPack?.length && !this.shallRenderAsExtensionPack(manifest)) {
 			template.navbar.push(ExtensionEditorTab.ExtensionPack, localize('extensionpack', "Extension Pack"), localize('extensionpacktooltip', "Lists extensions those will be installed together with this extension"));
 		}
 
@@ -826,7 +826,7 @@ export class ExtensionEditor extends EditorPane {
 
 		let activeElement: IActiveElement | null = null;
 		const manifest = await this.extensionManifest!.get().promise;
-		if (manifest && manifest.extensionPack?.length && this.shallRenderAsExensionPack(manifest)) {
+		if (manifest && manifest.extensionPack?.length && this.shallRenderAsExtensionPack(manifest)) {
 			activeElement = await this.openExtensionPackReadme(manifest, readmeContainer, token);
 		} else {
 			activeElement = await this.openMarkdown(this.extensionReadme!.get(), localize('noReadme', "No README available."), readmeContainer, WebviewIndex.Readme, token);
@@ -836,7 +836,7 @@ export class ExtensionEditor extends EditorPane {
 		return activeElement;
 	}
 
-	private shallRenderAsExensionPack(manifest: IExtensionManifest): boolean {
+	private shallRenderAsExtensionPack(manifest: IExtensionManifest): boolean {
 		return !!(manifest.categories?.some(category => category.toLowerCase() === 'extension packs'));
 	}
 
@@ -1109,7 +1109,22 @@ export class ExtensionEditor extends EditorPane {
 
 		if (extensionStatus?.activationTimes) {
 			const activationTime = extensionStatus.activationTimes.codeLoadingTime + extensionStatus.activationTimes.activateCallTime;
-			append(element, $('div.activation-message', undefined, `${localize('activation', "Activation time")}${extensionStatus.activationTimes.activationReason.startup ? ` (${localize('startup', "Startup")})` : ''} : ${activationTime}ms`));
+			const activationElement = append(element, $('div.activation-details'));
+
+			const activationReasonElement = append(activationElement, $('div.activation-element-entry'));
+			append(activationReasonElement, $('span.activation-message-title', undefined, localize('activation reason', "Activation Event:")));
+			append(activationReasonElement, $('code', undefined, extensionStatus.activationTimes.activationReason.startup ? localize('startup', "Startup") : extensionStatus.activationTimes.activationReason.activationEvent));
+
+			const activationTimeElement = append(activationElement, $('div.activation-element-entry'));
+			append(activationTimeElement, $('span.activation-message-title', undefined, localize('activation time', "Activation Time:")));
+			append(activationTimeElement, $('code', undefined, `${activationTime}ms`));
+
+
+			if (ExtensionIdentifier.toKey(extensionStatus.activationTimes.activationReason.extensionId) !== ExtensionIdentifier.toKey(extension.identifier.id)) {
+				const activatedByElement = append(activationElement, $('div.activation-element-entry'));
+				append(activatedByElement, $('span.activation-message-title', undefined, localize('activatedBy', "Activated By:")));
+				append(activatedByElement, $('span', undefined, extensionStatus.activationTimes.activationReason.extensionId.value));
+			}
 		}
 
 		else if (extension.local && (extension.local.manifest.main || extension.local.manifest.browser)) {
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionRecommendations.ts b/src/vs/workbench/contrib/extensions/browser/extensionRecommendations.ts
index f068993197032c..fc28afa9003674 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionRecommendations.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionRecommendations.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Disposable } from 'vs/base/common/lifecycle';
-import { IExtensionRecommendationReson } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
+import { IExtensionRecommendationReason } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
 
 export type ExtensionRecommendation = {
 	readonly extensionId: string;
-	readonly reason: IExtensionRecommendationReson;
+	readonly reason: IExtensionRecommendationReason;
 };
 
 export abstract class ExtensionRecommendations extends Disposable {
diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
index 2d6214fe45169b..cfba58b6d29751 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
@@ -1598,7 +1598,7 @@ class ExtensionStorageCleaner implements IWorkbenchContribution {
 
 const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
 workbenchRegistry.registerWorkbenchContribution(ExtensionsContributions, LifecyclePhase.Restored);
-workbenchRegistry.registerWorkbenchContribution(StatusUpdater, LifecyclePhase.Restored);
+workbenchRegistry.registerWorkbenchContribution(StatusUpdater, LifecyclePhase.Eventually);
 workbenchRegistry.registerWorkbenchContribution(MaliciousExtensionChecker, LifecyclePhase.Eventually);
 workbenchRegistry.registerWorkbenchContribution(KeymapExtensions, LifecyclePhase.Restored);
 workbenchRegistry.registerWorkbenchContribution(ExtensionsViewletViewsContribution, LifecyclePhase.Restored);
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
index 7a5f8adfaff87b..ce0d459ccecd6a 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
@@ -2172,7 +2172,7 @@ export class ToggleSyncExtensionAction extends ExtensionDropDownAction {
 		@IInstantiationService instantiationService: IInstantiationService,
 	) {
 		super('extensions.sync', '', ToggleSyncExtensionAction.SYNC_CLASS, false, instantiationService);
-		this._register(Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectedKeys.includes('settingsSync.ignoredExtensions'))(() => this.update()));
+		this._register(Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('settingsSync.ignoredExtensions'))(() => this.update()));
 		this._register(userDataSyncEnablementService.onDidChangeEnablement(() => this.update()));
 		this.update();
 	}
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsList.ts b/src/vs/workbench/contrib/extensions/browser/extensionsList.ts
index 5e802f849ee5a0..62e2ceb8daebe4 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsList.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsList.ts
@@ -27,7 +27,7 @@ import { IContextMenuService } from 'vs/platform/contextview/browser/contextView
 import { HoverPosition } from 'vs/base/browser/ui/hover/hoverWidget';
 import { verifiedPublisherIcon as verifiedPublisherThemeIcon } from 'vs/workbench/contrib/extensions/browser/extensionsIcons';
 
-export const EXTENSION_LIST_ELEMENT_HEIGHT = 62;
+export const EXTENSION_LIST_ELEMENT_HEIGHT = 72;
 
 export interface IExtensionsViewState {
 	onFocus: Event<IExtension>;
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
index cf017e97f5e003..1a83b57657d371 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
@@ -803,6 +803,7 @@ export class StatusUpdater extends Disposable implements IWorkbenchContribution
 		@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService
 	) {
 		super();
+		this.onServiceChange();
 		this._register(Event.debounce(extensionsWorkbenchService.onChange, () => undefined, 100, undefined, undefined, this._store)(this.onServiceChange, this));
 	}
 
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
index b200a05400aeaf..c327044e274310 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
@@ -22,7 +22,6 @@ import { ExtensionState, IExtension, IExtensionsWorkbenchService, IWorkspaceReco
 import { Query } from 'vs/workbench/contrib/extensions/common/extensionQuery';
 import { IExtensionService, toExtension } from 'vs/workbench/services/extensions/common/extensions';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { attachBadgeStyler } from 'vs/platform/theme/common/styler';
 import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
@@ -41,7 +40,7 @@ import { IAction, Action, Separator, ActionRunner } from 'vs/base/common/actions
 import { ExtensionIdentifier, ExtensionUntrustedWorkspaceSupportType, ExtensionVirtualWorkspaceSupportType, IExtensionDescription, isLanguagePackExtension } from 'vs/platform/extensions/common/extensions';
 import { CancelablePromise, createCancelablePromise, ThrottledDelayer } from 'vs/base/common/async';
 import { IProductService } from 'vs/platform/product/common/productService';
-import { SeverityIcon } from 'vs/platform/severityIcon/common/severityIcon';
+import { SeverityIcon } from 'vs/platform/severityIcon/browser/severityIcon';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
 import { IViewDescriptorService } from 'vs/workbench/common/views';
@@ -56,6 +55,7 @@ import { IWorkbenchLayoutService, Position } from 'vs/workbench/services/layout/
 import { HoverPosition } from 'vs/base/browser/ui/hover/hoverWidget';
 import { ILogService } from 'vs/platform/log/common/log';
 import { isOfflineError } from 'vs/base/parts/request/common/request';
+import { defaultCountBadgeStyles } from 'vs/platform/theme/browser/defaultStyles';
 
 // Extensions that are automatically classified as Programming Language extensions, but should be Feature extensions
 const FORCE_FEATURE_EXTENSIONS = ['vscode.git', 'vscode.git-base', 'vscode.search-result'];
@@ -170,8 +170,7 @@ export class ExtensionsListView extends ViewPane {
 		super.renderHeader(container);
 
 		if (!this.options.hideBadge) {
-			this.badge = new CountBadge(append(container, $('.count-badge-wrapper')));
-			this._register(attachBadgeStyler(this.badge, this.themeService));
+			this.badge = new CountBadge(append(container, $('.count-badge-wrapper')), {}, defaultCountBadgeStyles);
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts
index 52224bf9d68d64..3c5ad41bed3258 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts
@@ -39,6 +39,7 @@ import { renderIcon } from 'vs/base/browser/ui/iconLabel/iconLabels';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { defaultCountBadgeStyles } from 'vs/platform/theme/browser/defaultStyles';
 
 export abstract class ExtensionWidget extends Disposable implements IExtensionContainer {
 	private _extension: IExtension | null = null;
@@ -397,7 +398,7 @@ export class ExtensionPackCountWidget extends ExtensionWidget {
 			return;
 		}
 		this.element = append(this.parent, $('.extension-badge.extension-pack-badge'));
-		const countBadge = new CountBadge(this.element);
+		const countBadge = new CountBadge(this.element, {}, defaultCountBadgeStyles);
 		countBadge.setCount(this.extension.extensionPack.length);
 	}
 }
@@ -411,7 +412,7 @@ export class SyncIgnoredWidget extends ExtensionWidget {
 		@IUserDataSyncEnablementService private readonly userDataSyncEnablementService: IUserDataSyncEnablementService,
 	) {
 		super();
-		this._register(Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectedKeys.includes('settingsSync.ignoredExtensions'))(() => this.render()));
+		this._register(Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('settingsSync.ignoredExtensions'))(() => this.render()));
 		this._register(userDataSyncEnablementService.onDidChangeEnablement(() => this.update()));
 		this.render();
 	}
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
index 40432e84e8caa3..8477f2675924cc 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
@@ -48,13 +48,14 @@ import { ExtensionEditor } from 'vs/workbench/contrib/extensions/browser/extensi
 import { isWeb, language } from 'vs/base/common/platform';
 import { getLocale } from 'vs/platform/languagePacks/common/languagePacks';
 import { ILocaleService } from 'vs/workbench/contrib/localization/common/locale';
+import { TrustedTelemetryValue } from 'vs/platform/telemetry/common/telemetryUtils';
 
 interface IExtensionStateProvider<T> {
 	(extension: Extension): T;
 }
 
 interface InstalledExtensionsEvent {
-	readonly extensionIds: string;
+	readonly extensionIds: TrustedTelemetryValue<string>;
 	readonly count: number;
 }
 type ExtensionsLoadClassification = {
@@ -448,14 +449,23 @@ class Extensions extends Disposable {
 		this._register(server.extensionManagementService.onDidUninstallExtension(e => this.onDidUninstallExtension(e)));
 		this._register(server.extensionManagementService.onDidChangeProfile(e => this.onDidChangeProfile(e.added, e.removed)));
 		this._register(extensionEnablementService.onEnablementChanged(e => this.onEnablementChanged(e)));
+		this._register(Event.any(this.onChange, this.onReset)(() => this._local = undefined));
 	}
 
+	private _local: IExtension[] | undefined;
 	get local(): IExtension[] {
-		const installing = this.installing
-			.filter(e => !this.installed.some(installed => areSameExtensions(installed.identifier, e.identifier)))
-			.map(e => e);
-
-		return [...this.installed, ...installing];
+		if (!this._local) {
+			this._local = [];
+			for (const extension of this.installed) {
+				this._local.push(extension);
+			}
+			for (const extension of this.installing) {
+				if (!this.installed.some(installed => areSameExtensions(installed.identifier, extension.identifier))) {
+					this._local.push(extension);
+				}
+			}
+		}
+		return this._local;
 	}
 
 	async queryInstalled(): Promise<IExtension[]> {
@@ -683,6 +693,8 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 	private readonly localExtensions: Extensions | null = null;
 	private readonly remoteExtensions: Extensions | null = null;
 	private readonly webExtensions: Extensions | null = null;
+	private readonly extensionsServers: Extensions[] = [];
+
 	private updatesCheckDelayer: ThrottledDelayer<void>;
 	private autoUpdateDelayer: ThrottledDelayer<void>;
 
@@ -730,18 +742,26 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 			this.localExtensions = this._register(instantiationService.createInstance(Extensions, extensionManagementServerService.localExtensionManagementServer, ext => this.getExtensionState(ext), ext => this.getReloadStatus(ext)));
 			this._register(this.localExtensions.onChange(e => this._onChange.fire(e ? e.extension : undefined)));
 			this._register(this.localExtensions.onReset(e => { this._onChange.fire(undefined); this._onReset.fire(); }));
+			this.extensionsServers.push(this.localExtensions);
 		}
 		if (extensionManagementServerService.remoteExtensionManagementServer) {
 			this.remoteExtensions = this._register(instantiationService.createInstance(Extensions, extensionManagementServerService.remoteExtensionManagementServer, ext => this.getExtensionState(ext), ext => this.getReloadStatus(ext)));
 			this._register(this.remoteExtensions.onChange(e => this._onChange.fire(e ? e.extension : undefined)));
 			this._register(this.remoteExtensions.onReset(e => { this._onChange.fire(undefined); this._onReset.fire(); }));
+			this.extensionsServers.push(this.remoteExtensions);
 		}
 		if (extensionManagementServerService.webExtensionManagementServer) {
 			this.webExtensions = this._register(instantiationService.createInstance(Extensions, extensionManagementServerService.webExtensionManagementServer, ext => this.getExtensionState(ext), ext => this.getReloadStatus(ext)));
 			this._register(this.webExtensions.onChange(e => this._onChange.fire(e ? e.extension : undefined)));
 			this._register(this.webExtensions.onReset(e => { this._onChange.fire(undefined); this._onReset.fire(); }));
+			this.extensionsServers.push(this.webExtensions);
 		}
 
+		this._register(this.onChange(() => {
+			this._installed = undefined;
+			this._local = undefined;
+		}));
+
 		this.updatesCheckDelayer = new ThrottledDelayer<void>(ExtensionsWorkbenchService.UpdatesCheckInterval);
 		this.autoUpdateDelayer = new ThrottledDelayer<void>(1000);
 
@@ -794,13 +814,14 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 
 		this._register(this.storageService.onDidChangeValue(e => this.onDidChangeStorage(e)));
 	}
+
 	private _reportTelemetry() {
 		const extensionIds = this.installed.filter(extension =>
 			!extension.isBuiltin &&
 			(extension.enablementState === EnablementState.EnabledWorkspace ||
 				extension.enablementState === EnablementState.EnabledGlobally))
 			.map(extension => ExtensionIdentifier.toKey(extension.identifier.id));
-		this.telemetryService.publicLog2<InstalledExtensionsEvent, ExtensionsLoadClassification>('installedExtensions', { extensionIds: extensionIds.join(';'), count: extensionIds.length });
+		this.telemetryService.publicLog2<InstalledExtensionsEvent, ExtensionsLoadClassification>('installedExtensions', { extensionIds: new TrustedTelemetryValue(extensionIds.join(';')), count: extensionIds.length });
 	}
 
 	private async onDidChangeRunningExtensions(added: ReadonlyArray<IExtensionDescription>, removed: ReadonlyArray<IExtensionDescription>): Promise<void> {
@@ -819,37 +840,37 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		changedExtensions.forEach(e => this._onChange.fire(e));
 	}
 
+	private _local: IExtension[] | undefined;
 	get local(): IExtension[] {
-		const byId = groupByExtension(this.installed, r => r.identifier);
-		return byId.reduce((result, extensions) => { result.push(this.getPrimaryExtension(extensions)); return result; }, []);
+		if (!this._local) {
+			if (this.extensionsServers.length === 1) {
+				this._local = this.installed;
+			} else {
+				this._local = [];
+				const byId = groupByExtension(this.installed, r => r.identifier);
+				for (const extensions of byId) {
+					this._local.push(this.getPrimaryExtension(extensions));
+				}
+			}
+		}
+		return this._local;
 	}
 
+	private _installed: IExtension[] | undefined;
 	get installed(): IExtension[] {
-		const result = [];
-		if (this.localExtensions) {
-			result.push(...this.localExtensions.local);
-		}
-		if (this.remoteExtensions) {
-			result.push(...this.remoteExtensions.local);
-		}
-		if (this.webExtensions) {
-			result.push(...this.webExtensions.local);
+		if (!this._installed) {
+			this._installed = [];
+			for (const extensions of this.extensionsServers) {
+				for (const extension of extensions.local) {
+					this._installed.push(extension);
+				}
+			}
 		}
-		return result;
+		return this._installed;
 	}
 
 	get outdated(): IExtension[] {
-		const allLocal = [];
-		if (this.localExtensions) {
-			allLocal.push(...this.localExtensions.local);
-		}
-		if (this.remoteExtensions) {
-			allLocal.push(...this.remoteExtensions.local);
-		}
-		if (this.webExtensions) {
-			allLocal.push(...this.webExtensions.local);
-		}
-		return allLocal.filter(e => e.outdated && e.local && e.state === ExtensionState.Installed);
+		return this.installed.filter(e => e.outdated && e.local && e.state === ExtensionState.Installed);
 	}
 
 	async queryLocal(server?: IExtensionManagementServer): Promise<IExtension[]> {
@@ -1028,16 +1049,18 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 							return nls.localize('postUpdateTooltip', "Please reload Visual Studio Code to enable the updated extension.");
 						}
 
-						const extensionInOtherServer = this.installed.filter(e => areSameExtensions(e.identifier, extension!.identifier) && e.server !== extension!.server)[0];
-						if (extensionInOtherServer) {
-							// This extension prefers to run on UI/Local side but is running in remote
-							if (runningExtensionServer === this.extensionManagementServerService.remoteExtensionManagementServer && this.extensionManifestPropertiesService.prefersExecuteOnUI(extension.local!.manifest) && extensionInOtherServer.server === this.extensionManagementServerService.localExtensionManagementServer) {
-								return nls.localize('enable locally', "Please reload Visual Studio Code to enable this extension locally.");
-							}
+						if (this.extensionsServers.length > 1) {
+							const extensionInOtherServer = this.installed.filter(e => areSameExtensions(e.identifier, extension!.identifier) && e.server !== extension!.server)[0];
+							if (extensionInOtherServer) {
+								// This extension prefers to run on UI/Local side but is running in remote
+								if (runningExtensionServer === this.extensionManagementServerService.remoteExtensionManagementServer && this.extensionManifestPropertiesService.prefersExecuteOnUI(extension.local!.manifest) && extensionInOtherServer.server === this.extensionManagementServerService.localExtensionManagementServer) {
+									return nls.localize('enable locally', "Please reload Visual Studio Code to enable this extension locally.");
+								}
 
-							// This extension prefers to run on Workspace/Remote side but is running in local
-							if (runningExtensionServer === this.extensionManagementServerService.localExtensionManagementServer && this.extensionManifestPropertiesService.prefersExecuteOnWorkspace(extension.local!.manifest) && extensionInOtherServer.server === this.extensionManagementServerService.remoteExtensionManagementServer) {
-								return nls.localize('enable remote', "Please reload Visual Studio Code to enable this extension in {0}.", this.extensionManagementServerService.remoteExtensionManagementServer?.label);
+								// This extension prefers to run on Workspace/Remote side but is running in local
+								if (runningExtensionServer === this.extensionManagementServerService.localExtensionManagementServer && this.extensionManifestPropertiesService.prefersExecuteOnWorkspace(extension.local!.manifest) && extensionInOtherServer.server === this.extensionManagementServerService.remoteExtensionManagementServer) {
+									return nls.localize('enable remote', "Please reload Visual Studio Code to enable this extension in {0}.", this.extensionManagementServerService.remoteExtensionManagementServer?.label);
+								}
 							}
 						}
 
diff --git a/src/vs/workbench/contrib/extensions/browser/fileBasedRecommendations.ts b/src/vs/workbench/contrib/extensions/browser/fileBasedRecommendations.ts
index 57b4387c1c7347..5dc23e11fbaaf6 100644
--- a/src/vs/workbench/contrib/extensions/browser/fileBasedRecommendations.ts
+++ b/src/vs/workbench/contrib/extensions/browser/fileBasedRecommendations.ts
@@ -275,7 +275,7 @@ export class FileBasedRecommendations extends ExtensionRecommendations {
 		}
 
 		const treatmentMessage = await this.tasExperimentService.getTreatment<string>('languageRecommendationMessage');
-		const message = treatmentMessage ? treatmentMessage.replace('{0}', name) : localize('reallyRecommended', "Do you want to install the recommended extensions for {0}?", name);
+		const message = treatmentMessage ? treatmentMessage.replace('{0}', () => name) : localize('reallyRecommended', "Do you want to install the recommended extensions for {0}?", name);
 
 		this.extensionRecommendationNotificationService.promptImportantExtensionsInstallNotification([extensionId], message, `@id:${extensionId}`, RecommendationSource.FILE)
 			.then(result => {
diff --git a/src/vs/workbench/contrib/extensions/browser/media/extension.css b/src/vs/workbench/contrib/extensions/browser/media/extension.css
index 8d5886cf63dbf4..6d0f6dd6507927 100644
--- a/src/vs/workbench/contrib/extensions/browser/media/extension.css
+++ b/src/vs/workbench/contrib/extensions/browser/media/extension.css
@@ -22,12 +22,14 @@
 
 .extension-list-item > .icon-container {
 	position: relative;
+	display: flex;
+	align-items: center;
 }
 
 .extension-list-item > .icon-container > .icon {
 	width: 42px;
 	height: 42px;
-	padding: 10px 14px 10px 0;
+	padding-right: 14px;
 	flex-shrink: 0;
 	object-fit: contain;
 }
@@ -54,8 +56,10 @@
 
 .extension-list-item > .details {
 	flex: 1;
-	padding: 4px 0;
+	display: flex;
 	overflow: hidden;
+	flex-direction: column;
+	justify-content: center;
 }
 
 .extension-list-item > .details > .header-container {
@@ -153,6 +157,7 @@
 
 .extension-list-item > .details > .description {
 	padding-right: 11px;
+	line-height: normal;
 	color: var(--vscode-descriptionForeground);
 }
 
@@ -181,9 +186,22 @@
 
 .extension-list-item > .details > .footer > .author > .publisher-name {
 	font-size: 90%;
+	color: var(--vscode-descriptionForeground);
 	font-weight: 600;
 }
 
+.monaco-list-row.disabled .extension-list-item > .details > .footer > .author > .publisher-name{
+	color: var(--vscode-disabledForeground);
+}
+
+.monaco-list-row.disabled.selected .extension-list-item > .details > .footer > .author > .publisher-name{
+	color: unset;
+}
+
+.monaco-list-row.selected .extension-list-item > .details > .footer > .author > .publisher-name{
+	color: unset;
+}
+
 .extension-list-item > .details > .footer > .author > .publisher-name:not(:first-child) {
 	padding-left: 1px;
 }
diff --git a/src/vs/workbench/contrib/extensions/browser/media/extensionActions.css b/src/vs/workbench/contrib/extensions/browser/media/extensionActions.css
index 2b60c31070169c..a357c98a1dbaa7 100644
--- a/src/vs/workbench/contrib/extensions/browser/media/extensionActions.css
+++ b/src/vs/workbench/contrib/extensions/browser/media/extensionActions.css
@@ -36,8 +36,8 @@
 }
 
 .monaco-action-bar .action-item .action-label.extension-action.label,
-.monaco-action-bar .action-item.action-dropdown-item > .action-dropdown-item-separator{
-	background-color: var(--vscode-extensionButton-background);
+.monaco-action-bar .action-item.action-dropdown-item > .action-dropdown-item-separator {
+	background-color: var(--vscode-extensionButton-background) !important;
 }
 
 .monaco-action-bar .action-item .action-label.extension-action.label {
@@ -45,7 +45,7 @@
 }
 
 .monaco-action-bar .action-item .action-label.extension-action.label:hover {
-	background-color: var(--vscode-extensionButton-hoverBackground);
+	background-color: var(--vscode-extensionButton-hoverBackground) !important;
 }
 
 .monaco-action-bar .action-item.action-dropdown-item > .action-dropdown-item-separator > div  {
diff --git a/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css b/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css
index 401b36b2ba4b7c..ae51771f51db8b 100644
--- a/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css
+++ b/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css
@@ -355,31 +355,34 @@
 	font-size: 14px;
 	line-height: 36px;
 	padding-left: 20px;
-	border-bottom: 1px solid rgba(136, 136, 136, 0.45);
-	box-sizing: border-box;
+	border-bottom: 1px solid var(--vscode-panelSection-border);
 }
 
 .extension-editor > .body > .navbar > .monaco-action-bar > .actions-container {
 	justify-content: initial;
 }
 
-.extension-editor > .body > .navbar > .monaco-action-bar > .actions-container > .action-item > .action-label {
-	margin-right: 16px;
-	font-size: inherit;
-	opacity: 0.7;
+.extension-editor > .body > .navbar > .monaco-action-bar > .actions-container > .action-item {
+	height: 100%;
 }
 
 .extension-editor > .body > .navbar > .monaco-action-bar > .actions-container > .action-item > .action-label {
+	padding: 0 10px;
+	font-size: 11px;
+	font-weight: normal;
+	color: var(--vscode-panelTitle-inactiveForeground);
+	text-transform: uppercase;
 	background: none !important;
+	border-radius: 0px !important;
 }
 
 .extension-editor > .body > .navbar > .monaco-action-bar > .actions-container > .action-item > .action-label.checked {
-	opacity: 1;
-	text-decoration: underline;
+	border-bottom: 1px solid var(--vscode-panelTitle-activeBorder);
+	color: var(--vscode-panelTitle-activeForeground);
 }
 
 .extension-editor > .body > .navbar > .monaco-action-bar > .actions-container > .action-item > .action-label:hover {
-	text-decoration: underline;
+	color: var(--vscode-panelTitle-activeForeground);
 }
 
 .extension-editor > .body > .content {
@@ -757,9 +760,8 @@
 	opacity: 0.5;
 }
 
-.extension-editor > .body > .content .runtime-status .no-status-message,
-.extension-editor > .body > .content .runtime-status .activation-message {
-	font-size: medium;
+.extension-editor > .body > .content .runtime-status .activation-details > .activation-element-entry > .activation-message-title {
+	padding-right: 10px;
 }
 
 .extension-editor > .body > .content .runtime-status .message-entry {
diff --git a/src/vs/workbench/contrib/extensions/browser/media/extensionsViewlet.css b/src/vs/workbench/contrib/extensions/browser/media/extensionsViewlet.css
index 7fd5a5768a57d2..47e19378fa0453 100644
--- a/src/vs/workbench/contrib/extensions/browser/media/extensionsViewlet.css
+++ b/src/vs/workbench/contrib/extensions/browser/media/extensionsViewlet.css
@@ -96,15 +96,26 @@
 	background: url('loading.svg') center center no-repeat;
 }
 
+.monaco-workbench.vs-dark .extensions-viewlet > .extensions .extension-list-item.loading {
+	background-image: url('loading-dark.svg');
+}
+
+.monaco-workbench.hc-black .extensions-viewlet > .extensions .extension-list-item.loading {
+	background-image: url('loading-hc.svg');
+}
+
 .extensions-viewlet > .extensions .extension-list-item.loading > .icon-container {
 	display: none;
 }
-
+.extensions-viewlet.narrow > .extensions .extension-list-item > .icon-container {
+	display: flex;
+	align-items: flex-start;
+	padding-top: 10px;
+}
 .extensions-viewlet.narrow > .extensions .extension-list-item > .icon-container > .icon {
 	width: 24px;
 	height: 24px;
-	padding-top: 8px;
-	padding-right: 6px;
+	padding-right: 8px;
 }
 
 .extensions-viewlet:not(.narrow) > .extensions .extension-list-item > .details > .header-container > .header > .extension-remote-badge-container,
diff --git a/src/vs/workbench/contrib/extensions/browser/media/loading-dark.svg b/src/vs/workbench/contrib/extensions/browser/media/loading-dark.svg
new file mode 100644
index 00000000000000..7dc1ebd8cf045f
--- /dev/null
+++ b/src/vs/workbench/contrib/extensions/browser/media/loading-dark.svg
@@ -0,0 +1,31 @@
+<?xml version='1.0' standalone='no' ?>
+<svg xmlns='http://www.w3.org/2000/svg' version='1.1' width='10px' height='10px'>
+	<style>
+    circle {
+      animation: ball 0.6s linear infinite;
+    }
+
+    circle:nth-child(2) { animation-delay: 0.075s; }
+    circle:nth-child(3) { animation-delay: 0.15s; }
+    circle:nth-child(4) { animation-delay: 0.225s; }
+    circle:nth-child(5) { animation-delay: 0.3s; }
+    circle:nth-child(6) { animation-delay: 0.375s; }
+    circle:nth-child(7) { animation-delay: 0.45s; }
+    circle:nth-child(8) { animation-delay: 0.525s; }
+
+    @keyframes ball {
+      from { opacity: 1; }
+      to { opacity: 0.3; }
+    }
+	</style>
+	<g style="fill:grey;">
+		<circle cx='5' cy='1' r='1' style='opacity:0.3;' />
+		<circle cx='7.8284' cy='2.1716' r='1' style='opacity:0.3;' />
+		<circle cx='9' cy='5' r='1' style='opacity:0.3;' />
+		<circle cx='7.8284' cy='7.8284' r='1' style='opacity:0.3;' />
+		<circle cx='5' cy='9' r='1' style='opacity:0.3;' />
+		<circle cx='2.1716' cy='7.8284' r='1' style='opacity:0.3;' />
+		<circle cx='1' cy='5' r='1' style='opacity:0.3;' />
+		<circle cx='2.1716' cy='2.1716' r='1' style='opacity:0.3;' />
+	</g>
+</svg>
diff --git a/src/vs/workbench/contrib/extensions/browser/media/loading-hc.svg b/src/vs/workbench/contrib/extensions/browser/media/loading-hc.svg
new file mode 100644
index 00000000000000..c3633c0ddabee9
--- /dev/null
+++ b/src/vs/workbench/contrib/extensions/browser/media/loading-hc.svg
@@ -0,0 +1,31 @@
+<?xml version='1.0' standalone='no' ?>
+<svg xmlns='http://www.w3.org/2000/svg' version='1.1' width='10px' height='10px'>
+	<style>
+    circle {
+      animation: ball 0.6s linear infinite;
+    }
+
+    circle:nth-child(2) { animation-delay: 0.075s; }
+    circle:nth-child(3) { animation-delay: 0.15s; }
+    circle:nth-child(4) { animation-delay: 0.225s; }
+    circle:nth-child(5) { animation-delay: 0.3s; }
+    circle:nth-child(6) { animation-delay: 0.375s; }
+    circle:nth-child(7) { animation-delay: 0.45s; }
+    circle:nth-child(8) { animation-delay: 0.525s; }
+
+    @keyframes ball {
+      from { opacity: 1; }
+      to { opacity: 0.3; }
+    }
+	</style>
+	<g style="fill:white;">
+		<circle cx='5' cy='1' r='1' style='opacity:0.3;' />
+		<circle cx='7.8284' cy='2.1716' r='1' style='opacity:0.3;' />
+		<circle cx='9' cy='5' r='1' style='opacity:0.3;' />
+		<circle cx='7.8284' cy='7.8284' r='1' style='opacity:0.3;' />
+		<circle cx='5' cy='9' r='1' style='opacity:0.3;' />
+		<circle cx='2.1716' cy='7.8284' r='1' style='opacity:0.3;' />
+		<circle cx='1' cy='5' r='1' style='opacity:0.3;' />
+		<circle cx='2.1716' cy='2.1716' r='1' style='opacity:0.3;' />
+	</g>
+</svg>
diff --git a/src/vs/workbench/contrib/extensions/browser/media/loading.svg b/src/vs/workbench/contrib/extensions/browser/media/loading.svg
index 0098fd9f264a52..e762f06d5e6e8c 100644
--- a/src/vs/workbench/contrib/extensions/browser/media/loading.svg
+++ b/src/vs/workbench/contrib/extensions/browser/media/loading.svg
@@ -1,36 +1,31 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="575" height="6px">
-  <style>
+<?xml version='1.0' standalone='no' ?>
+<svg xmlns='http://www.w3.org/2000/svg' version='1.1' width='10px' height='10px'>
+	<style>
     circle {
-      animation: ball 2.5s cubic-bezier(0.000, 1.000, 1.000, 0.000) infinite;
-      fill: #bbb;
+      animation: ball 0.6s linear infinite;
     }
 
-    #balls {
-      animation: balls 2.5s linear infinite;
-    }
-
-    #circle2 { animation-delay: 0.1s; }
-    #circle3 { animation-delay: 0.2s; }
-    #circle4 { animation-delay: 0.3s; }
-    #circle5 { animation-delay: 0.4s; }
+    circle:nth-child(2) { animation-delay: 0.075s; }
+    circle:nth-child(3) { animation-delay: 0.15s; }
+    circle:nth-child(4) { animation-delay: 0.225s; }
+    circle:nth-child(5) { animation-delay: 0.3s; }
+    circle:nth-child(6) { animation-delay: 0.375s; }
+    circle:nth-child(7) { animation-delay: 0.45s; }
+    circle:nth-child(8) { animation-delay: 0.525s; }
 
     @keyframes ball {
-      from { transform: none; }
-      20% { transform: none; }
-      80% { transform: translateX(864px); }
-      to { transform: translateX(864px); }
-    }
-
-    @keyframes balls {
-      from { transform: translateX(-40px); }
-      to { transform: translateX(30px); }
+      from { opacity: 1; }
+      to { opacity: 0.3; }
     }
-  </style>
-  <g id="balls">
-    <circle class="circle" id="circle1" cx="-115" cy="3" r="3"/>
-    <circle class="circle" id="circle2" cx="-130" cy="3" r="3" />
-    <circle class="circle" id="circle3" cx="-145" cy="3" r="3" />
-    <circle class="circle" id="circle4" cx="-160" cy="3" r="3" />
-    <circle class="circle" id="circle5" cx="-175" cy="3" r="3" />
-  </g>
-</svg>
\ No newline at end of file
+	</style>
+	<g>
+		<circle cx='5' cy='1' r='1' style='opacity:0.3;' />
+		<circle cx='7.8284' cy='2.1716' r='1' style='opacity:0.3;' />
+		<circle cx='9' cy='5' r='1' style='opacity:0.3;' />
+		<circle cx='7.8284' cy='7.8284' r='1' style='opacity:0.3;' />
+		<circle cx='5' cy='9' r='1' style='opacity:0.3;' />
+		<circle cx='2.1716' cy='7.8284' r='1' style='opacity:0.3;' />
+		<circle cx='1' cy='5' r='1' style='opacity:0.3;' />
+		<circle cx='2.1716' cy='2.1716' r='1' style='opacity:0.3;' />
+	</g>
+</svg>
diff --git a/src/vs/workbench/contrib/extensions/common/extensions.ts b/src/vs/workbench/contrib/extensions/common/extensions.ts
index 9b0e6b6afc2954..e2896c8526b528 100644
--- a/src/vs/workbench/contrib/extensions/common/extensions.ts
+++ b/src/vs/workbench/contrib/extensions/common/extensions.ts
@@ -85,9 +85,7 @@ export interface IExtension {
 	readonly deprecationInfo?: IDeprecationInfo;
 }
 
-export const SERVICE_ID = 'extensionsWorkbenchService';
-
-export const IExtensionsWorkbenchService = createDecorator<IExtensionsWorkbenchService>(SERVICE_ID);
+export const IExtensionsWorkbenchService = createDecorator<IExtensionsWorkbenchService>('extensionsWorkbenchService');
 
 export interface IExtensionsWorkbenchService {
 	readonly _serviceBrand: undefined;
diff --git a/src/vs/workbench/contrib/feedback/browser/feedback.ts b/src/vs/workbench/contrib/feedback/browser/feedback.ts
index dad00b3f8cc2f9..7236214a192dc1 100644
--- a/src/vs/workbench/contrib/feedback/browser/feedback.ts
+++ b/src/vs/workbench/contrib/feedback/browser/feedback.ts
@@ -9,9 +9,9 @@ import { IDisposable, DisposableStore, Disposable } from 'vs/base/common/lifecyc
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IIntegrityService } from 'vs/workbench/services/integrity/common/integrity';
-import { IThemeService, registerThemingParticipant, IColorTheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { attachStylerCallback } from 'vs/platform/theme/common/styler';
-import { editorWidgetBackground, editorWidgetForeground, widgetShadow, inputBorder, inputForeground, inputBackground, inputActiveOptionBorder, editorBackground, textLinkForeground, contrastBorder } from 'vs/platform/theme/common/colorRegistry';
+import { editorWidgetBackground, editorWidgetForeground, widgetShadow, inputBorder, inputForeground, inputBackground, editorBackground, contrastBorder } from 'vs/platform/theme/common/colorRegistry';
 import { append, $, addDisposableListener, EventType, EventHelper, prepend } from 'vs/base/browser/dom';
 import { IAnchor } from 'vs/base/browser/ui/contextview/contextview';
 import { Button } from 'vs/base/browser/ui/button/button';
@@ -295,6 +295,7 @@ export class FeedbackWidget extends Disposable {
 				this.feedbackForm.style.backgroundColor = colors.editorWidgetBackground ? colors.editorWidgetBackground.toString() : '';
 				this.feedbackForm.style.color = colors.editorWidgetForeground ? colors.editorWidgetForeground.toString() : '';
 				this.feedbackForm.style.boxShadow = colors.widgetShadow ? `0 0 8px 2px ${colors.widgetShadow}` : '';
+				this.feedbackForm.style.border = colors.widgetBorder ? `1px solid ${colors.widgetBorder}` : '';
 			}
 			if (this.feedbackDescriptionInput) {
 				this.feedbackDescriptionInput.style.backgroundColor = colors.inputBackground ? colors.inputBackground.toString() : '';
@@ -453,18 +454,3 @@ export class FeedbackWidget extends Disposable {
 		this.hide();
 	}
 }
-
-registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) => {
-
-	// Sentiment Buttons
-	const inputActiveOptionBorderColor = theme.getColor(inputActiveOptionBorder);
-	if (inputActiveOptionBorderColor) {
-		collector.addRule(`.monaco-workbench .feedback-form .sentiment.checked { border: 1px solid ${inputActiveOptionBorderColor}; }`);
-	}
-
-	// Links
-	const linkColor = theme.getColor(textLinkForeground) || theme.getColor(contrastBorder);
-	if (linkColor) {
-		collector.addRule(`.monaco-workbench .feedback-form .content .channels a { color: ${linkColor}; }`);
-	}
-});
diff --git a/src/vs/workbench/contrib/feedback/browser/media/feedback.css b/src/vs/workbench/contrib/feedback/browser/media/feedback.css
index e619571200fb99..61153fbb70cab1 100644
--- a/src/vs/workbench/contrib/feedback/browser/media/feedback.css
+++ b/src/vs/workbench/contrib/feedback/browser/media/feedback.css
@@ -9,6 +9,7 @@
 	right: 6px;
 	padding: 1em;
 	cursor: default;
+	border-radius: 4px;
 }
 
 .monaco-workbench .feedback-form h2 {
@@ -51,6 +52,7 @@
 
 .monaco-workbench .feedback-form .content .channels a {
 	padding: 2px 0;
+	color: var(--vscode-textLink-foreground, var(--vscode-contrastBorder));
 }
 
 .monaco-workbench .feedback-form .content .channels a:hover {
@@ -114,6 +116,10 @@
 	background-color: #eaeaea;
 }
 
+.monaco-workbench .feedback-form .sentiment.checked {
+	border: 1px solid var(--vscode-inputOption-activeBorder);
+}
+
 /* Theming */
 .monaco-workbench.vs .feedback-form .feedback-alias,
 .monaco-workbench.vs .feedback-form .feedback-description {
diff --git a/src/vs/workbench/contrib/files/browser/editors/textFileEditorTracker.ts b/src/vs/workbench/contrib/files/browser/editors/textFileEditorTracker.ts
index 5448df0612f9e3..fb876ba670a7bd 100644
--- a/src/vs/workbench/contrib/files/browser/editors/textFileEditorTracker.ts
+++ b/src/vs/workbench/contrib/files/browser/editors/textFileEditorTracker.ts
@@ -69,9 +69,10 @@ export class TextFileEditorTracker extends Disposable implements IWorkbenchContr
 				return false; // resource must not be pending to save
 			}
 
-			if (this.filesConfigurationService.getAutoSaveMode() === AutoSaveMode.AFTER_SHORT_DELAY && !fileModel?.hasState(TextFileEditorModelState.ERROR)) {
+			if (resource.scheme !== Schemas.untitled && this.filesConfigurationService.getAutoSaveMode() === AutoSaveMode.AFTER_SHORT_DELAY && !fileModel?.hasState(TextFileEditorModelState.ERROR)) {
 				// leave models auto saved after short delay unless
-				// the save resulted in an error
+				// the save resulted in an error and not for untitled
+				// that are not auto-saved anyway
 				return false;
 			}
 
diff --git a/src/vs/workbench/contrib/files/browser/explorerService.ts b/src/vs/workbench/contrib/files/browser/explorerService.ts
index 01f528cddcfaec..5dc287234aad80 100644
--- a/src/vs/workbench/contrib/files/browser/explorerService.ts
+++ b/src/vs/workbench/contrib/files/browser/explorerService.ts
@@ -437,7 +437,7 @@ export class ExplorerService implements IExplorerService {
 	private async onConfigurationUpdated(configuration: IFilesConfiguration, event?: IConfigurationChangeEvent): Promise<void> {
 		let shouldRefresh = false;
 
-		if (event?.affectedKeys.some(x => x.startsWith('explorer.fileNesting.'))) {
+		if (event?.affectsConfiguration('explorer.fileNesting')) {
 			shouldRefresh = true;
 		}
 
diff --git a/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts b/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
index 5ebfe7c291cccb..7f9a69d3f7d528 100644
--- a/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
+++ b/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as nls from 'vs/nls';
-import { ToggleAutoSaveAction, FocusFilesExplorer, GlobalCompareResourcesAction, ShowActiveFileInExplorer, CompareWithClipboardAction, NEW_FILE_COMMAND_ID, NEW_FILE_LABEL, NEW_FOLDER_COMMAND_ID, NEW_FOLDER_LABEL, TRIGGER_RENAME_LABEL, MOVE_FILE_TO_TRASH_LABEL, COPY_FILE_LABEL, PASTE_FILE_LABEL, FileCopiedContext, renameHandler, moveFileToTrashHandler, copyFileHandler, pasteFileHandler, deleteFileHandler, cutFileHandler, DOWNLOAD_COMMAND_ID, openFilePreserveFocusHandler, DOWNLOAD_LABEL, ShowOpenedFileInNewWindow, UPLOAD_COMMAND_ID, UPLOAD_LABEL, fileCategory } from 'vs/workbench/contrib/files/browser/fileActions';
+import { ToggleAutoSaveAction, FocusFilesExplorer, GlobalCompareResourcesAction, ShowActiveFileInExplorer, CompareWithClipboardAction, NEW_FILE_COMMAND_ID, NEW_FILE_LABEL, NEW_FOLDER_COMMAND_ID, NEW_FOLDER_LABEL, TRIGGER_RENAME_LABEL, MOVE_FILE_TO_TRASH_LABEL, COPY_FILE_LABEL, PASTE_FILE_LABEL, FileCopiedContext, renameHandler, moveFileToTrashHandler, copyFileHandler, pasteFileHandler, deleteFileHandler, cutFileHandler, DOWNLOAD_COMMAND_ID, openFilePreserveFocusHandler, DOWNLOAD_LABEL, ShowOpenedFileInNewWindow, UPLOAD_COMMAND_ID, UPLOAD_LABEL, fileCategory, CompareNewUntitledTextFilesAction } from 'vs/workbench/contrib/files/browser/fileActions';
 import { revertLocalChangesCommand, acceptLocalChangesCommand, CONFLICT_RESOLUTION_CONTEXT } from 'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler';
 import { MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
 import { ILocalizedString } from 'vs/platform/action/common/action';
@@ -33,6 +33,7 @@ registerAction2(GlobalCompareResourcesAction);
 registerAction2(FocusFilesExplorer);
 registerAction2(ShowActiveFileInExplorer);
 registerAction2(CompareWithClipboardAction);
+registerAction2(CompareNewUntitledTextFilesAction);
 registerAction2(ToggleAutoSaveAction);
 registerAction2(ShowOpenedFileInNewWindow);
 
@@ -205,7 +206,7 @@ appendToCommandPalette(COMPARE_WITH_SAVED_COMMAND_ID, { value: nls.localize('com
 appendToCommandPalette(SAVE_FILE_AS_COMMAND_ID, { value: SAVE_FILE_AS_LABEL, original: 'Save As...' }, fileCategory);
 appendToCommandPalette(NEW_FILE_COMMAND_ID, { value: NEW_FILE_LABEL, original: 'New File' }, fileCategory, WorkspaceFolderCountContext.notEqualsTo('0'));
 appendToCommandPalette(NEW_FOLDER_COMMAND_ID, { value: NEW_FOLDER_LABEL, original: 'New Folder' }, fileCategory, WorkspaceFolderCountContext.notEqualsTo('0'));
-appendToCommandPalette(NEW_UNTITLED_FILE_COMMAND_ID, { value: NEW_UNTITLED_FILE_LABEL, original: 'New Untitled File' }, fileCategory);
+appendToCommandPalette(NEW_UNTITLED_FILE_COMMAND_ID, { value: NEW_UNTITLED_FILE_LABEL, original: 'New Untitled Text File' }, fileCategory);
 
 // Menu registration - open editors
 
diff --git a/src/vs/workbench/contrib/files/browser/fileActions.ts b/src/vs/workbench/contrib/files/browser/fileActions.ts
index 07ef6bb021ecba..bd344cc6fb1921 100644
--- a/src/vs/workbench/contrib/files/browser/fileActions.ts
+++ b/src/vs/workbench/contrib/files/browser/fileActions.ts
@@ -529,7 +529,7 @@ export class ToggleAutoSaveAction extends Action2 {
 	}
 }
 
-export abstract class BaseSaveAllAction extends Action {
+abstract class BaseSaveAllAction extends Action {
 	private lastDirtyState: boolean;
 
 	constructor(
@@ -755,6 +755,31 @@ function getWellFormedFileName(filename: string): string {
 	return filename;
 }
 
+export class CompareNewUntitledTextFilesAction extends Action2 {
+
+	static readonly ID = 'workbench.files.action.compareNewUntitledTextFiles';
+	static readonly LABEL = nls.localize('compareNewUntitledTextFiles', "Compare New Untitled Text Files");
+
+	constructor() {
+		super({
+			id: CompareNewUntitledTextFilesAction.ID,
+			title: { value: CompareNewUntitledTextFilesAction.LABEL, original: 'Compare New Untitled Text Files' },
+			f1: true,
+			category: fileCategory
+		});
+	}
+
+	override async run(accessor: ServicesAccessor): Promise<void> {
+		const editorService = accessor.get(IEditorService);
+
+		await editorService.openEditor({
+			original: { resource: undefined },
+			modified: { resource: undefined },
+			options: { pinned: true }
+		});
+	}
+}
+
 export class CompareWithClipboardAction extends Action2 {
 
 	static readonly ID = 'workbench.files.action.compareWithClipboard';
diff --git a/src/vs/workbench/contrib/files/browser/fileCommands.ts b/src/vs/workbench/contrib/files/browser/fileCommands.ts
index e4372f87df0e02..96e0fc17491223 100644
--- a/src/vs/workbench/contrib/files/browser/fileCommands.ts
+++ b/src/vs/workbench/contrib/files/browser/fileCommands.ts
@@ -16,7 +16,7 @@ import { ExplorerViewPaneContainer } from 'vs/workbench/contrib/files/browser/ex
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import { IListService } from 'vs/platform/list/browser/listService';
-import { CommandsRegistry, ICommandHandler } from 'vs/platform/commands/common/commands';
+import { CommandsRegistry, ICommandHandler, ICommandService } from 'vs/platform/commands/common/commands';
 import { IContextKey, IContextKeyService, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { IFileService } from 'vs/platform/files/common/files';
 import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
@@ -49,6 +49,7 @@ import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/b
 import { ViewContainerLocation } from 'vs/workbench/common/views';
 import { OPEN_TO_SIDE_COMMAND_ID, COMPARE_WITH_SAVED_COMMAND_ID, SELECT_FOR_COMPARE_COMMAND_ID, ResourceSelectedForCompareContext, COMPARE_SELECTED_COMMAND_ID, COMPARE_RESOURCE_COMMAND_ID, COPY_PATH_COMMAND_ID, COPY_RELATIVE_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, OPEN_WITH_EXPLORER_COMMAND_ID, SAVE_FILE_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID, SAVE_FILE_AS_COMMAND_ID, SAVE_ALL_COMMAND_ID, SAVE_ALL_IN_GROUP_COMMAND_ID, SAVE_FILES_COMMAND_ID, REVERT_FILE_COMMAND_ID, REMOVE_ROOT_FOLDER_COMMAND_ID, PREVIOUS_COMPRESSED_FOLDER, NEXT_COMPRESSED_FOLDER, FIRST_COMPRESSED_FOLDER, LAST_COMPRESSED_FOLDER, NEW_UNTITLED_FILE_COMMAND_ID, NEW_UNTITLED_FILE_LABEL, NEW_FILE_COMMAND_ID } from './fileConstants';
 import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
+import { RemoveRootFolderAction } from 'vs/workbench/browser/actions/workspaceActions';
 
 export const openWindowCommand = (accessor: ServicesAccessor, toOpen: IWindowOpenable[], options?: IOpenWindowOptions) => {
 	if (Array.isArray(toOpen)) {
@@ -562,6 +563,12 @@ CommandsRegistry.registerCommand({
 			workspace.folders.some(folder => uriIdentityService.extUri.isEqual(folder.uri, resource)) // Need to verify resources are workspaces since multi selection can trigger this command on some non workspace resources
 		);
 
+		if (resources.length === 0) {
+			const commandService = accessor.get(ICommandService);
+			// Show a picker for the user to choose which folder to remove
+			return commandService.executeCommand(RemoveRootFolderAction.ID);
+		}
+
 		return workspaceEditingService.removeFolders(resources);
 	}
 });
@@ -655,7 +662,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 		args: [
 			{
 				isOptional: true,
-				name: 'New Untitled File args',
+				name: 'New Untitled Text File args',
 				description: 'The editor view type, language ID, or resource path if known',
 				schema: {
 					'type': 'object',
diff --git a/src/vs/workbench/contrib/files/browser/fileConstants.ts b/src/vs/workbench/contrib/files/browser/fileConstants.ts
index 4b9ff14454d360..6736003acd1936 100644
--- a/src/vs/workbench/contrib/files/browser/fileConstants.ts
+++ b/src/vs/workbench/contrib/files/browser/fileConstants.ts
@@ -45,5 +45,5 @@ export const NEXT_COMPRESSED_FOLDER = 'nextCompressedFolder';
 export const FIRST_COMPRESSED_FOLDER = 'firstCompressedFolder';
 export const LAST_COMPRESSED_FOLDER = 'lastCompressedFolder';
 export const NEW_UNTITLED_FILE_COMMAND_ID = 'workbench.action.files.newUntitledFile';
-export const NEW_UNTITLED_FILE_LABEL = nls.localize('newUntitledFile', "New Untitled File");
+export const NEW_UNTITLED_FILE_LABEL = nls.localize('newUntitledFile', "New Untitled Text File");
 export const NEW_FILE_COMMAND_ID = 'workbench.action.files.newFile';
diff --git a/src/vs/workbench/contrib/files/browser/files.contribution.ts b/src/vs/workbench/contrib/files/browser/files.contribution.ts
index 92320d48fd34f8..99f977f4e971bb 100644
--- a/src/vs/workbench/contrib/files/browser/files.contribution.ts
+++ b/src/vs/workbench/contrib/files/browser/files.contribution.ts
@@ -138,7 +138,7 @@ configurationRegistry.registerConfiguration({
 	'properties': {
 		[FILES_EXCLUDE_CONFIG]: {
 			'type': 'object',
-			'markdownDescription': nls.localize('exclude', "Configure [glob patterns](https://code.visualstudio.com/docs/editor/codebasics#_advanced-search-options) for excluding files and folders. For example, the File Explorer decides which files and folders to show or hide based on this setting. Refer to the `#search.exclude#` setting to define search-specific excludes. Refer to the `#explorer.excludeGitIgnore#` setting for ignorings files based on your `.gitignore`."),
+			'markdownDescription': nls.localize('exclude', "Configure [glob patterns](https://code.visualstudio.com/docs/editor/codebasics#_advanced-search-options) for excluding files and folders. For example, the File Explorer decides which files and folders to show or hide based on this setting. Refer to the `#search.exclude#` setting to define search-specific excludes. Refer to the `#explorer.excludeGitIgnore#` setting for ignoring files based on your `.gitignore`."),
 			'default': {
 				...{ '**/.git': true, '**/.svn': true, '**/.hg': true, '**/CVS': true, '**/.DS_Store': true, '**/Thumbs.db': true },
 				...(isWeb ? { '**/*.crswap': true /* filter out swap files used for local file access */ } : undefined)
diff --git a/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts b/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts
index 7ceadf41bd7c87..07b3354a4e7861 100644
--- a/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts
+++ b/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts
@@ -30,7 +30,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { MenuId, Action2, registerAction2, MenuRegistry } from 'vs/platform/actions/common/actions';
 import { OpenEditorsDirtyEditorContext, OpenEditorsGroupContext, OpenEditorsReadonlyEditorContext, SAVE_ALL_LABEL, SAVE_ALL_COMMAND_ID, NEW_UNTITLED_FILE_COMMAND_ID } from 'vs/workbench/contrib/files/browser/fileConstants';
-import { ResourceContextKey } from 'vs/workbench/common/contextkeys';
+import { ResourceContextKey, MultipleEditorGroupsContext } from 'vs/workbench/common/contextkeys';
 import { CodeDataTransfers, containsDragType } from 'vs/platform/dnd/browser/dnd';
 import { ResourcesDropHandler, fillEditorsDragData } from 'vs/workbench/browser/dnd';
 import { ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
@@ -96,6 +96,10 @@ export class OpenEditorsView extends ViewPane {
 		this.structuralRefreshDelay = 0;
 		let labelChangeListeners: IDisposable[] = [];
 		this.listRefreshScheduler = new RunOnceScheduler(() => {
+			// No need to refresh the list if it's not rendered
+			if (!this.list) {
+				return;
+			}
 			labelChangeListeners = dispose(labelChangeListeners);
 			const previousLength = this.list.length;
 			const elements = this.getElements();
@@ -745,7 +749,7 @@ registerAction2(class extends Action2 {
 			menu: {
 				id: MenuId.ViewTitle,
 				group: 'navigation',
-				when: ContextKeyExpr.equals('view', OpenEditorsView.ID),
+				when: ContextKeyExpr.and(ContextKeyExpr.equals('view', OpenEditorsView.ID), MultipleEditorGroupsContext),
 				order: 10
 			}
 		});
@@ -820,7 +824,7 @@ registerAction2(class extends Action2 {
 	constructor() {
 		super({
 			id: 'openEditors.newUntitledFile',
-			title: { value: nls.localize('newUntitledFile', "New Untitled File"), original: 'New Untitled File' },
+			title: { value: nls.localize('newUntitledFile', "New Untitled Text File"), original: 'New Untitled Text File' },
 			f1: false,
 			icon: Codicon.newFile,
 			menu: {
diff --git a/src/vs/workbench/contrib/files/test/browser/textFileEditorTracker.test.ts b/src/vs/workbench/contrib/files/test/browser/textFileEditorTracker.test.ts
index c25a53fd7856ea..b8072c4707abf0 100644
--- a/src/vs/workbench/contrib/files/test/browser/textFileEditorTracker.test.ts
+++ b/src/vs/workbench/contrib/files/test/browser/textFileEditorTracker.test.ts
@@ -154,8 +154,16 @@ suite('Files - TextFileEditorTracker', () => {
 		}
 	}
 
-	test('dirty untitled text file model opens as editor', async function () {
-		const accessor = await createTracker();
+	test('dirty untitled text file model opens as editor', function () {
+		return testUntitledEditor(false);
+	});
+
+	test('dirty untitled text file model opens as editor - autosave ON', function () {
+		return testUntitledEditor(true);
+	});
+
+	async function testUntitledEditor(autoSaveEnabled: boolean): Promise<void> {
+		const accessor = await createTracker(autoSaveEnabled);
 
 		const untitledTextEditor = await accessor.textEditorService.resolveTextEditor({ resource: undefined, forceUntitled: true }) as UntitledTextEditorInput;
 		const model = disposables.add(await untitledTextEditor.resolve());
@@ -166,7 +174,7 @@ suite('Files - TextFileEditorTracker', () => {
 
 		await awaitEditorOpening(accessor.editorService);
 		assert.ok(accessor.editorService.isOpened(untitledTextEditor));
-	});
+	}
 
 	function awaitEditorOpening(editorService: IEditorService): Promise<void> {
 		return Event.toPromise(Event.once(editorService.onDidActiveEditorChange));
diff --git a/src/vs/workbench/contrib/interactive/browser/interactiveEditor.ts b/src/vs/workbench/contrib/interactive/browser/interactiveEditor.ts
index 3e360af64dd8aa..9be9ba01eedbfa 100644
--- a/src/vs/workbench/contrib/interactive/browser/interactiveEditor.ts
+++ b/src/vs/workbench/contrib/interactive/browser/interactiveEditor.ts
@@ -149,7 +149,7 @@ export class InteractiveEditor extends EditorPane {
 		this.#notebookExecutionStateService = notebookExecutionStateService;
 		this.#extensionService = extensionService;
 
-		this.#notebookOptions = new NotebookOptions(configurationService, notebookExecutionStateService, { cellToolbarInteraction: 'hover', globalToolbar: true, defaultCellCollapseConfig: { codeCell: { inputCollapsed: true } } });
+		this.#notebookOptions = new NotebookOptions(configurationService, notebookExecutionStateService, { cellToolbarInteraction: 'hover', globalToolbar: true, dragAndDropEnabled: false });
 		this.#editorMemento = this.getEditorMemento<InteractiveEditorViewState>(editorGroupService, textResourceConfigurationService, INTERACTIVE_EDITOR_VIEW_STATE_PREFERENCE_KEY);
 
 		codeEditorService.registerDecorationType('interactive-decoration', DECORATION_KEY, {});
@@ -570,12 +570,17 @@ export class InteractiveEditor extends EditorPane {
 	layout(dimension: DOM.Dimension): void {
 		this.#rootElement.classList.toggle('mid-width', dimension.width < 1000 && dimension.width >= 600);
 		this.#rootElement.classList.toggle('narrow-width', dimension.width < 600);
+		const editorHeightChanged = dimension.height !== this.#dimension?.height;
 		this.#dimension = dimension;
 
 		if (!this.#notebookWidget.value) {
 			return;
 		}
 
+		if (editorHeightChanged && this.#codeEditorWidget) {
+			SuggestController.get(this.#codeEditorWidget)?.cancelSuggestWidget();
+		}
+
 		this.#notebookEditorContainer.style.height = `${this.#dimension.height - this.#inputCellContainerHeight}px`;
 		this.#layoutWidgets(dimension);
 	}
diff --git a/src/vs/workbench/contrib/issue/browser/issue.web.contribution.ts b/src/vs/workbench/contrib/issue/browser/issue.web.contribution.ts
index d207b297844564..dc24bdda647438 100644
--- a/src/vs/workbench/contrib/issue/browser/issue.web.contribution.ts
+++ b/src/vs/workbench/contrib/issue/browser/issue.web.contribution.ts
@@ -19,7 +19,7 @@ import { IWorkbenchIssueService } from 'vs/workbench/services/issue/common/issue
 
 class RegisterIssueContribution implements IWorkbenchContribution {
 
-	constructor(@IProductService readonly productService: IProductService) {
+	constructor(@IProductService productService: IProductService) {
 		if (productService.reportIssueUrl) {
 			const OpenIssueReporterActionLabel = nls.localize({ key: 'reportIssueInEnglish', comment: ['Translate this to "Report Issue in English" in all languages please!'] }, "Report Issue");
 
diff --git a/src/vs/workbench/contrib/localization/electron-sandbox/localization.contribution.ts b/src/vs/workbench/contrib/localization/electron-sandbox/localization.contribution.ts
index 1a682e441d8e90..9cc0a15f0b53aa 100644
--- a/src/vs/workbench/contrib/localization/electron-sandbox/localization.contribution.ts
+++ b/src/vs/workbench/contrib/localization/electron-sandbox/localization.contribution.ts
@@ -141,9 +141,9 @@ export class LocalizationWorkbenchContribution extends Disposable implements IWo
 						const translations: { [key: string]: string } = {};
 						Object.keys(minimumTranslatedStrings).forEach(key => {
 							if (!translationsFromPack[key] || useEnglish) {
-								translations[key] = minimumTranslatedStrings[key].replace('{0}', languageName);
+								translations[key] = minimumTranslatedStrings[key].replace('{0}', () => languageName);
 							} else {
-								translations[key] = `${translationsFromPack[key].replace('{0}', languageDisplayName)} (${minimumTranslatedStrings[key].replace('{0}', languageName)})`;
+								translations[key] = `${translationsFromPack[key].replace('{0}', () => languageDisplayName)} (${minimumTranslatedStrings[key].replace('{0}', () => languageName)})`;
 							}
 						});
 
diff --git a/src/vs/workbench/contrib/logs/electron-sandbox/logLevelService.ts b/src/vs/workbench/contrib/logs/electron-sandbox/logLevelService.ts
index de269ec1db2757..323d8e30dec65d 100644
--- a/src/vs/workbench/contrib/logs/electron-sandbox/logLevelService.ts
+++ b/src/vs/workbench/contrib/logs/electron-sandbox/logLevelService.ts
@@ -10,6 +10,7 @@ import { LogLevelService as CommonLogLevelService } from 'vs/workbench/contrib/l
 import { remotePtyHostLog, remoteServerLog, sharedLogChannelId, userDataSyncLogChannelId } from 'vs/workbench/contrib/logs/common/logConstants';
 import { LogLevelChannelClient } from 'vs/platform/log/common/logIpc';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
+import { LOG_CHANNEL_ID as remoteTunnelLogChannelId } from 'vs/platform/remoteTunnel/common/remoteTunnel';
 
 export class LogLevelService extends CommonLogLevelService {
 
@@ -32,7 +33,7 @@ export class LogLevelService extends CommonLogLevelService {
 		const resource = channel?.log ? channel.file : undefined;
 
 		LogLevelChannelClient.setLevel(this.mainProcessService.getChannel('logLevel'), logLevel, resource);
-		if (id === sharedLogChannelId || id === userDataSyncLogChannelId) {
+		if (id === sharedLogChannelId || id === userDataSyncLogChannelId || id === remoteTunnelLogChannelId) {
 			LogLevelChannelClient.setLevel(this.sharedProcessService.getChannel('logLevel'), logLevel, resource);
 			return true;
 		}
diff --git a/src/vs/workbench/contrib/markers/browser/markersFileDecorations.ts b/src/vs/workbench/contrib/markers/browser/markersFileDecorations.ts
index 8ca2e6bce00c8a..68d1708cee11f6 100644
--- a/src/vs/workbench/contrib/markers/browser/markersFileDecorations.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersFileDecorations.ts
@@ -66,7 +66,11 @@ class MarkersFileDecorations implements IWorkbenchContribution {
 	) {
 		//
 		this._disposables = [
-			this._configurationService.onDidChangeConfiguration(this._updateEnablement, this),
+			this._configurationService.onDidChangeConfiguration(e => {
+				if (e.affectsConfiguration('problems')) {
+					this._updateEnablement();
+				}
+			}),
 		];
 		this._updateEnablement();
 	}
diff --git a/src/vs/workbench/contrib/markers/browser/markersTable.ts b/src/vs/workbench/contrib/markers/browser/markersTable.ts
index 0f8f0070be336e..ae7e45b4e70ba5 100644
--- a/src/vs/workbench/contrib/markers/browser/markersTable.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersTable.ts
@@ -13,7 +13,7 @@ import { IOpenEvent, IWorkbenchTableOptions, WorkbenchTable } from 'vs/platform/
 import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
 import { compareMarkersByUri, Marker, MarkerTableItem, ResourceMarkers } from 'vs/workbench/contrib/markers/browser/markersModel';
 import { MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { SeverityIcon } from 'vs/platform/severityIcon/common/severityIcon';
+import { SeverityIcon } from 'vs/platform/severityIcon/browser/severityIcon';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { ILabelService } from 'vs/platform/label/common/label';
 import { FilterOptions } from 'vs/workbench/contrib/markers/browser/markersFilterOptions';
diff --git a/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts b/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts
index 7f54bfe9b7e5ac..f5c2a695fd6168 100644
--- a/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts
@@ -13,8 +13,7 @@ import { IMarker, MarkerSeverity } from 'vs/platform/markers/common/markers';
 import { ResourceMarkers, Marker, RelatedInformation, MarkerElement, MarkerTableItem } from 'vs/workbench/contrib/markers/browser/markersModel';
 import Messages from 'vs/workbench/contrib/markers/browser/messages';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { attachBadgeStyler } from 'vs/platform/theme/common/styler';
-import { IThemeService, ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { IDisposable, dispose, Disposable, toDisposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { QuickFixAction, QuickFixActionViewItem } from 'vs/workbench/contrib/markers/browser/markersViewActions';
@@ -37,7 +36,7 @@ import { applyCodeAction, ApplyCodeActionReason, getCodeActions } from 'vs/edito
 import { CodeActionKind, CodeActionSet, CodeActionTriggerSource } from 'vs/editor/contrib/codeAction/common/types';
 import { ITextModel } from 'vs/editor/common/model';
 import { IEditorService, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { SeverityIcon } from 'vs/platform/severityIcon/common/severityIcon';
+import { SeverityIcon } from 'vs/platform/severityIcon/browser/severityIcon';
 import { CodeActionTriggerType } from 'vs/editor/common/languages';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { IFileService } from 'vs/platform/files/common/files';
@@ -50,6 +49,7 @@ import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeat
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { MarkersContextKeys, MarkersViewMode } from 'vs/workbench/contrib/markers/common/markers';
 import { unsupportedSchemas } from 'vs/platform/markers/common/markerService';
+import { defaultCountBadgeStyles } from 'vs/platform/theme/browser/defaultStyles';
 
 interface IResourceMarkersTemplateData {
 	resourceLabel: IResourceLabel;
@@ -156,7 +156,6 @@ export class ResourceMarkersRenderer implements ITreeRenderer<ResourceMarkers, R
 	constructor(
 		private labels: ResourceLabels,
 		onDidChangeRenderNodeCount: Event<ITreeNode<ResourceMarkers, ResourceMarkersFilterData>>,
-		@IThemeService private readonly themeService: IThemeService,
 		@ILabelService private readonly labelService: ILabelService,
 		@IFileService private readonly fileService: IFileService
 	) {
@@ -172,8 +171,7 @@ export class ResourceMarkersRenderer implements ITreeRenderer<ResourceMarkers, R
 		data.resourceLabel = this.labels.create(resourceLabelContainer, { supportHighlights: true });
 
 		const badgeWrapper = dom.append(container, dom.$('.count-badge-wrapper'));
-		data.count = new CountBadge(badgeWrapper);
-		data.styler = attachBadgeStyler(data.count, this.themeService);
+		data.count = new CountBadge(badgeWrapper, {}, defaultCountBadgeStyles);
 
 		return data;
 	}
diff --git a/src/vs/workbench/contrib/markers/browser/markersView.ts b/src/vs/workbench/contrib/markers/browser/markersView.ts
index 921eaa102337ad..c8c39772e01a70 100644
--- a/src/vs/workbench/contrib/markers/browser/markersView.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersView.ts
@@ -16,7 +16,7 @@ import { MarkersFilters, IMarkersFiltersChangeEvent } from 'vs/workbench/contrib
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import Messages from 'vs/workbench/contrib/markers/browser/messages';
 import { RangeHighlightDecorations } from 'vs/workbench/browser/codeeditor';
-import { IThemeService, registerThemingParticipant, IColorTheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { localize } from 'vs/nls';
@@ -40,11 +40,9 @@ import { withUndefinedAsNull } from 'vs/base/common/types';
 import { MementoObject, Memento } from 'vs/workbench/common/memento';
 import { IIdentityProvider, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
 import { KeyCode } from 'vs/base/common/keyCodes';
-import { editorLightBulbForeground, editorLightBulbAutoFixForeground } from 'vs/platform/theme/common/colorRegistry';
 import { IViewPaneOptions, FilterViewPane } from 'vs/workbench/browser/parts/views/viewPane';
 import { IViewDescriptorService } from 'vs/workbench/common/views';
 import { IOpenerService, withSelection } from 'vs/platform/opener/common/opener';
-import { Codicon } from 'vs/base/common/codicons';
 import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
@@ -1048,25 +1046,3 @@ class MarkersTree extends WorkbenchObjectTree<MarkerElement, FilterData> impleme
 		super.layout(height, width);
 	}
 }
-
-registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) => {
-
-	// Lightbulb Icon
-	const editorLightBulbForegroundColor = theme.getColor(editorLightBulbForeground);
-	if (editorLightBulbForegroundColor) {
-		collector.addRule(`
-		.monaco-workbench .markers-panel-container ${Codicon.lightBulb.cssSelector} {
-			color: ${editorLightBulbForegroundColor};
-		}`);
-	}
-
-	// Lightbulb Auto Fix Icon
-	const editorLightBulbAutoFixForegroundColor = theme.getColor(editorLightBulbAutoFixForeground);
-	if (editorLightBulbAutoFixForegroundColor) {
-		collector.addRule(`
-		.monaco-workbench .markers-panel-container ${Codicon.lightbulbAutofix.cssSelector} {
-			color: ${editorLightBulbAutoFixForegroundColor};
-		}`);
-	}
-
-});
diff --git a/src/vs/workbench/contrib/markers/browser/media/markers.css b/src/vs/workbench/contrib/markers/browser/media/markers.css
index c03346efbd4bdf..ce84d620ce87fa 100644
--- a/src/vs/workbench/contrib/markers/browser/media/markers.css
+++ b/src/vs/workbench/contrib/markers/browser/media/markers.css
@@ -26,6 +26,14 @@
 	display: none;
 }
 
+.markers-panel  .markers-panel-container .codicon.codicon-light-bulb {
+	color:  var(--vscode-editorLightBulb-foreground);
+}
+
+.markers-panel  .markers-panel-container .codicon.codicon-lightbulb-autofix {
+	color:  var(--vscode-editorLightBulbAutoFix-foreground);
+}
+
 .markers-panel .markers-panel-container .tree-container.hidden {
 	display: none;
 	visibility: hidden;
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands.ts b/src/vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands.ts
index 5074d759b06508..7c69a429a5cd07 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands.ts
@@ -13,12 +13,13 @@ import { InputFocusedContext, InputFocusedContextKey } from 'vs/platform/context
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { ResourceNotebookCellEdit } from 'vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
-import { changeCellToKind, computeCellLinesContents, copyCellRange, joinCellsWithSurrounds, moveCellRange } from 'vs/workbench/contrib/notebook/browser/controller/cellOperations';
+import { changeCellToKind, computeCellLinesContents, copyCellRange, joinCellsWithSurrounds, joinSelectedCells, moveCellRange } from 'vs/workbench/contrib/notebook/browser/controller/cellOperations';
 import { cellExecutionArgs, CellOverflowToolbarGroups, CellToolbarOrder, CELL_TITLE_CELL_GROUP_ID, INotebookCellActionContext, INotebookCellToolbarActionContext, INotebookCommandContext, NotebookCellAction, NotebookMultiCellAction, parseMultiCellExecutionArgs } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { CellFocusMode, EXPAND_CELL_INPUT_COMMAND_ID, EXPAND_CELL_OUTPUT_COMMAND_ID, ICellViewModel, INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_IS_ACTIVE_EDITOR } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
 import * as icons from 'vs/workbench/contrib/notebook/browser/notebookIcons';
 import { CellEditType, CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 //#region Move/Copy cells
 const MOVE_CELL_UP_COMMAND_ID = 'notebook.cell.moveUp';
@@ -45,7 +46,7 @@ registerAction2(class extends NotebookCellAction {
 					id: MenuId.NotebookCellTitle,
 					when: ContextKeyExpr.equals('config.notebook.dragAndDropEnabled', false),
 					group: CellOverflowToolbarGroups.Edit,
-					order: 13
+					order: 14
 				}
 			});
 	}
@@ -124,7 +125,7 @@ registerAction2(class extends NotebookCellAction {
 					id: MenuId.NotebookCellTitle,
 					when: ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE),
 					group: CellOverflowToolbarGroups.Edit,
-					order: 12
+					order: 13
 				}
 			});
 	}
@@ -140,6 +141,7 @@ registerAction2(class extends NotebookCellAction {
 //#region Join/Split
 
 const SPLIT_CELL_COMMAND_ID = 'notebook.cell.split';
+const JOIN_SELECTED_CELLS_COMMAND_ID = 'notebook.cell.joinSelected';
 const JOIN_CELL_ABOVE_COMMAND_ID = 'notebook.cell.joinAbove';
 const JOIN_CELL_BELOW_COMMAND_ID = 'notebook.cell.joinBelow';
 
@@ -251,6 +253,7 @@ registerAction2(class extends NotebookCellAction {
 	}
 });
 
+
 registerAction2(class extends NotebookCellAction {
 	constructor() {
 		super(
@@ -280,6 +283,31 @@ registerAction2(class extends NotebookCellAction {
 	}
 });
 
+registerAction2(class extends NotebookCellAction {
+	constructor() {
+		super(
+			{
+				id: JOIN_SELECTED_CELLS_COMMAND_ID,
+				title: {
+					value: localize('notebookActions.joinSelectedCells', "Join Selected Cells"),
+					original: 'Join Selected Cells'
+				},
+				menu: {
+					id: MenuId.NotebookCellTitle,
+					when: ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE),
+					group: CellOverflowToolbarGroups.Edit,
+					order: 12
+				}
+			});
+	}
+
+	async runWithContext(accessor: ServicesAccessor, context: INotebookCellActionContext) {
+		const bulkEditService = accessor.get(IBulkEditService);
+		const notificationService = accessor.get(INotificationService);
+		return joinSelectedCells(bulkEditService, notificationService, context);
+	}
+});
+
 //#endregion
 
 //#region Change Cell Type
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.ts b/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.ts
index c3fba768976a8b..eb5fd8135e6342 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.ts
@@ -247,7 +247,7 @@ class TimerCellStatusBarItem extends Disposable {
 			const startTime = this._cell.internalMetadata.runStartTime;
 			const endTime = this._cell.internalMetadata.runEndTime;
 			if (typeof startTime === 'number' && typeof endTime === 'number') {
-				item = this._getTimeItem(startTime, endTime);
+				item = this._getTimeItem(startTime, endTime, undefined, true);
 			}
 		}
 
@@ -266,12 +266,13 @@ class TimerCellStatusBarItem extends Disposable {
 		}
 	}
 
-	private _getTimeItem(startTime: number, endTime: number, adjustment: number = 0): INotebookCellStatusBarItem {
+	private _getTimeItem(startTime: number, endTime: number, adjustment: number = 0, isDone = false): INotebookCellStatusBarItem {
 		const duration = endTime - startTime + adjustment;
 		return <INotebookCellStatusBarItem>{
 			text: formatCellDuration(duration),
 			alignment: CellStatusbarAlignment.Left,
-			priority: Number.MAX_SAFE_INTEGER - 1
+			priority: Number.MAX_SAFE_INTEGER - 1,
+			tooltip: isDone ? new Date(endTime).toLocaleString() : undefined
 		};
 	}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.ts b/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.ts
index e7455c46dce8b4..c5897abc9b55a9 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.ts
@@ -25,7 +25,7 @@ import { Codicon } from 'vs/base/common/codicons';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { Action, ActionRunner, IAction, IActionRunner, Separator } from 'vs/base/common/actions';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IMenu, IMenuService } from 'vs/platform/actions/common/actions';
+import { IMenu } from 'vs/platform/actions/common/actions';
 import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
 import { AnchorAlignment, IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
 import { DropdownMenuActionViewItem } from 'vs/base/browser/ui/dropdown/dropdownActionViewItem';
@@ -281,9 +281,8 @@ export abstract class SimpleFindReplaceWidget extends Widget {
 		@IContextViewService private readonly _contextViewService: IContextViewService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IConfigurationService protected readonly _configurationService: IConfigurationService,
-		@IMenuService readonly menuService: IMenuService,
-		@IContextMenuService readonly contextMenuService: IContextMenuService,
-		@IInstantiationService readonly instantiationService: IInstantiationService,
+		@IContextMenuService private readonly contextMenuService: IContextMenuService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		protected readonly _state: FindReplaceState<NotebookFindFilters> = new FindReplaceState<NotebookFindFilters>(),
 		protected readonly _notebookEditor: INotebookEditor,
 	) {
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.ts b/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.ts
index fa489b9015a86a..b1b77426c23897 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.ts
@@ -85,7 +85,7 @@ class NotebookFindWidget extends SimpleFindReplaceWidget implements INotebookEdi
 		@IMenuService menuService: IMenuService,
 		@IInstantiationService instantiationService: IInstantiationService,
 	) {
-		super(contextViewService, contextKeyService, configurationService, menuService, contextMenuService, instantiationService, new FindReplaceState<NotebookFindFilters>(), _notebookEditor);
+		super(contextViewService, contextKeyService, configurationService, contextMenuService, instantiationService, new FindReplaceState<NotebookFindFilters>(), _notebookEditor);
 		this._findModel = new FindModel(this._notebookEditor, this._state, this._configurationService);
 
 		DOM.append(this._notebookEditor.getDomNode(), this.getDomNode());
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/kernelDetection/notebookKernelDetection.ts b/src/vs/workbench/contrib/notebook/browser/contrib/kernelDetection/notebookKernelDetection.ts
index 7d6ff757c838d6..bf0ea9a15ba55e 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/kernelDetection/notebookKernelDetection.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/kernelDetection/notebookKernelDetection.ts
@@ -24,7 +24,7 @@ class NotebookKernelDetection extends Disposable implements IWorkbenchContributi
 
 		this._registerListeners();
 		this._register(this._configurationService.onDidChangeConfiguration(e => {
-			if (e.affectedKeys.includes('notebook.kernelPicker.type')) {
+			if (e.affectsConfiguration('notebook.kernelPicker.type')) {
 				this._registerListeners();
 			}
 		}));
@@ -58,7 +58,7 @@ class NotebookKernelDetection extends Disposable implements IWorkbenchContributi
 						}
 					});
 
-					if (shouldStartDetection) {
+					if (shouldStartDetection && !this._detectionMap.has(notebookType)) {
 						const task = this._notebookKernelService.registerNotebookKernelDetectionTask({
 							notebookType: notebookType
 						});
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts b/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts
index 6a2f2676764148..89d670f0c8cc2c 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts
@@ -33,11 +33,11 @@ import { isEqual } from 'vs/base/common/resources';
 import { IdleValue } from 'vs/base/common/async';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
-import { marked } from 'vs/base/common/marked/marked';
 import { renderMarkdownAsPlaintext } from 'vs/base/browser/markdownRenderer';
 import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
 import { executingStateIcon } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
 import { URI } from 'vs/base/common/uri';
+import { getMarkdownHeadersInCell } from 'vs/workbench/contrib/notebook/browser/viewModel/foldingModel';
 
 export interface IOutlineMarkerInfo {
 	readonly count: number;
@@ -366,7 +366,7 @@ export class NotebookCellOutline implements IOutline<OutlineEntry> {
 			expandOnlyOnTwistieClick: true,
 			multipleSelectionSupport: false,
 			accessibilityProvider: new NotebookOutlineAccessibility(),
-			identityProvider: { getId: element => element.cell.id },
+			identityProvider: { getId: element => element.cell.uri.toString() },
 			keyboardNavigationLabelProvider: new NotebookNavigationLabelProvider()
 		};
 
@@ -452,12 +452,11 @@ export class NotebookCellOutline implements IOutline<OutlineEntry> {
 
 			if (isMarkdown) {
 				const fullContent = cell.getText().substring(0, 10_000);
-				for (const token of marked.lexer(fullContent, { gfm: true })) {
-					if (token.type === 'heading') {
-						hasHeader = true;
-						entries.push(new OutlineEntry(entries.length, token.depth, cell, renderMarkdownAsPlaintext({ value: token.text }).trim(), false, false));
-					}
+				for (const { depth, text } of getMarkdownHeadersInCell(fullContent)) {
+					hasHeader = true;
+					entries.push(new OutlineEntry(entries.length, depth, cell, text, false, false));
 				}
+
 				if (!hasHeader) {
 					// no markdown syntax headers, try to find html tags
 					const match = fullContent.match(/<h([1-6]).*>(.*)<\/h\1>/i);
diff --git a/src/vs/workbench/contrib/notebook/browser/controller/cellOperations.ts b/src/vs/workbench/contrib/notebook/browser/controller/cellOperations.ts
index 23d16182f30fef..bc8ea045516d85 100644
--- a/src/vs/workbench/contrib/notebook/browser/controller/cellOperations.ts
+++ b/src/vs/workbench/contrib/notebook/browser/controller/cellOperations.ts
@@ -16,6 +16,8 @@ import { CellViewModel, NotebookViewModel } from 'vs/workbench/contrib/notebook/
 import { cloneNotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
 import { CellEditType, CellKind, ICellEditOperation, ICellReplaceEdit, IOutputDto, ISelectionState, NotebookCellMetadata, SelectionStateType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { cellRangeContains, cellRangesToIndexes, ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
+import { localize } from 'vs/nls';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export async function changeCellToKind(kind: CellKind, context: INotebookActionContext, language?: string, mime?: string): Promise<void> {
 	const { notebookEditor } = context;
@@ -341,6 +343,72 @@ export async function copyCellRange(context: INotebookCellActionContext, directi
 	}
 }
 
+export async function joinSelectedCells(bulkEditService: IBulkEditService, notificationService: INotificationService, context: INotebookCellActionContext): Promise<void> {
+	const editor = context.notebookEditor;
+	if (editor.isReadOnly) {
+		return;
+	}
+
+	const edits: ResourceEdit[] = [];
+	const cells: ICellViewModel[] = [];
+	for (const selection of editor.getSelections()) {
+		cells.push(...editor.getCellsInRange(selection));
+	}
+
+	if (cells.length <= 1) {
+		return;
+	}
+
+	// check if all cells are of the same kind
+	const cellKind = cells[0].cellKind;
+	const isSameKind = cells.every(cell => cell.cellKind === cellKind);
+	if (!isSameKind) {
+		// cannot join cells of different kinds
+		// show warning and quit
+		const message = localize('notebookActions.joinSelectedCells', "Cannot join cells of different kinds");
+		return notificationService.warn(message);
+	}
+
+	// merge all cells content into first cell
+	const firstCell = cells[0];
+	const insertContent = cells.map(cell => cell.getText()).join(firstCell.textBuffer.getEOL());
+	const firstSelection = editor.getSelections()[0];
+	edits.push(
+		new ResourceNotebookCellEdit(editor.textModel.uri,
+			{
+				editType: CellEditType.Replace,
+				index: firstSelection.start,
+				count: firstSelection.end - firstSelection.start,
+				cells: [{
+					cellKind: firstCell.cellKind,
+					source: insertContent,
+					language: firstCell.language,
+					mime: firstCell.mime,
+					outputs: firstCell.model.outputs,
+					metadata: firstCell.metadata,
+				}]
+			}
+		)
+	);
+
+	for (const selection of editor.getSelections().slice(1)) {
+		edits.push(new ResourceNotebookCellEdit(editor.textModel.uri,
+			{
+				editType: CellEditType.Replace,
+				index: selection.start,
+				count: selection.end - selection.start,
+				cells: []
+			}));
+	}
+
+	if (edits.length) {
+		await bulkEditService.apply(
+			edits,
+			{ quotableLabel: localize('notebookActions.joinSelectedCells.label', "Join Notebook Cells") }
+		);
+	}
+}
+
 export async function joinNotebookCells(editor: IActiveNotebookEditor, range: ICellRange, direction: 'above' | 'below', constraint?: CellKind): Promise<{ edits: ResourceEdit[]; cell: ICellViewModel; endFocus: ICellRange; endSelections: ICellRange[] } | null> {
 	if (editor.isReadOnly) {
 		return null;
diff --git a/src/vs/workbench/contrib/notebook/browser/controller/coreActions.ts b/src/vs/workbench/contrib/notebook/browser/controller/coreActions.ts
index 58953153733b8b..e6512c30004750 100644
--- a/src/vs/workbench/contrib/notebook/browser/controller/coreActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/controller/coreActions.ts
@@ -160,7 +160,7 @@ export abstract class NotebookAction extends Action2 {
 		return !!context && !!(context as INotebookActionContext).notebookEditor;
 	}
 
-	protected getEditorContextFromArgsOrActive(accessor: ServicesAccessor, context?: any, ...additionalArgs: any[]): INotebookActionContext | undefined {
+	getEditorContextFromArgsOrActive(accessor: ServicesAccessor, context?: any, ...additionalArgs: any[]): INotebookActionContext | undefined {
 		return getContextFromActiveEditor(accessor.get(IEditorService));
 	}
 }
diff --git a/src/vs/workbench/contrib/notebook/browser/controller/editActions.ts b/src/vs/workbench/contrib/notebook/browser/controller/editActions.ts
index 12782676c3e5b3..d0cd5268444aee 100644
--- a/src/vs/workbench/contrib/notebook/browser/controller/editActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/controller/editActions.ts
@@ -224,7 +224,7 @@ registerAction2(class ClearAllCellOutputsAction extends NotebookAction {
 	constructor() {
 		super({
 			id: CLEAR_ALL_CELLS_OUTPUTS_COMMAND_ID,
-			title: localize('clearAllCellsOutputs', 'Clear Outputs of All Cells'),
+			title: localize('clearAllCellsOutputs', 'Clear All Outputs'),
 			precondition: NOTEBOOK_HAS_OUTPUTS,
 			menu: [
 				{
@@ -421,10 +421,10 @@ registerAction2(class ChangeCellLanguageAction extends NotebookCellAction<ICellR
 			...mainItems
 		];
 
-		const selection = await quickInputService.pick(picks, { placeHolder: localize('pickLanguageToConfigure', "Select Language Mode") }) as ILanguagePickInput | undefined;
+		const selection = await quickInputService.pick(picks, { placeHolder: localize('pickLanguageToConfigure', "Select Language Mode") });
 		const languageId = selection === autoDetectMode
 			? await languageDetectionService.detectLanguage(context.cell.uri)
-			: selection?.languageId;
+			: (selection as ILanguagePickInput)?.languageId;
 
 		if (languageId) {
 			await this.setLanguage(context, languageId);
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.ts b/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.ts
index 4b8b3aa7841b5a..b3026efe32850f 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.ts
@@ -125,13 +125,13 @@ class PropertyHeader extends Disposable {
 			prefix: string;
 			menuId: MenuId;
 		},
-		@IContextMenuService readonly contextMenuService: IContextMenuService,
-		@IKeybindingService readonly keybindingService: IKeybindingService,
-		@INotificationService readonly notificationService: INotificationService,
-		@IMenuService readonly menuService: IMenuService,
-		@IContextKeyService readonly contextKeyService: IContextKeyService,
-		@IThemeService readonly themeService: IThemeService,
-		@ITelemetryService readonly telemetryService: ITelemetryService,
+		@IContextMenuService private readonly contextMenuService: IContextMenuService,
+		@IKeybindingService private readonly keybindingService: IKeybindingService,
+		@INotificationService private readonly notificationService: INotificationService,
+		@IMenuService private readonly menuService: IMenuService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IThemeService private readonly themeService: IThemeService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
 	) {
 		super();
 	}
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/diffElementOutputs.ts b/src/vs/workbench/contrib/notebook/browser/diff/diffElementOutputs.ts
index 3900007aa72ee5..8a2d98b18964a5 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/diffElementOutputs.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/diffElementOutputs.ts
@@ -6,7 +6,6 @@
 import * as DOM from 'vs/base/browser/dom';
 import * as nls from 'vs/nls';
 import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { DiffElementViewModelBase, SideBySideDiffElementViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
 import { DiffSide, INotebookTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
 import { ICellOutputViewModel, IInsetRenderOutput, RenderOutputType } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
@@ -231,7 +230,6 @@ export class OutputContainer extends Disposable {
 		private _outputContainer: HTMLElement,
 		@INotebookService private _notebookService: INotebookService,
 		@IQuickInputService private readonly _quickInputService: IQuickInputService,
-		@IOpenerService readonly _openerService: IOpenerService
 	) {
 		super();
 		this._register(this._diffElementViewModel.onDidLayoutChange(() => {
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts
index 687044d88a9c0a..ba541a4d52c3fb 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts
@@ -140,10 +140,10 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 	}
 
 	constructor(
-		@IInstantiationService readonly instantiationService: IInstantiationService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IThemeService themeService: IThemeService,
-		@IContextKeyService readonly contextKeyService: IContextKeyService,
-		@INotebookEditorWorkerService readonly notebookEditorWorkerService: INotebookEditorWorkerService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@INotebookEditorWorkerService private readonly notebookEditorWorkerService: INotebookEditorWorkerService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IStorageService storageService: IStorageService,
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.ts
index fe5b564916de1b..d26d1ce86aadc9 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.ts
@@ -34,7 +34,7 @@ export class NotebookCellTextDiffListDelegate implements IListVirtualDelegate<Di
 	private readonly lineHeight: number;
 
 	constructor(
-		@IConfigurationService readonly configurationService: IConfigurationService
+		@IConfigurationService private readonly configurationService: IConfigurationService
 	) {
 		const editorOptions = this.configurationService.getValue<IEditorOptions>('editor');
 		this.lineHeight = BareFontInfo.createFromRawSettings(editorOptions, PixelRatio.value).lineHeight;
diff --git a/src/vs/workbench/contrib/notebook/browser/media/notebook.css b/src/vs/workbench/contrib/notebook/browser/media/notebook.css
index e2cb14443b5afb..5995e321e36e90 100644
--- a/src/vs/workbench/contrib/notebook/browser/media/notebook.css
+++ b/src/vs/workbench/contrib/notebook/browser/media/notebook.css
@@ -15,14 +15,26 @@
 	position: absolute;
 }
 
+.monaco-workbench .notebookOverlay .cell-list-container .monaco-list-rows {
+	min-height: 100%;
+	overflow: visible !important;
+}
+
 .monaco-workbench .notebookOverlay .cell-list-container .overflowingContentWidgets > div {
-	z-index: 600 !important;
 	/* @rebornix: larger than the editor title bar */
+	z-index: 600 !important;
 }
 
-.monaco-workbench .notebookOverlay .cell-list-container .monaco-list-rows {
-	min-height: 100%;
-	overflow: visible !important;
+.monaco-workbench .notebookOverlay .cell-list-container .overflowingContentWidgets > div.parameter-hints-widget {
+	z-index: 639 !important;
+}
+
+.monaco-workbench .notebookOverlay .cell-list-container .overflowingContentWidgets > div.suggest-widget {
+	z-index: 640 !important;
+}
+
+.monaco-workbench .notebookOverlay .cell-list-container .overflowingContentWidgets > div .suggest-details-container {
+	z-index: 641 !important;
 }
 
 .monaco-workbench .notebookOverlay .cell-list-container {
diff --git a/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts b/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts
index 12b5ab5453008e..26acc65ce19170 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts
@@ -899,7 +899,7 @@ configurationRegistry.registerConfiguration({
 		[NotebookSetting.outputLineHeight]: {
 			markdownDescription: nls.localize('notebook.outputLineHeight', "Line height of the output text for notebook cells.\n - Values between 0 and 8 will be used as a multiplier with the font size.\n - Values greater than or equal to 8 will be used as effective values."),
 			type: 'number',
-			default: 22,
+			default: 19,
 			tags: ['notebookLayout']
 		},
 		[NotebookSetting.outputFontSize]: {
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts b/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts
index fa24f33cda1b64..10afbbd95a4c8c 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts
@@ -54,12 +54,15 @@ export const KERNEL_EXTENSIONS = new Map<string, string>([
 export const KERNEL_RECOMMENDATIONS = new Map<string, Map<string, INotebookExtensionRecommendation>>();
 KERNEL_RECOMMENDATIONS.set(IPYNB_VIEW_TYPE, new Map<string, INotebookExtensionRecommendation>());
 KERNEL_RECOMMENDATIONS.get(IPYNB_VIEW_TYPE)?.set('python', {
-	extensionId: 'ms-python.python',
+	extensionIds: [
+		'ms-python.python',
+		JUPYTER_EXTENSION_ID
+	],
 	displayName: 'Python + Jupyter',
 });
 
 export interface INotebookExtensionRecommendation {
-	readonly extensionId: string;
+	readonly extensionIds: string[];
 	readonly displayName?: string;
 }
 
@@ -347,6 +350,7 @@ export interface INotebookEditorViewState {
 	editingCells: { [key: number]: boolean };
 	collapsedInputCells: { [key: number]: boolean };
 	collapsedOutputCells: { [key: number]: boolean };
+	cellLineNumberStates: { [key: number]: 'on' | 'off' };
 	editorViewStates: { [key: number]: editorCommon.ICodeEditorViewState | null };
 	hiddenFoldingRanges?: ICellRange[];
 	cellTotalHeights?: { [key: number]: number };
@@ -424,6 +428,7 @@ export interface INotebookEditor {
 	//#region readonly properties
 	readonly visibleRanges: ICellRange[];
 	readonly textModel?: NotebookTextModel;
+	readonly isVisible: boolean;
 	readonly isReadOnly: boolean;
 	readonly notebookOptions: NotebookOptions;
 	readonly isDisposed: boolean;
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
index 57b162cb2f62db..e9c2a3d65192c4 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
@@ -96,7 +96,8 @@ export function getDefaultNotebookCreationOptions(): INotebookEditorCreationOpti
 		'editor.contrib.dirtydiff',
 		'editor.contrib.testingOutputPeek',
 		'editor.contrib.testingDecorations',
-		'store.contrib.stickyScrollController'
+		'store.contrib.stickyScrollController',
+		'editor.contrib.findController'
 	];
 	const contributions = EditorExtensionsRegistry.getEditorContributions().filter(c => skipContributions.indexOf(c.id) === -1);
 
@@ -189,10 +190,13 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 	private _scrollBeyondLastLine: boolean;
 	private readonly _insetModifyQueueByOutputId = new SequencerByKey<string>();
 	private _cellContextKeyManager: CellContextKeyManager | null = null;
-	private _isVisible = false;
 	private readonly _uuid = generateUuid();
 	private _focusTracker!: DOM.IFocusTracker;
 	private _webviewFocused: boolean = false;
+	private _isVisible = false;
+	get isVisible() {
+		return this._isVisible;
+	}
 
 	private _isDisposed: boolean = false;
 
@@ -1650,6 +1654,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 		if (!state) {
 			return {
 				editingCells: {},
+				cellLineNumberStates: {},
 				editorViewStates: {},
 				collapsedInputCells: {},
 				collapsedOutputCells: {},
@@ -1661,11 +1666,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 			const cellHeights: { [key: number]: number } = {};
 			for (let i = 0; i < this.viewModel!.length; i++) {
 				const elm = this.viewModel!.cellAt(i) as CellViewModel;
-				if (elm.cellKind === CellKind.Code) {
-					cellHeights[i] = elm.layoutInfo.totalHeight;
-				} else {
-					cellHeights[i] = elm.layoutInfo.totalHeight;
-				}
+				cellHeights[i] = elm.layoutInfo.totalHeight;
 			}
 
 			state.cellTotalHeights = cellHeights;
@@ -1700,7 +1701,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 		return this._scrollBeyondLastLine && !this.isEmbedded;
 	}
 
-	layout(dimension: DOM.Dimension, shadowElement?: HTMLElement, position?: DOM.IDomPosition): void {
+	layout(dimension: DOM.Dimension, shadowElement?: HTMLElement, _position?: DOM.IDomPosition): void {
 		if (!shadowElement && this._shadowElementViewInfo === null) {
 			this._dimension = dimension;
 			return;
@@ -1712,7 +1713,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 		}
 
 		if (shadowElement) {
-			this.updateShadowElement(shadowElement, dimension, position);
+			this.updateShadowElement(shadowElement, dimension, /*position*/ undefined);
 		}
 
 		if (this._shadowElementViewInfo && this._shadowElementViewInfo.width <= 0 && this._shadowElementViewInfo.height <= 0) {
@@ -1725,7 +1726,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 		DOM.size(this._body, dimension.width, newBodyHeight);
 
 		const topInserToolbarHeight = this._notebookOptions.computeTopInsertToolbarHeight(this.viewModel?.viewType);
-		const newCellListHeight = Math.max(dimension.height - topInserToolbarHeight, 0);
+		const newCellListHeight = Math.max(newBodyHeight - topInserToolbarHeight, 0);
 		if (this._list.getRenderHeight() < newCellListHeight) {
 			// the new dimension is larger than the list viewport, update its additional height first, otherwise the list view will move down a bit (as the `scrollBottom` will move down)
 			this._list.updateOptions({ additionalScrollHeight: this._allowScrollBeyondLastLine() ? Math.max(0, (newCellListHeight - 50)) : topInserToolbarHeight });
@@ -1741,7 +1742,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 		this._overlayContainer.style.position = 'absolute';
 		this._overlayContainer.style.overflow = 'hidden';
 
-		this.layoutContainerOverShadowElement(dimension, position);
+		this.layoutContainerOverShadowElement(dimension, /*position*/ undefined);
 
 		if (this._webviewTransparentCover) {
 			this._webviewTransparentCover.style.height = `${dimension.height}px`;
@@ -2514,7 +2515,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 			return;
 		}
 
-		if (!this.viewModel) {
+		if (!this.viewModel || !this._list.viewModel) {
 			return;
 		}
 
@@ -2929,6 +2930,8 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 		this._baseCellEditorOptions.forEach(v => v.dispose());
 		this._baseCellEditorOptions.clear();
 
+		this._notebookOverviewRulerContainer.remove();
+
 		super.dispose();
 
 		// unref
diff --git a/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionServiceImpl.ts
index f7a74e4c27e324..8fc24625fc4937 100644
--- a/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionServiceImpl.ts
@@ -3,10 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
 import { IDisposable } from 'vs/base/common/lifecycle';
+import * as nls from 'vs/nls';
 import { ICommandService } from 'vs/platform/commands/common/commands';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IWorkspaceTrustRequestService } from 'vs/platform/workspace/common/workspaceTrust';
 import { SELECT_KERNEL_ID } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
@@ -15,7 +16,6 @@ import { CellKind, INotebookTextModel, NotebookCellExecutionState } from 'vs/wor
 import { INotebookExecutionService } from 'vs/workbench/contrib/notebook/common/notebookExecutionService';
 import { INotebookCellExecution, INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
 import { INotebookKernel, INotebookKernelService } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 
 export class NotebookExecutionService implements INotebookExecutionService, IDisposable {
 	declare _serviceBrand: undefined;
@@ -31,7 +31,12 @@ export class NotebookExecutionService implements INotebookExecutionService, IDis
 	}
 
 	async executeNotebookCells(notebook: INotebookTextModel, cells: Iterable<NotebookCellTextModel>, contextKeyService: IContextKeyService): Promise<void> {
-		const cellsArr = Array.from(cells);
+		const cellsArr = Array.from(cells)
+			.filter(c => c.cellKind === CellKind.Code);
+		if (!cellsArr.length) {
+			return;
+		}
+
 		this._logService.debug(`NotebookExecutionService#executeNotebookCells ${JSON.stringify(cellsArr.map(c => c.handle))}`);
 		const message = nls.localize('notebookRunTrust', "Executing a notebook cell will run code from this workspace.");
 		const trust = await this._workspaceTrustRequestService.requestWorkspaceTrust({ message });
@@ -43,14 +48,16 @@ export class NotebookExecutionService implements INotebookExecutionService, IDis
 		const cellExecutions: [NotebookCellTextModel, INotebookCellExecution][] = [];
 		for (const cell of cellsArr) {
 			const cellExe = this._notebookExecutionStateService.getCellExecution(cell.uri);
-			if (cell.cellKind !== CellKind.Code || !!cellExe) {
+			if (!!cellExe) {
 				continue;
 			}
 			cellExecutions.push([cell, this._notebookExecutionStateService.createCellExecution(notebook.uri, cell.handle)]);
 		}
 
 		let kernel = this._notebookKernelService.getSelectedOrSuggestedKernel(notebook);
-		if (!kernel) {
+		const noPendingKernelDetections = this._notebookKernelService.getKernelDetectionTasks(notebook).length === 0;
+		// do not auto run source action when there is pending kernel detections
+		if (!kernel && noPendingKernelDetections) {
 			kernel = await this.resolveSourceActions(notebook, contextKeyService);
 		}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/services/notebookKernelServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/services/notebookKernelServiceImpl.ts
index 39ec081055d1b4..eecb3b53ab6212 100644
--- a/src/vs/workbench/contrib/notebook/browser/services/notebookKernelServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/services/notebookKernelServiceImpl.ts
@@ -105,6 +105,7 @@ export class NotebookKernelService extends Disposable implements INotebookKernel
 	private readonly _onDidChangeNotebookAffinity = this._register(new Emitter<void>());
 	private readonly _onDidChangeSourceActions = this._register(new Emitter<INotebookSourceActionChangeEvent>());
 	private readonly _kernelSources = new Map<string, IKernelInfoCache>();
+	private readonly _kernelSourceActionsUpdates = new Map<string, IDisposable>();
 	private readonly _kernelDetectionTasks = new Map<string, INotebookKernelDetectionTask[]>();
 	private readonly _onDidChangeKernelDetectionTasks = this._register(new Emitter<string>());
 	private readonly _kernelSourceActionProviders = new Map<string, IKernelSourceActionProvider[]>();
@@ -122,8 +123,8 @@ export class NotebookKernelService extends Disposable implements INotebookKernel
 	constructor(
 		@INotebookService private readonly _notebookService: INotebookService,
 		@IStorageService private readonly _storageService: IStorageService,
-		@IMenuService readonly _menuService: IMenuService,
-		@IContextKeyService readonly _contextKeyService: IContextKeyService
+		@IMenuService private readonly _menuService: IMenuService,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService
 	) {
 		super();
 
@@ -131,10 +132,13 @@ export class NotebookKernelService extends Disposable implements INotebookKernel
 		// a notebook has been closed (but don't update the memento)
 		this._register(_notebookService.onDidAddNotebookDocument(this._tryAutoBindNotebook, this));
 		this._register(_notebookService.onWillRemoveNotebookDocument(notebook => {
-			const kernelId = this._notebookBindings.get(NotebookTextModelLikeId.str(notebook));
+			const id = NotebookTextModelLikeId.str(notebook);
+			const kernelId = this._notebookBindings.get(id);
 			if (kernelId) {
 				this.selectKernelForNotebook(undefined, notebook);
 			}
+			this._kernelSourceActionsUpdates.get(id)?.dispose();
+			this._kernelSourceActionsUpdates.delete(id);
 		}));
 
 		// restore from storage
@@ -152,6 +156,10 @@ export class NotebookKernelService extends Disposable implements INotebookKernel
 			v.menu.dispose();
 			v.actions.forEach(a => a[1].dispose());
 		});
+		this._kernelSourceActionsUpdates.forEach(v => {
+			v.dispose();
+		});
+		this._kernelSourceActionsUpdates.clear();
 		super.dispose();
 	}
 
@@ -318,17 +326,17 @@ export class NotebookKernelService extends Disposable implements INotebookKernel
 		const sourceMenu = this._register(this._menuService.createMenu(MenuId.NotebookKernelSource, contextKeyService));
 		const info: IKernelInfoCache = { menu: sourceMenu, actions: [] };
 
-		const loadActionsFromMenu = (menu: IMenu) => {
+		const loadActionsFromMenu = (menu: IMenu, document: INotebookTextModelLike) => {
 			const groups = menu.getActions({ shouldForwardArgs: true });
 			const sourceActions: [ISourceAction, IDisposable][] = [];
 			groups.forEach(group => {
 				const isPrimary = /^primary/.test(group[0]);
 				group[1].forEach(action => {
-					const sourceAction = new SourceAction(action, notebook, isPrimary);
+					const sourceAction = new SourceAction(action, document, isPrimary);
 					const stateChangeListener = sourceAction.onDidChangeState(() => {
 						this._onDidChangeSourceActions.fire({
-							notebook: notebook.uri,
-							viewType: notebook.viewType,
+							notebook: document.uri,
+							viewType: document.viewType,
 						});
 					});
 					sourceActions.push([sourceAction, stateChangeListener]);
@@ -336,14 +344,15 @@ export class NotebookKernelService extends Disposable implements INotebookKernel
 			});
 			info.actions = sourceActions;
 			this._kernelSources.set(id, info);
-			this._onDidChangeSourceActions.fire({ notebook: notebook.uri, viewType: notebook.viewType });
+			this._onDidChangeSourceActions.fire({ notebook: document.uri, viewType: document.viewType });
 		};
 
-		this._register(sourceMenu.onDidChange(() => {
-			loadActionsFromMenu(sourceMenu);
+		this._kernelSourceActionsUpdates.get(id)?.dispose();
+		this._kernelSourceActionsUpdates.set(id, sourceMenu.onDidChange(() => {
+			loadActionsFromMenu(sourceMenu, notebook);
 		}));
 
-		loadActionsFromMenu(sourceMenu);
+		loadActionsFromMenu(sourceMenu, notebook);
 
 		return info.actions.map(a => a[0]);
 	}
diff --git a/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts
index c6f592fceb7205..7594ac5e3ed0d8 100644
--- a/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts
@@ -534,7 +534,7 @@ export class NotebookService extends Disposable implements INotebookService {
 		updateOrder();
 
 		this._register(this._configurationService.onDidChangeConfiguration(e => {
-			if (e.affectedKeys.indexOf(NotebookSetting.displayOrder) >= 0) {
+			if (e.affectsConfiguration(NotebookSetting.displayOrder)) {
 				updateOrder();
 			}
 		}));
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellPart.ts b/src/vs/workbench/contrib/notebook/browser/view/cellPart.ts
index 47927a441dec30..ac1396b310f1ee 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellPart.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellPart.ts
@@ -35,7 +35,7 @@ export abstract class CellContentPart extends Disposable {
 		this.didRenderCell(element);
 	}
 
-	protected didRenderCell(element: ICellViewModel): void { }
+	didRenderCell(element: ICellViewModel): void { }
 
 	/**
 	 * Dispose any disposables generated from `didRenderCell`
@@ -94,7 +94,7 @@ export abstract class CellOverlayPart extends Disposable {
 		this.didRenderCell(element);
 	}
 
-	protected didRenderCell(element: ICellViewModel): void { }
+	didRenderCell(element: ICellViewModel): void { }
 
 	/**
 	 * Dispose any disposables generated from `didRenderCell`
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellComments.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellComments.ts
index adb793615e1399..f98e1f4c709dff 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellComments.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellComments.ts
@@ -5,7 +5,7 @@
 
 import { coalesce } from 'vs/base/common/arrays';
 import { DisposableStore } from 'vs/base/common/lifecycle';
-import { EditorOptions, IEditorOptions } from 'vs/editor/common/config/editorOptions';
+import { EDITOR_FONT_DEFAULTS, IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import * as languages from 'vs/editor/common/languages';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
@@ -70,7 +70,7 @@ export class CellComments extends CellContentPart {
 			commentThread,
 			null,
 			{
-				codeBlockFontFamily: EditorOptions.fontFamily.validate(this.configurationService.getValue<IEditorOptions>('editor').fontFamily)
+				codeBlockFontFamily: this.configurationService.getValue<IEditorOptions>('editor').fontFamily || EDITOR_FONT_DEFAULTS.fontFamily
 			},
 			undefined,
 			{
@@ -152,7 +152,7 @@ export class CellComments extends CellContentPart {
 		this._commentThreadWidget?.applyTheme(theme, fontInfo);
 	}
 
-	protected override didRenderCell(element: ICellViewModel): void {
+	override didRenderCell(element: ICellViewModel): void {
 		if (element.cellKind === CellKind.Code) {
 			this.currentElement = element as CodeCellViewModel;
 			this.initialize(element);
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellContextKeys.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellContextKeys.ts
index 7f4c8b9f5b4e1f..15f224725ffdfa 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellContextKeys.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellContextKeys.ts
@@ -27,7 +27,7 @@ export class CellContextKeyPart extends CellContentPart {
 		this.cellContextKeyManager = this._register(this.instantiationService.createInstance(CellContextKeyManager, notebookEditor, undefined));
 	}
 
-	protected override didRenderCell(element: ICellViewModel): void {
+	override didRenderCell(element: ICellViewModel): void {
 		this.cellContextKeyManager.updateForElement(element);
 	}
 }
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDecorations.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDecorations.ts
index 103b23716984aa..04c63a56d45f94 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDecorations.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDecorations.ts
@@ -15,7 +15,7 @@ export class CellDecorations extends CellContentPart {
 		super();
 	}
 
-	protected override didRenderCell(element: ICellViewModel): void {
+	override didRenderCell(element: ICellViewModel): void {
 		const removedClassNames: string[] = [];
 		this.rootContainer.classList.forEach(className => {
 			if (/^nb\-.*$/.test(className)) {
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDnd.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDnd.ts
index 48c051521240ba..007ed9dc801c41 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDnd.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDnd.ts
@@ -37,7 +37,7 @@ export class CellDragAndDropPart extends CellContentPart {
 		super();
 	}
 
-	protected override didRenderCell(element: ICellViewModel): void {
+	override didRenderCell(element: ICellViewModel): void {
 		this.update(element);
 	}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.ts
index 70f65487c66227..6baeb5c854e253 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.ts
@@ -5,7 +5,7 @@
 
 import { Emitter, Event } from 'vs/base/common/event';
 import { URI } from 'vs/base/common/uri';
-import { IEditorOptions, LineNumbersType } from 'vs/editor/common/config/editorOptions';
+import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { localize } from 'vs/nls';
 import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -50,15 +50,35 @@ export class CellEditorOptions extends CellContentPart {
 	}
 
 	private _computeEditorOptions() {
-		const renderLineNumbers = this.configurationService.getValue<'on' | 'off'>('notebook.lineNumbers') === 'on';
-		const lineNumbers: LineNumbersType = renderLineNumbers ? 'on' : 'off';
-
 		const value = this.base.value;
+		let cellRenderLineNumber = value.lineNumbers;
+
+		switch (this._lineNumbers) {
+			case 'inherit':
+				// inherit from the notebook setting
+				if (this.configurationService.getValue<'on' | 'off'>('notebook.lineNumbers') === 'on') {
+					if (value.lineNumbers === 'off') {
+						cellRenderLineNumber = 'on';
+					} // otherwise just use the editor setting
+				} else {
+					cellRenderLineNumber = 'off';
+				}
+				break;
+			case 'on':
+				// should turn on, ignore the editor line numbers off options
+				if (value.lineNumbers === 'off') {
+					cellRenderLineNumber = 'on';
+				} // otherwise just use the editor setting
+				break;
+			case 'off':
+				cellRenderLineNumber = 'off';
+				break;
+		}
 
-		if (value.lineNumbers !== lineNumbers) {
+		if (value.lineNumbers !== cellRenderLineNumber) {
 			return {
 				...value,
-				...{ lineNumbers }
+				...{ lineNumbers: cellRenderLineNumber }
 			};
 		} else {
 			return Object.assign({}, value);
@@ -92,14 +112,7 @@ export class CellEditorOptions extends CellContentPart {
 
 	setLineNumbers(lineNumbers: 'on' | 'off' | 'inherit'): void {
 		this._lineNumbers = lineNumbers;
-		if (this._lineNumbers === 'inherit') {
-			const renderLiNumbers = this.configurationService.getValue<'on' | 'off'>('notebook.lineNumbers') === 'on';
-			const lineNumbers: LineNumbersType = renderLiNumbers ? 'on' : 'off';
-			this._value.lineNumbers = lineNumbers;
-		} else {
-			this._value.lineNumbers = lineNumbers as LineNumbersType;
-		}
-		this._onDidChange.fire();
+		this._recomputeOptions();
 	}
 }
 
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellExecution.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellExecution.ts
index d71a10c6212094..a4cfd477654aa4 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellExecution.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellExecution.ts
@@ -41,7 +41,7 @@ export class CellExecutionPart extends CellContentPart {
 		}));
 	}
 
-	protected override didRenderCell(element: ICellViewModel): void {
+	override didRenderCell(element: ICellViewModel): void {
 		this.updateExecutionOrder(element.internalMetadata, true);
 	}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbars.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbars.ts
index a0f00a2f2177ad..26f50e3b0f8126 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbars.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbars.ts
@@ -76,7 +76,7 @@ export class BetweenCellToolbar extends CellOverlayPart {
 		return betweenCellToolbar;
 	}
 
-	protected override didRenderCell(element: ICellViewModel): void {
+	override didRenderCell(element: ICellViewModel): void {
 		const betweenCellToolbar = this._initialize();
 		betweenCellToolbar.context = <INotebookCellActionContext>{
 			ui: true,
@@ -149,10 +149,7 @@ export class CellTitleToolbarPart extends CellOverlayPart {
 		const titleMenu = this._register(this.menuService.createMenu(this.toolbarId, this.contextKeyService));
 		const deleteMenu = this._register(this.menuService.createMenu(this.deleteToolbarId, this.contextKeyService));
 		const actions = getCellToolbarActions(titleMenu);
-		const deleteActions = !this._notebookEditor.creationOptions.isReadOnly ? getCellToolbarActions(deleteMenu) : {
-			primary: [],
-			secondary: []
-		};
+		const deleteActions = getCellToolbarActions(deleteMenu);
 
 		this._model = {
 			titleMenu,
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.ts
index 8551a78b52f612..d81095cba2cca3 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.ts
@@ -26,7 +26,6 @@ import { CellOutputContainer } from 'vs/workbench/contrib/notebook/browser/view/
 import { CollapsedCodeCellExecutionIcon } from 'vs/workbench/contrib/notebook/browser/view/cellParts/codeCellExecutionIcon';
 import { CodeCellRenderTemplate } from 'vs/workbench/contrib/notebook/browser/view/notebookRenderingCommon';
 import { CodeCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
-import { INotebookCellStatusBarService } from 'vs/workbench/contrib/notebook/common/notebookCellStatusBarService';
 import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
 
 export class CodeCell extends Disposable {
@@ -44,10 +43,9 @@ export class CodeCell extends Disposable {
 		private readonly viewCell: CodeCellViewModel,
 		private readonly templateData: CodeCellRenderTemplate,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@INotebookCellStatusBarService readonly notebookCellStatusBarService: INotebookCellStatusBarService,
-		@IKeybindingService readonly keybindingService: IKeybindingService,
-		@IOpenerService readonly openerService: IOpenerService,
-		@ILanguageService readonly languageService: ILanguageService,
+		@IKeybindingService private readonly keybindingService: IKeybindingService,
+		@IOpenerService openerService: IOpenerService,
+		@ILanguageService private readonly languageService: ILanguageService,
 		@IConfigurationService private configurationService: IConfigurationService,
 		@INotebookExecutionStateService notebookExecutionStateService: INotebookExecutionStateService
 	) {
@@ -133,9 +131,9 @@ export class CodeCell extends Disposable {
 		this._register(Event.runAndSubscribe(viewCell.onDidChangeOutputs, this.updateForOutputs.bind(this)));
 		this._register(Event.runAndSubscribe(viewCell.onDidChangeLayout, this.updateForLayout.bind(this)));
 
+		cellEditorOptions.setLineNumbers(this.viewCell.lineNumbers);
 		this._register(cellEditorOptions.onDidChange(() => templateData.editor.updateOptions(cellEditorOptions.getUpdatedValue(this.viewCell.internalMetadata, this.viewCell.uri))));
 		templateData.editor.updateOptions(cellEditorOptions.getUpdatedValue(this.viewCell.internalMetadata, this.viewCell.uri));
-		cellEditorOptions.setLineNumbers(this.viewCell.lineNumbers);
 	}
 
 	private _pendingLayout: IDisposable | undefined;
@@ -375,7 +373,7 @@ export class CodeCell extends Disposable {
 		const expandIcon = DOM.$('span.expandInputIcon');
 		const keybinding = this.keybindingService.lookupKeybinding(EXPAND_CELL_INPUT_COMMAND_ID);
 		if (keybinding) {
-			element.title = localize('cellExpandInputButtonLabelWithDoubleClick', "Double click to expand cell input ({0})", keybinding.getLabel());
+			element.title = localize('cellExpandInputButtonLabelWithDoubleClick', "Double-click to expand cell input ({0})", keybinding.getLabel());
 			expandIcon.title = localize('cellExpandInputButtonLabel', "Expand Cell Input ({0})", keybinding.getLabel());
 		}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellRunToolbar.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellRunToolbar.ts
index 176621ea0c01a3..d4cb4a119a5236 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellRunToolbar.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellRunToolbar.ts
@@ -34,10 +34,10 @@ export class RunToolbar extends CellContentPart {
 		readonly contextKeyService: IContextKeyService,
 		readonly cellContainer: HTMLElement,
 		readonly runButtonContainer: HTMLElement,
-		@IMenuService readonly menuService: IMenuService,
-		@IKeybindingService readonly keybindingService: IKeybindingService,
-		@IContextMenuService readonly contextMenuService: IContextMenuService,
-		@IInstantiationService readonly instantiationService: IInstantiationService,
+		@IMenuService menuService: IMenuService,
+		@IKeybindingService private readonly keybindingService: IKeybindingService,
+		@IContextMenuService private readonly contextMenuService: IContextMenuService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
 	) {
 		super();
 
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/collapsedCellOutput.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/collapsedCellOutput.ts
index 96cda1a0fcb99c..f14f9750842f93 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/collapsedCellOutput.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/collapsedCellOutput.ts
@@ -27,7 +27,7 @@ export class CollapsedCellOutput extends CellContentPart {
 
 		const keybinding = keybindingService.lookupKeybinding(EXPAND_CELL_OUTPUT_COMMAND_ID);
 		if (keybinding) {
-			placeholder.title = localize('cellExpandOutputButtonLabelWithDoubleClick', "Double click to expand cell output ({0})", keybinding.getLabel());
+			placeholder.title = localize('cellExpandOutputButtonLabelWithDoubleClick', "Double-click to expand cell output ({0})", keybinding.getLabel());
 			cellOutputCollapseContainer.title = localize('cellExpandOutputButtonLabel', "Expand Cell Output (${0})", keybinding.getLabel());
 		}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/markupCell.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/markupCell.ts
index 368f20a9320a83..112dd56ed1a6e0 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/markupCell.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/markupCell.ts
@@ -28,7 +28,6 @@ import { collapsedIcon, expandedIcon } from 'vs/workbench/contrib/notebook/brows
 import { CellEditorOptions } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions';
 import { MarkdownCellRenderTemplate } from 'vs/workbench/contrib/notebook/browser/view/notebookRenderingCommon';
 import { MarkupCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel';
-import { INotebookCellStatusBarService } from 'vs/workbench/contrib/notebook/common/notebookCellStatusBarService';
 
 export class MarkupCell extends Disposable {
 
@@ -51,7 +50,6 @@ export class MarkupCell extends Disposable {
 		private readonly renderedEditors: Map<ICellViewModel, ICodeEditor | undefined>,
 		@IAccessibilityService private readonly accessibilityService: IAccessibilityService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@INotebookCellStatusBarService readonly notebookCellStatusBarService: INotebookCellStatusBarService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@ILanguageService private readonly languageService: ILanguageService,
 		@IConfigurationService private configurationService: IConfigurationService,
@@ -269,7 +267,7 @@ export class MarkupCell extends Disposable {
 		expandIcon.classList.add(...CSSIcon.asClassNameArray(Codicon.more));
 		const keybinding = this.keybindingService.lookupKeybinding(EXPAND_CELL_INPUT_COMMAND_ID);
 		if (keybinding) {
-			element.title = localize('cellExpandInputButtonLabelWithDoubleClick', "Double click to expand cell input ({0})", keybinding.getLabel());
+			element.title = localize('cellExpandInputButtonLabelWithDoubleClick', "Double-click to expand cell input ({0})", keybinding.getLabel());
 			expandIcon.title = localize('cellExpandInputButtonLabel', "Expand Cell Input ({0})", keybinding.getLabel());
 		}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts
index 52e2d7883108cb..19903b2a0da5b4 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as osPath from 'vs/base/common/path';
 import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
 import { coalesce } from 'vs/base/common/arrays';
 import { DeferredPromise } from 'vs/base/common/async';
@@ -12,7 +13,7 @@ import { getExtensionForMimeType } from 'vs/base/common/mime';
 import { FileAccess, Schemas } from 'vs/base/common/network';
 import { equals } from 'vs/base/common/objects';
 import { isMacintosh, isWeb } from 'vs/base/common/platform';
-import { dirname, joinPath } from 'vs/base/common/resources';
+import { dirname, isEqual, joinPath } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
 import * as UUID from 'vs/base/common/uuid';
 import { TokenizationRegistry } from 'vs/editor/common/languages';
@@ -45,10 +46,17 @@ import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookS
 import { IWebviewElement, IWebviewService, WebviewContentPurpose, WebviewOriginStore } from 'vs/workbench/contrib/webview/browser/webview';
 import { WebviewWindowDragMonitor } from 'vs/workbench/contrib/webview/browser/webviewWindowDragMonitor';
 import { asWebviewUri, webviewGenericCspSource } from 'vs/workbench/contrib/webview/common/webview';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { registerLogChannel } from 'vs/workbench/services/output/common/output';
 import { FromWebviewMessage, IAckOutputHeight, IClickedDataUrlMessage, ICodeBlockHighlightRequest, IContentWidgetTopRequest, IControllerPreload, ICreationContent, ICreationRequestMessage, IFindMatch, IMarkupCellInitialization, RendererMetadata, StaticPreloadMetadata, ToWebviewMessage } from './webviewMessages';
+import { IPathService } from 'vs/workbench/services/path/common/pathService';
+import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
+import { EditorInput } from 'vs/workbench/common/editor/editorInput';
+
+const LINE_COLUMN_REGEX = /:([\d]+)(?::([\d]+))?$/;
+const LineQueryRegex = /line=(\d+)/;
+
 
 export interface ICachedInset<K extends ICommonCellInfo> {
 	outputId: string;
@@ -143,8 +151,8 @@ export class BackLayerWebView<T extends ICommonCellInfo> extends Themable {
 		public readonly documentUri: URI,
 		private options: BacklayerWebviewOptions,
 		private readonly rendererMessaging: IScopedRendererMessaging | undefined,
-		@IWebviewService readonly webviewService: IWebviewService,
-		@IOpenerService readonly openerService: IOpenerService,
+		@IWebviewService private readonly webviewService: IWebviewService,
+		@IOpenerService private readonly openerService: IOpenerService,
 		@INotebookService private readonly notebookService: INotebookService,
 		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
 		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
@@ -158,6 +166,7 @@ export class BackLayerWebView<T extends ICommonCellInfo> extends Themable {
 		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
 		@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
 		@IStorageService private readonly storageService: IStorageService,
+		@IPathService private readonly pathService: IPathService,
 		@ILoggerService loggerService: ILoggerService,
 		@ILogService logService: ILogService,
 		@IThemeService themeService: IThemeService,
@@ -215,7 +224,7 @@ export class BackLayerWebView<T extends ICommonCellInfo> extends Themable {
 	}
 
 	private _logRendererDebugMessage(msg: string) {
-		this._renderLogger.debug(`${this.id} - ${msg}`);
+		this._renderLogger.debug(`${this.documentUri} (${this.id}) - ${msg}`);
 	}
 
 	private _updateStyles() {
@@ -249,7 +258,7 @@ export class BackLayerWebView<T extends ICommonCellInfo> extends Themable {
 			'notebook-cell-output-line-height': `${this.options.outputLineHeight}px`,
 			'notebook-cell-output-max-height': `${this.options.outputLineHeight * this.options.outputLineLimit}px`,
 			'notebook-cell-output-font-family': this.options.outputFontFamily || this.options.fontFamily,
-			'notebook-cell-markup-empty-content': nls.localize('notebook.emptyMarkdownPlaceholder', "Empty markdown cell, double click or press enter to edit."),
+			'notebook-cell-markup-empty-content': nls.localize('notebook.emptyMarkdownPlaceholder', "Empty markdown cell, double-click or press enter to edit."),
 			'notebook-cell-renderer-not-found-error': nls.localize({
 				key: 'notebook.error.rendererNotFound',
 				comment: ['$0 is a placeholder for the mime type']
@@ -740,39 +749,13 @@ var requirejs = (function() {
 						return;
 					}
 
-					let linkToOpen: URI | string | undefined;
 					if (matchesSomeScheme(data.href, Schemas.http, Schemas.https, Schemas.mailto, Schemas.vscodeNotebookCell, Schemas.vscodeNotebook)) {
-						linkToOpen = data.href;
+						this.openerService.open(data.href, { fromUserGesture: true, fromWorkspace: true });
 					} else if (!/^[\w\-]+:/.test(data.href)) {
-						const fragmentStartIndex = data.href.lastIndexOf('#');
-						const path = decodeURI(fragmentStartIndex >= 0 ? data.href.slice(0, fragmentStartIndex) : data.href);
-						if (this.documentUri.scheme === Schemas.untitled) {
-							const folders = this.workspaceContextService.getWorkspace().folders;
-							if (!folders.length) {
-								return;
-							}
-							linkToOpen = URI.joinPath(folders[0].uri, path);
-						} else {
-							if (data.href.startsWith('/')) {
-								// Resolve relative to workspace
-								let folder = this.workspaceContextService.getWorkspaceFolder(this.documentUri);
-								if (!folder) {
-									const folders = this.workspaceContextService.getWorkspace().folders;
-									if (!folders.length) {
-										return;
-									}
-									folder = folders[0];
-								}
-								linkToOpen = URI.joinPath(folder.uri, path);
-							} else {
-								// Resolve relative to notebook document
-								linkToOpen = URI.joinPath(dirname(this.documentUri), path);
-							}
-						}
-					}
-
-					if (linkToOpen) {
-						this.openerService.open(linkToOpen, { fromUserGesture: true, fromWorkspace: true });
+						this._handleResourceOpening(data.href);
+					} else {
+						// uri with scheme
+						this._openUri(URI.parse(data.href));
 					}
 					break;
 				}
@@ -894,6 +877,79 @@ var requirejs = (function() {
 		}));
 	}
 
+	private _handleResourceOpening(href: string) {
+		let linkToOpen: URI | undefined = undefined;
+		if (href.startsWith('/')) {
+			linkToOpen = URI.parse(href);
+		} else if (href.startsWith('~')) {
+			const userHome = this.pathService.resolvedUserHome;
+			if (userHome) {
+				linkToOpen = URI.parse(osPath.join(userHome.fsPath, href.substring(1)));
+			}
+		} else {
+			if (this.documentUri.scheme === Schemas.untitled) {
+				const folders = this.workspaceContextService.getWorkspace().folders;
+				if (!folders.length) {
+					return;
+				}
+				linkToOpen = URI.joinPath(folders[0].uri, href);
+			} else {
+				// Resolve relative to notebook document
+				linkToOpen = URI.joinPath(dirname(this.documentUri), href);
+			}
+		}
+
+		if (linkToOpen) {
+			this._openUri(linkToOpen);
+		}
+	}
+
+	private _openUri(uri: URI) {
+		let lineNumber: number | undefined = undefined;
+		let column: number | undefined = undefined;
+		const lineCol = LINE_COLUMN_REGEX.exec(uri.path);
+		if (lineCol) {
+			uri = uri.with({
+				path: uri.path.slice(0, lineCol.index),
+				fragment: `L${lineCol[0].slice(1)}`
+			});
+			lineNumber = parseInt(lineCol[1], 10);
+			column = parseInt(lineCol[2], 10);
+		}
+
+		//#region error renderer migration, remove once done
+		const lineMatch = LineQueryRegex.exec(uri.query);
+		if (lineMatch) {
+			const parsedLineNumber = parseInt(lineMatch[1], 10);
+			if (!isNaN(parsedLineNumber)) {
+				lineNumber = parsedLineNumber + 1;
+				column = 1;
+				uri = uri.with({ fragment: `L${lineNumber}` });
+			}
+		}
+
+		uri = uri.with({
+			query: null
+		});
+		//#endregion
+
+		let match: { group: IEditorGroup; editor: EditorInput } | undefined = undefined;
+
+		for (const group of this.editorGroupService.groups) {
+			const editorInput = group.editors.find(editor => editor.resource && isEqual(editor.resource, uri, true));
+			if (editorInput) {
+				match = { group, editor: editorInput };
+				break;
+			}
+		}
+
+		if (match) {
+			match.group.openEditor(match.editor, lineNumber !== undefined && column !== undefined ? <ITextEditorOptions>{ selection: { startLineNumber: lineNumber, startColumn: column } } : undefined);
+		} else {
+			this.openerService.open(uri, { fromUserGesture: true, fromWorkspace: true });
+		}
+	}
+
 	private _handleHighlightCodeBlock(codeBlocks: ReadonlyArray<ICodeBlockHighlightRequest>) {
 		for (const { id, value, lang } of codeBlocks) {
 			// The language id may be a language aliases (e.g.js instead of javascript)
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
index 3958ddab7efe13..6b92ec4521c804 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
@@ -1641,7 +1641,7 @@ async function webviewPreloads(ctx: PreloadContext) {
 
 				const error = document.createElement('div');
 				error.className = 'no-renderer-error';
-				const errorText = (document.documentElement.style.getPropertyValue('--notebook-cell-renderer-not-found-error') || '').replace('$0', info.mime);
+				const errorText = (document.documentElement.style.getPropertyValue('--notebook-cell-renderer-not-found-error') || '').replace('$0', () => info.mime);
 				error.innerText = errorText;
 
 				const cellText = document.createElement('div');
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/cellEditorOptions.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/cellEditorOptions.ts
index e03d9004df9a2c..faff111ba530e1 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewModel/cellEditorOptions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewModel/cellEditorOptions.ts
@@ -24,7 +24,6 @@ export class BaseCellEditorOptions extends Disposable implements IBaseCellEditor
 		},
 		renderLineHighlightOnlyWhenFocus: true,
 		overviewRulerLanes: 0,
-		lineNumbers: 'off',
 		lineDecorationsWidth: 0,
 		folding: true,
 		fixedOverflowWidgets: true,
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/foldingModel.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/foldingModel.ts
index 1c769a63697fa6..e77934ef939554 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewModel/foldingModel.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewModel/foldingModel.ts
@@ -3,8 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { renderMarkdownAsPlaintext } from 'vs/base/browser/markdownRenderer';
 import { Emitter, Event } from 'vs/base/common/event';
 import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
+import { marked } from 'vs/base/common/marked/marked';
 import { TrackedRangeStickiness } from 'vs/editor/common/model';
 import { FoldingLimitReporter } from 'vs/editor/contrib/folding/browser/folding';
 import { FoldingRegion, FoldingRegions } from 'vs/editor/contrib/folding/browser/foldingRanges';
@@ -164,28 +166,18 @@ export class FoldingModel implements IDisposable {
 		for (let i = 0; i < cells.length; i++) {
 			const cell = cells[i];
 
-			if (cell.cellKind === CellKind.Code) {
+			if (cell.cellKind !== CellKind.Markup || cell.language !== 'markdown') {
 				continue;
 			}
 
-			const content = cell.getText();
-
-			const matches = content.match(/^[ \t]*(\#+) /gm);
-
-			let min = 7;
-			if (matches && matches.length) {
-				for (let j = 0; j < matches.length; j++) {
-					min = Math.min(min, matches[j].length);
-				}
-			}
-
-			if (min < 7) {
+			const minDepth = Math.min(7, ...Array.from(getMarkdownHeadersInCell(cell.getText()), header => header.depth));
+			if (minDepth < 7) {
 				// header 1 to 6
-				stack.push({ index: i, level: min, endIndex: 0 });
+				stack.push({ index: i, level: minDepth, endIndex: 0 });
 			}
 		}
 
-		// calcualte folding ranges
+		// calculate folding ranges
 		const rawFoldingRanges: IFoldingRangeData[] = stack.map((entry, startIndex) => {
 			let end: number | undefined = undefined;
 			for (let i = startIndex + 1; i < stack.length; ++i) {
@@ -319,3 +311,14 @@ export function updateFoldingStateAtIndex(foldingModel: FoldingModel, index: num
 	const range = foldingModel.regions.findRange(index + 1);
 	foldingModel.setCollapsed(range, collapsed);
 }
+
+export function* getMarkdownHeadersInCell(cellContent: string): Iterable<{ readonly depth: number; readonly text: string }> {
+	for (const token of marked.lexer(cellContent, { gfm: true })) {
+		if (token.type === 'heading') {
+			yield {
+				depth: token.depth,
+				text: renderMarkdownAsPlaintext({ value: token.text }).trim()
+			};
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl.ts
index 4337c50d40b8ed..9308ddf9cf0c86 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl.ts
@@ -765,6 +765,7 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD
 		const editingCells: { [key: number]: boolean } = {};
 		const collapsedInputCells: { [key: number]: boolean } = {};
 		const collapsedOutputCells: { [key: number]: boolean } = {};
+		const cellLineNumberStates: { [key: number]: 'on' | 'off' } = {};
 
 		this._viewCells.forEach((cell, i) => {
 			if (cell.getEditState() === CellEditState.Editing) {
@@ -778,6 +779,10 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD
 			if (cell instanceof CodeCellViewModel && cell.isOutputCollapsed) {
 				collapsedOutputCells[i] = true;
 			}
+
+			if (cell.lineNumbers !== 'inherit') {
+				cellLineNumberStates[i] = cell.lineNumbers;
+			}
 		});
 		const editorViewStates: { [key: number]: editorCommon.ICodeEditorViewState } = {};
 		this._viewCells.map(cell => ({ handle: cell.model.handle, state: cell.saveEditorViewState() })).forEach((viewState, i) => {
@@ -789,6 +794,7 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD
 		return {
 			editingCells,
 			editorViewStates,
+			cellLineNumberStates,
 			collapsedInputCells,
 			collapsedOutputCells
 		};
@@ -812,6 +818,9 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD
 			if (viewState.collapsedOutputCells && viewState.collapsedOutputCells[index] && cell instanceof CodeCellViewModel) {
 				cell.isOutputCollapsed = true;
 			}
+			if (viewState.cellLineNumberStates && viewState.cellLineNumberStates[index]) {
+				cell.lineNumbers = viewState.cellLineNumberStates[index];
+			}
 		});
 	}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts
index 03a852530a20fe..4fcf7a01d0a52a 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts
@@ -8,7 +8,7 @@ import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableEle
 import { ToggleMenuAction, ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
 import { IAction, Separator } from 'vs/base/common/actions';
 import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
+import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import { MenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
 import { IMenu, IMenuService, MenuItemAction, SubmenuItemAction } from 'vs/platform/actions/common/actions';
@@ -26,6 +26,8 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
 import { IWorkbenchAssignmentService } from 'vs/workbench/services/assignment/common/assignmentService';
 import { NotebookOptions } from 'vs/workbench/contrib/notebook/common/notebookOptions';
 import { IActionViewItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
+import { disposableTimeout } from 'vs/base/common/async';
+import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
 
 interface IActionModel {
 	action: IAction;
@@ -59,18 +61,13 @@ class FixedLabelStrategy implements IActionLayoutStrategy {
 
 	}
 
-	actionProvider(action: IAction) {
+	actionProvider(action: IAction): ActionViewItem | undefined {
 		if (action.id === SELECT_KERNEL_ID) {
 			// 	// this is being disposed by the consumer
 			return this.instantiationService.createInstance(NotebooKernelActionViewItem, action, this.notebookEditor);
 		}
 
-		const a = this.editorToolbar.primaryActions.find(a => a.action.id === action.id);
-		if (a && a.renderLabel) {
-			return action instanceof MenuItemAction ? this.instantiationService.createInstance(ActionViewWithLabel, action, undefined) : undefined;
-		} else {
-			return action instanceof MenuItemAction ? this.instantiationService.createInstance(MenuEntryActionViewItem, action, undefined) : undefined;
-		}
+		return action instanceof MenuItemAction ? this.instantiationService.createInstance(ActionViewWithLabel, action, undefined) : undefined;
 	}
 
 	protected _calculateFixedActions(leftToolbarContainerMaxWidth: number) {
@@ -141,7 +138,8 @@ class DynamicLabelStrategy implements IActionLayoutStrategy {
 		}
 
 		const a = this.editorToolbar.primaryActions.find(a => a.action.id === action.id);
-		if (a && a.renderLabel) {
+		if (!a || a.renderLabel) {
+			// render new action with label to get a correct full width.
 			return action instanceof MenuItemAction ? this.instantiationService.createInstance(ActionViewWithLabel, action, undefined) : undefined;
 		} else {
 			return action instanceof MenuItemAction ? this.instantiationService.createInstance(MenuEntryActionViewItem, action, undefined) : undefined;
@@ -285,15 +283,17 @@ export class NotebookEditorToolbar extends Disposable {
 
 	private _dimension: DOM.Dimension | null = null;
 
+	private _deferredActionUpdate: IDisposable | undefined;
+
 	constructor(
 		readonly notebookEditor: INotebookEditorDelegate,
 		readonly contextKeyService: IContextKeyService,
 		readonly notebookOptions: NotebookOptions,
 		readonly domNode: HTMLElement,
-		@IInstantiationService readonly instantiationService: IInstantiationService,
-		@IConfigurationService readonly configurationService: IConfigurationService,
-		@IContextMenuService readonly contextMenuService: IContextMenuService,
-		@IMenuService readonly menuService: IMenuService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IContextMenuService private readonly contextMenuService: IContextMenuService,
+		@IMenuService private readonly menuService: IMenuService,
 		@IEditorService private readonly editorService: IEditorService,
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
 		@IWorkbenchAssignmentService private readonly experimentService: IWorkbenchAssignmentService
@@ -401,7 +401,9 @@ export class NotebookEditorToolbar extends Disposable {
 				return;
 			}
 
-			this._showNotebookActionsinEditorToolbar();
+			if (this.notebookEditor.isVisible) {
+				this._showNotebookActionsinEditorToolbar();
+			}
 		}));
 
 		this._register(this._notebookLeftToolbar.onDidChangeDropdownVisibility(visible => {
@@ -431,7 +433,9 @@ export class NotebookEditorToolbar extends Disposable {
 				this._notebookLeftToolbar.dispose();
 				this._notebookLeftToolbar = new ToolBar(this._notebookTopLeftToolbarContainer, this.contextMenuService, {
 					getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id),
-					actionViewItemProvider: actionProvider,
+					actionViewItemProvider: (action) => {
+						return this._strategy.actionProvider(action);
+					},
 					renderDropdownAsChildElement: true
 				});
 				this._register(this._notebookLeftToolbar);
@@ -486,19 +490,29 @@ export class NotebookEditorToolbar extends Disposable {
 	private _showNotebookActionsinEditorToolbar() {
 		// when there is no view model, just ignore.
 		if (!this.notebookEditor.hasModel()) {
+			this._deferredActionUpdate?.dispose();
+			this._deferredActionUpdate = undefined;
+			return;
+		}
+
+		if (this._deferredActionUpdate) {
 			return;
 		}
 
 		if (!this._useGlobalToolbar) {
 			this.domNode.style.display = 'none';
+			this._deferredActionUpdate = undefined;
+			this._onDidChangeState.fire();
 		} else {
-			this._setNotebookActions();
+			this._deferredActionUpdate = disposableTimeout(async () => {
+				await this._setNotebookActions();
+				this._deferredActionUpdate = undefined;
+				this._onDidChangeState.fire();
+			}, 50);
 		}
-
-		this._onDidChangeState.fire();
 	}
 
-	private _setNotebookActions() {
+	private async _setNotebookActions() {
 		const groups = this._notebookGlobalActionsMenu.getActions({ shouldForwardArgs: true, renderShortTitle: true });
 		this.domNode.style.display = 'flex';
 		const primaryLeftGroups = groups.filter(group => /^navigation/.test(group[0]));
@@ -560,10 +574,10 @@ export class NotebookEditorToolbar extends Disposable {
 	private _canBeVisible(width: number) {
 		let w = 0;
 		for (let i = 0; i < this._primaryActions.length; i++) {
-			w += this._primaryActions[i].size + 8;
+			w += this._primaryActions[i].size + ACTION_PADDING;
 		}
 
-		return w <= width;
+		return w - ACTION_PADDING <= width;
 	}
 
 	private _computeSizes() {
@@ -614,6 +628,8 @@ export class NotebookEditorToolbar extends Disposable {
 		this._notebookRightToolbar.dispose();
 		this._notebookLeftToolbar = null!;
 		this._notebookRightToolbar = null!;
+		this._deferredActionUpdate?.dispose();
+		this._deferredActionUpdate = undefined;
 
 		super.dispose();
 	}
diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.ts
index 338146fa40c7f7..49236a94c495d0 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.ts
@@ -25,7 +25,7 @@ import { ProgressLocation } from 'vs/platform/progress/common/progress';
 import { IQuickInputService, IQuickPick, IQuickPickItem, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
 import { ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { ViewContainerLocation } from 'vs/workbench/common/views';
-import { IExtensionsViewPaneContainer, IExtensionsWorkbenchService, VIEWLET_ID as EXTENSION_VIEWLET_ID } from 'vs/workbench/contrib/extensions/common/extensions';
+import { IExtension, IExtensionsViewPaneContainer, IExtensionsWorkbenchService, VIEWLET_ID as EXTENSION_VIEWLET_ID } from 'vs/workbench/contrib/extensions/common/extensions';
 import { IActiveNotebookEditor, INotebookExtensionRecommendation, JUPYTER_EXTENSION_ID, KERNEL_RECOMMENDATIONS } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NotebookEditorWidget } from 'vs/workbench/contrib/notebook/browser/notebookEditorWidget';
 import { executingStateIcon, selectKernelIcon } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
@@ -46,10 +46,15 @@ type SourcePick = IQuickPickItem & { action: ISourceAction };
 function isSourcePick(item: QuickPickInput<IQuickPickItem>): item is SourcePick {
 	return 'action' in item;
 }
-type InstallExtensionPick = IQuickPickItem & { extensionId: string };
+type InstallExtensionPick = IQuickPickItem & { extensionIds: string[] };
 function isInstallExtensionPick(item: QuickPickInput<IQuickPickItem>): item is InstallExtensionPick {
-	return item.id === 'installSuggested' && 'extensionId' in item;
+	return item.id === 'installSuggested' && 'extensionIds' in item;
 }
+type SearchMarketplacePick = IQuickPickItem & { id: 'install' };
+function isSearchMarketplacePick(item: QuickPickInput<IQuickPickItem>): item is SearchMarketplacePick {
+	return item.id === 'install';
+}
+
 type KernelSourceQuickPickItem = IQuickPickItem & { command: Command };
 function isKernelSourceQuickPickItem(item: IQuickPickItem): item is KernelSourceQuickPickItem {
 	return 'command' in item;
@@ -58,7 +63,7 @@ function isKernelSourceQuickPickItem(item: IQuickPickItem): item is KernelSource
 function supportAutoRun(item: QuickPickInput<IQuickPickItem>): item is IQuickPickItem {
 	return 'autoRun' in item && !!item.autoRun;
 }
-type KernelQuickPickItem = (IQuickPickItem & { autoRun?: boolean }) | InstallExtensionPick | KernelPick | GroupedKernelsPick | SourcePick | KernelSourceQuickPickItem;
+type KernelQuickPickItem = (IQuickPickItem & { autoRun?: boolean }) | SearchMarketplacePick | InstallExtensionPick | KernelPick | GroupedKernelsPick | SourcePick | KernelSourceQuickPickItem;
 const KERNEL_PICKER_UPDATE_DEBOUNCE = 200;
 
 export type KernelQuickPickContext =
@@ -103,7 +108,7 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 		protected readonly _commandService: ICommandService
 	) { }
 
-	async showQuickPick(editor: IActiveNotebookEditor, wantedId?: string): Promise<boolean> {
+	async showQuickPick(editor: IActiveNotebookEditor, wantedId?: string, skipAutoRun?: boolean): Promise<boolean> {
 		const notebook = editor.textModel;
 		const scopedContextKeyService = editor.scopedContextKeyService;
 		const matchResult = this._getMatchingResult(notebook);
@@ -131,8 +136,8 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 		const quickPick = this._quickInputService.createQuickPick<KernelQuickPickItem>();
 		const quickPickItems = this._getKernelPickerQuickPickItems(notebook, matchResult, this._notebookKernelService, scopedContextKeyService);
 
-		if (quickPickItems.length === 1 && supportAutoRun(quickPickItems[0])) {
-			return await this._handleQuickPick(editor, quickPickItems[0]);
+		if (quickPickItems.length === 1 && supportAutoRun(quickPickItems[0]) && !skipAutoRun) {
+			return await this._handleQuickPick(editor, quickPickItems[0], quickPickItems as KernelQuickPickItem[]);
 		}
 
 		quickPick.items = quickPickItems;
@@ -192,13 +197,13 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 			quickPick.activeItems = activeItems;
 		}, this);
 
-		const pick = await new Promise<KernelQuickPickItem | undefined>((resolve, reject) => {
+		const pick = await new Promise<{ selected: KernelQuickPickItem | undefined; items: KernelQuickPickItem[] }>((resolve, reject) => {
 			quickPick.onDidAccept(() => {
 				const item = quickPick.selectedItems[0];
 				if (item) {
-					resolve(item);
+					resolve({ selected: item, items: quickPick.items as KernelQuickPickItem[] });
 				} else {
-					resolve(undefined);
+					resolve({ selected: undefined, items: quickPick.items as KernelQuickPickItem[] });
 				}
 
 				quickPick.hide();
@@ -208,13 +213,13 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 				kernelDetectionTaskListener.dispose();
 				kernelChangeEventListener.dispose();
 				quickPick.dispose();
-				resolve(undefined);
+				resolve({ selected: undefined, items: quickPick.items as KernelQuickPickItem[] });
 			});
 			quickPick.show();
 		});
 
-		if (pick) {
-			return await this._handleQuickPick(editor, pick);
+		if (pick.selected) {
+			return await this._handleQuickPick(editor, pick.selected, pick.items);
 		}
 
 		return false;
@@ -231,7 +236,7 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 		scopedContextKeyService: IContextKeyService
 	): QuickPickInput<KernelQuickPickItem>[];
 
-	protected async _handleQuickPick(editor: IActiveNotebookEditor, pick: KernelQuickPickItem) {
+	protected async _handleQuickPick(editor: IActiveNotebookEditor, pick: KernelQuickPickItem, quickPickItems: KernelQuickPickItem[]): Promise<boolean> {
 		if (isKernelPick(pick)) {
 			const newKernel = pick.kernel;
 			this._selecteKernel(editor.textModel, newKernel);
@@ -239,12 +244,13 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 		}
 
 		// actions
-		if (pick.id === 'install') {
+		if (isSearchMarketplacePick(pick)) {
 			await this._showKernelExtension(
 				this._paneCompositePartService,
 				this._extensionWorkbenchService,
 				this._extensionService,
-				editor.textModel.viewType
+				editor.textModel.viewType,
+				[]
 			);
 			// suggestedExtension must be defined for this option to be shown, but still check to make TS happy
 		} else if (isInstallExtensionPick(pick)) {
@@ -253,7 +259,7 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 				this._extensionWorkbenchService,
 				this._extensionService,
 				editor.textModel.viewType,
-				pick.extensionId,
+				pick.extensionIds,
 				this._productService.quality !== 'stable'
 			);
 		} else if (isSourcePick(pick)) {
@@ -268,20 +274,27 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 		this._notebookKernelService.selectKernelForNotebook(kernel, notebook);
 	}
 
-	private async _showKernelExtension(
+	protected async _showKernelExtension(
 		paneCompositePartService: IPaneCompositePartService,
 		extensionWorkbenchService: IExtensionsWorkbenchService,
 		extensionService: IExtensionService,
 		viewType: string,
-		extId?: string,
+		extIds: string[],
 		isInsiders?: boolean
 	) {
 		// If extension id is provided attempt to install the extension as the user has requested the suggested ones be installed
-		if (extId) {
+		const extensionsToInstall: IExtension[] = [];
+
+		for (const extId of extIds) {
 			const extension = (await extensionWorkbenchService.getExtensions([{ id: extId }], CancellationToken.None))[0];
 			const canInstall = await extensionWorkbenchService.canInstall(extension);
-			// If we can install then install it, otherwise we will fall out into searching the viewlet
 			if (canInstall) {
+				extensionsToInstall.push(extension);
+			}
+		}
+
+		if (extensionsToInstall.length) {
+			await Promise.all(extensionsToInstall.map(async extension => {
 				await extensionWorkbenchService.install(
 					extension,
 					{
@@ -290,9 +303,10 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 					},
 					ProgressLocation.Notification
 				);
-				await extensionService.activateByEvent(`onNotebook:${viewType}`);
-				return;
-			}
+			}));
+
+			await extensionService.activateByEvent(`onNotebook:${viewType}`);
+			return;
 		}
 
 		const viewlet = await paneCompositePartService.openPaneComposite(EXTENSION_VIEWLET_ID, ViewContainerLocation.Sidebar, true);
@@ -321,19 +335,19 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 		}
 	}
 
-	private async _getKernelRecommendationsQuickPickItems(
+	protected async _getKernelRecommendationsQuickPickItems(
 		notebookTextModel: NotebookTextModel,
 		extensionWorkbenchService: IExtensionsWorkbenchService,
-	): Promise<QuickPickInput<KernelQuickPickItem>[] | undefined> {
-		const quickPickItems: QuickPickInput<KernelQuickPickItem>[] = [];
+	): Promise<QuickPickInput<SearchMarketplacePick | InstallExtensionPick>[] | undefined> {
+		const quickPickItems: QuickPickInput<SearchMarketplacePick | InstallExtensionPick>[] = [];
 
 		const language = this.getSuggestedLanguage(notebookTextModel);
 		const suggestedExtension: INotebookExtensionRecommendation | undefined = language ? this.getSuggestedKernelFromLanguage(notebookTextModel.viewType, language) : undefined;
 		if (suggestedExtension) {
 			await extensionWorkbenchService.queryLocal();
-			const extension = extensionWorkbenchService.installed.find(e => e.identifier.id === suggestedExtension.extensionId);
+			const extensions = extensionWorkbenchService.installed.filter(e => suggestedExtension.extensionIds.includes(e.identifier.id));
 
-			if (extension) {
+			if (extensions.length === suggestedExtension.extensionIds.length) {
 				// it's installed but might be detecting kernels
 				return undefined;
 			}
@@ -341,16 +355,16 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 			// We have a suggested kernel, show an option to install it
 			quickPickItems.push({
 				id: 'installSuggested',
-				description: suggestedExtension.displayName ?? suggestedExtension.extensionId,
+				description: suggestedExtension.displayName ?? suggestedExtension.extensionIds.join(', '),
 				label: `$(${Codicon.lightbulb.id}) ` + localize('installSuggestedKernel', 'Install suggested extensions'),
-				extensionId: suggestedExtension.extensionId
-			});
+				extensionIds: suggestedExtension.extensionIds
+			} as InstallExtensionPick);
 		}
 		// there is no kernel, show the install from marketplace
 		quickPickItems.push({
 			id: 'install',
 			label: localize('searchForKernels', "Browse marketplace for kernel extensions"),
-		});
+		} as SearchMarketplacePick);
 
 		return quickPickItems;
 	}
@@ -488,9 +502,19 @@ export class KernelPickerFlatStrategy extends KernelPickerStrategyBase {
 	static updateKernelStatusAction(notebook: NotebookTextModel, action: IAction, notebookKernelService: INotebookKernelService, scopedContextKeyService?: IContextKeyService) {
 		const detectionTasks = notebookKernelService.getKernelDetectionTasks(notebook);
 		if (detectionTasks.length) {
+			const info = notebookKernelService.getMatchingKernel(notebook);
 			action.enabled = true;
-			action.label = localize('kernels.detecting', "Detecting Kernels");
 			action.class = ThemeIcon.asClassName(ThemeIcon.modify(executingStateIcon, 'spin'));
+
+			if (info.selected) {
+				action.label = info.selected.label;
+				const kernelInfo = info.selected.description ?? info.selected.detail;
+				action.tooltip = kernelInfo
+					? localize('kernels.selectedKernelAndKernelDetectionRunning', "Selected Kernel: {0} (Kernel Detection Tasks Running)", kernelInfo)
+					: localize('kernels.detecting', "Detecting Kernels");
+			} else {
+				action.label = localize('kernels.detecting', "Detecting Kernels");
+			}
 			return;
 		}
 
@@ -635,21 +659,22 @@ export class KernelPickerMRUStrategy extends KernelPickerStrategyBase {
 		};
 	}
 
-	protected override async _handleQuickPick(editor: IActiveNotebookEditor, pick: KernelQuickPickItem): Promise<boolean> {
+	protected override async _handleQuickPick(editor: IActiveNotebookEditor, pick: KernelQuickPickItem, items: KernelQuickPickItem[]): Promise<boolean> {
 		if (pick.id === 'selectAnother') {
-			return this.displaySelectAnotherQuickPick(editor);
+			return this.displaySelectAnotherQuickPick(editor, items.length === 1 && items[0] === pick);
 		}
 
-		return super._handleQuickPick(editor, pick);
+		return super._handleQuickPick(editor, pick, items);
 	}
 
-	private async displaySelectAnotherQuickPick(editor: IActiveNotebookEditor) {
+	private async displaySelectAnotherQuickPick(editor: IActiveNotebookEditor, kernelListEmpty: boolean) {
 		const notebook: NotebookTextModel = editor.textModel;
 		const disposables = new DisposableStore();
 		return new Promise<boolean>(resolve => {
 			// select from kernel sources
 			const quickPick = this._quickInputService.createQuickPick<KernelQuickPickItem>();
-			quickPick.title = localize('selectAnotherKernel', "Select Another Kernel");
+			quickPick.title = kernelListEmpty ? localize('select', "Select Kernel") : localize('selectAnotherKernel', "Select Another Kernel");
+			quickPick.placeholder = localize('selectKernel.placeholder', "Type to choose a kernel source");
 			quickPick.busy = true;
 			quickPick.buttons = [this._quickInputService.backButton];
 			quickPick.show();
@@ -657,7 +682,7 @@ export class KernelPickerMRUStrategy extends KernelPickerStrategyBase {
 			disposables.add(quickPick.onDidTriggerButton(button => {
 				if (button === this._quickInputService.backButton) {
 					quickPick.hide();
-					resolve(this.showQuickPick(editor));
+					resolve(this.showQuickPick(editor, undefined, true));
 				}
 			}));
 			disposables.add(quickPick.onDidAccept(async () => {
@@ -675,7 +700,7 @@ export class KernelPickerMRUStrategy extends KernelPickerStrategyBase {
 							}
 							resolve(true);
 						} else {
-							return resolve(this.displaySelectAnotherQuickPick(editor));
+							return resolve(this.displaySelectAnotherQuickPick(editor, false));
 						}
 					} else if (isKernelPick(quickPick.selectedItems[0])) {
 						await this._selecteKernel(notebook, quickPick.selectedItems[0].kernel);
@@ -687,6 +712,25 @@ export class KernelPickerMRUStrategy extends KernelPickerStrategyBase {
 						// selected explicilty, it should trigger the execution?
 						quickPick.selectedItems[0].action.runAction();
 						resolve(true);
+					} else if (isSearchMarketplacePick(quickPick.selectedItems[0])) {
+						await this._showKernelExtension(
+							this._paneCompositePartService,
+							this._extensionWorkbenchService,
+							this._extensionService,
+							editor.textModel.viewType,
+							[]
+						);
+						resolve(true);
+					} else if (isInstallExtensionPick(quickPick.selectedItems[0])) {
+						await this._showKernelExtension(
+							this._paneCompositePartService,
+							this._extensionWorkbenchService,
+							this._extensionService,
+							editor.textModel.viewType,
+							quickPick.selectedItems[0].extensionIds,
+							this._productService.quality !== 'stable'
+						);
+						resolve(true);
 					}
 				}
 			}));
@@ -724,10 +768,16 @@ export class KernelPickerMRUStrategy extends KernelPickerStrategyBase {
 	private async _calculdateKernelSources(editor: IActiveNotebookEditor) {
 		const notebook: NotebookTextModel = editor.textModel;
 
+		const sourceActionCommands = this._notebookKernelService.getSourceActions(notebook, editor.scopedContextKeyService);
 		const actions = await this._notebookKernelService.getKernelSourceActions2(notebook);
-		const quickPickItems: QuickPickInput<KernelQuickPickItem>[] = [];
 		const matchResult = this._getMatchingResult(notebook);
+
+		if (sourceActionCommands.length === 0 && matchResult.all.length === 0 && actions.length === 0) {
+			return await this._getKernelRecommendationsQuickPickItems(notebook, this._extensionWorkbenchService) ?? [];
+		}
+
 		const others = matchResult.all.filter(item => item.extension.value !== JUPYTER_EXTENSION_ID);
+		const quickPickItems: QuickPickInput<KernelQuickPickItem>[] = [];
 
 		// group controllers by extension
 		for (const group of groupBy(others, (a, b) => a.extension.value === b.extension.value ? 0 : 1)) {
@@ -760,7 +810,6 @@ export class KernelPickerMRUStrategy extends KernelPickerStrategyBase {
 			};
 		}));
 
-		const sourceActionCommands = this._notebookKernelService.getSourceActions(notebook, editor.scopedContextKeyService);
 		for (const sourceAction of sourceActionCommands) {
 			const res: SourcePick = {
 				action: sourceAction,
@@ -820,9 +869,19 @@ export class KernelPickerMRUStrategy extends KernelPickerStrategyBase {
 	static updateKernelStatusAction(notebook: NotebookTextModel, action: IAction, notebookKernelService: INotebookKernelService) {
 		const detectionTasks = notebookKernelService.getKernelDetectionTasks(notebook);
 		if (detectionTasks.length) {
+			const info = notebookKernelService.getMatchingKernel(notebook);
 			action.enabled = true;
-			action.label = localize('kernels.detecting', "Detecting Kernels");
 			action.class = ThemeIcon.asClassName(ThemeIcon.modify(executingStateIcon, 'spin'));
+
+			if (info.selected) {
+				action.label = info.selected.label;
+				const kernelInfo = info.selected.description ?? info.selected.detail;
+				action.tooltip = kernelInfo
+					? localize('kernels.selectedKernelAndKernelDetectionRunning', "Selected Kernel: {0} (Kernel Detection Tasks Running)", kernelInfo)
+					: localize('kernels.detecting', "Detecting Kernels");
+			} else {
+				action.label = localize('kernels.detecting', "Detecting Kernels");
+			}
 			return;
 		}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView.ts
index 2b7f5534ea1966..3b50e3ba7b4572 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView.ts
@@ -169,7 +169,7 @@ export class NotebooKernelActionViewItem extends ActionViewItem {
 		this.updateLabel();
 	}
 
-	override updateLabel() {
+	protected override updateLabel() {
 		if (this._kernelLabel) {
 			this._kernelLabel.classList.add('kernel-label');
 			this._kernelLabel.innerText = this._action.label;
diff --git a/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts b/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts
index e8576c8234af9e..6534527216cf36 100644
--- a/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts
+++ b/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts
@@ -431,8 +431,7 @@ export function cloneNotebookCellTextModel(cell: NotebookCellTextModel) {
 			outputs: output.outputs,
 			/* paste should generate new outputId */ outputId: UUID.generateUuid()
 		})),
-		metadata: { ...cell.metadata },
-		// Don't include internalMetadata, ie execution state, this is not to be shared
+		metadata: {}
 	};
 }
 
diff --git a/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl.ts b/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl.ts
index 24d1a387078a09..05e85a3707487d 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl.ts
@@ -36,7 +36,7 @@ class NotebookModelReferenceCollection extends ReferenceCollection<Promise<IReso
 	private readonly _dirtyStates = new ResourceMap<boolean>();
 
 	constructor(
-		@IInstantiationService readonly _instantiationService: IInstantiationService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@INotebookService private readonly _notebookService: INotebookService,
 		@ILogService private readonly _logService: ILogService,
 	) {
diff --git a/src/vs/workbench/contrib/notebook/common/notebookOptions.ts b/src/vs/workbench/contrib/notebook/common/notebookOptions.ts
index ae0b576b5d85bc..14d141484d45d7 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookOptions.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookOptions.ts
@@ -126,14 +126,14 @@ export class NotebookOptions extends Disposable {
 	constructor(
 		private readonly configurationService: IConfigurationService,
 		private readonly notebookExecutionStateService: INotebookExecutionStateService,
-		private readonly overrides?: { cellToolbarInteraction: string; globalToolbar: boolean; defaultCellCollapseConfig?: NotebookCellDefaultCollapseConfig }
+		private readonly overrides?: { cellToolbarInteraction: string; globalToolbar: boolean; dragAndDropEnabled: boolean }
 	) {
 		super();
 		const showCellStatusBar = this.configurationService.getValue<ShowCellStatusBarType>(NotebookSetting.showCellStatusBar);
 		const globalToolbar = overrides?.globalToolbar ?? this.configurationService.getValue<boolean | undefined>(NotebookSetting.globalToolbar) ?? true;
 		const consolidatedOutputButton = this.configurationService.getValue<boolean | undefined>(NotebookSetting.consolidatedOutputButton) ?? true;
 		const consolidatedRunButton = this.configurationService.getValue<boolean | undefined>(NotebookSetting.consolidatedRunButton) ?? false;
-		const dragAndDropEnabled = this.configurationService.getValue<boolean | undefined>(NotebookSetting.dragAndDropEnabled) ?? true;
+		const dragAndDropEnabled = overrides?.dragAndDropEnabled ?? this.configurationService.getValue<boolean | undefined>(NotebookSetting.dragAndDropEnabled) ?? true;
 		const cellToolbarLocation = this.configurationService.getValue<string | { [key: string]: string }>(NotebookSetting.cellToolbarLocation) ?? { 'default': 'right' };
 		const cellToolbarInteraction = overrides?.cellToolbarInteraction ?? this.configurationService.getValue<string>(NotebookSetting.cellToolbarVisibility);
 		const compactView = this.configurationService.getValue<boolean | undefined>(NotebookSetting.compactView) ?? true;
diff --git a/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts b/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts
index ac2d2f5f8ae713..05c054d09bc5f9 100644
--- a/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts
+++ b/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts
@@ -123,18 +123,27 @@ class MirrorNotebookDocument {
 				const cell = this.cells[e.index];
 				cell.outputs = e.outputs;
 			} else if (e.kind === NotebookCellsChangeType.ChangeCellLanguage) {
+				this._assertIndex(e.index);
 				const cell = this.cells[e.index];
 				cell.language = e.language;
 			} else if (e.kind === NotebookCellsChangeType.ChangeCellMetadata) {
+				this._assertIndex(e.index);
 				const cell = this.cells[e.index];
 				cell.metadata = e.metadata;
 			} else if (e.kind === NotebookCellsChangeType.ChangeCellInternalMetadata) {
+				this._assertIndex(e.index);
 				const cell = this.cells[e.index];
 				cell.internalMetadata = e.internalMetadata;
 			}
 		});
 	}
 
+	private _assertIndex(index: number): void {
+		if (index < 0 || index >= this.cells.length) {
+			throw new Error(`Illegal index ${index}. Cells length: ${this.cells.length}`);
+		}
+	}
+
 	_spliceNotebookCells(splices: NotebookCellTextModelSplice<IMainCellDto>[]) {
 		splices.reverse().forEach(splice => {
 			const cellDtos = splice[2];
diff --git a/src/vs/workbench/contrib/notebook/test/browser/notebookCellList.test.ts b/src/vs/workbench/contrib/notebook/test/browser/notebookCellList.test.ts
index f3e849fe8a6f24..5fd27dee8c2f58 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/notebookCellList.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/notebookCellList.test.ts
@@ -40,6 +40,7 @@ suite('NotebookCellList', () => {
 			async (editor, viewModel) => {
 				viewModel.restoreEditorViewState({
 					editingCells: [false, false, false, false, false],
+					cellLineNumberStates: {},
 					editorViewStates: [null, null, null, null, null],
 					cellTotalHeights: [50, 100, 50, 100, 50],
 					collapsedInputCells: {},
@@ -88,6 +89,7 @@ suite('NotebookCellList', () => {
 					editingCells: [false, false, false, false, false],
 					editorViewStates: [null, null, null, null, null],
 					cellTotalHeights: [50, 100, 50, 100, 50],
+					cellLineNumberStates: {},
 					collapsedInputCells: {},
 					collapsedOutputCells: {},
 				});
@@ -131,6 +133,7 @@ suite('NotebookCellList', () => {
 					editingCells: [false, false, false, false, false],
 					editorViewStates: [null, null, null, null, null],
 					cellTotalHeights: [50, 100, 50, 100, 50],
+					cellLineNumberStates: {},
 					collapsedInputCells: {},
 					collapsedOutputCells: {},
 				});
@@ -167,6 +170,7 @@ suite('NotebookCellList', () => {
 					editingCells: [false, false, false, false, false],
 					editorViewStates: [null, null, null, null, null],
 					cellTotalHeights: [50, 100, 50, 100, 50],
+					cellLineNumberStates: {},
 					collapsedInputCells: {},
 					collapsedOutputCells: {},
 				});
@@ -208,6 +212,7 @@ suite('NotebookCellList', () => {
 					editingCells: [false, false, false, false, false],
 					editorViewStates: [null, null, null, null, null],
 					cellTotalHeights: [50, 100, 50, 100, 50],
+					cellLineNumberStates: {},
 					collapsedInputCells: {},
 					collapsedOutputCells: {},
 				});
@@ -260,6 +265,7 @@ suite('NotebookCellList', () => {
 					editingCells: [false, false, false, false, false],
 					editorViewStates: [null, null, null, null, null],
 					cellTotalHeights: [50, 100, 50, 100, 50],
+					cellLineNumberStates: {},
 					collapsedInputCells: {},
 					collapsedOutputCells: {},
 				});
@@ -295,6 +301,7 @@ suite('NotebookCellList', () => {
 					editingCells: [false, false, false, false, false],
 					editorViewStates: [null, null, null, null, null],
 					cellTotalHeights: [50, 100, 50, 100, 50],
+					cellLineNumberStates: {},
 					collapsedInputCells: {},
 					collapsedOutputCells: {},
 				});
@@ -343,6 +350,7 @@ suite('NotebookCellList', () => {
 					editingCells: [false],
 					editorViewStates: [null],
 					cellTotalHeights: [50],
+					cellLineNumberStates: {},
 					collapsedInputCells: {},
 					collapsedOutputCells: {},
 				});
diff --git a/src/vs/workbench/contrib/output/browser/output.contribution.ts b/src/vs/workbench/contrib/output/browser/output.contribution.ts
index 6776cee5f79430..a2570f8792082b 100644
--- a/src/vs/workbench/contrib/output/browser/output.contribution.ts
+++ b/src/vs/workbench/contrib/output/browser/output.contribution.ts
@@ -106,6 +106,7 @@ class OutputContribution extends Disposable implements IWorkbenchContribution {
 
 	private registerActions(): void {
 		this.registerSwitchOutputAction();
+		this.registerShowOutputChannelsAction();
 		this.registerClearOutputAction();
 		this.registerToggleAutoScrollAction();
 		this.registerOpenActiveLogOutputFileAction();
@@ -174,6 +175,45 @@ class OutputContribution extends Disposable implements IWorkbenchContribution {
 		}));
 	}
 
+	private registerShowOutputChannelsAction(): void {
+		this._register(registerAction2(class extends Action2 {
+			constructor() {
+				super({
+					id: 'workbench.action.showOutputChannels',
+					title: { value: nls.localize('showOutputChannels', "Show Output Channels..."), original: 'Show Output Channels...' },
+					category: { value: nls.localize('output', "Output"), original: 'Output' },
+					f1: true
+				});
+			}
+			async run(accessor: ServicesAccessor): Promise<void> {
+				const outputService = accessor.get(IOutputService);
+				const quickInputService = accessor.get(IQuickInputService);
+				const extensionChannels = [], coreChannels = [];
+				for (const channel of outputService.getChannelDescriptors()) {
+					if (channel.extensionId) {
+						extensionChannels.push(channel);
+					} else {
+						coreChannels.push(channel);
+					}
+				}
+				const entries: ({ id: string; label: string } | IQuickPickSeparator)[] = [];
+				for (const { id, label } of extensionChannels) {
+					entries.push({ id, label });
+				}
+				if (extensionChannels.length && coreChannels.length) {
+					entries.push({ type: 'separator' });
+				}
+				for (const { id, label } of coreChannels) {
+					entries.push({ id, label });
+				}
+				const entry = await quickInputService.pick(entries, { placeHolder: nls.localize('selectOutput', "Select Output Channel") });
+				if (entry) {
+					return outputService.showChannel(entry.id);
+				}
+			}
+		}));
+	}
+
 	private registerClearOutputAction(): void {
 		this._register(registerAction2(class extends Action2 {
 			constructor() {
diff --git a/src/vs/workbench/contrib/output/browser/outputView.ts b/src/vs/workbench/contrib/output/browser/outputView.ts
index 7e607a92e371a2..a8af8c5da055b3 100644
--- a/src/vs/workbench/contrib/output/browser/outputView.ts
+++ b/src/vs/workbench/contrib/output/browser/outputView.ts
@@ -32,6 +32,8 @@ import { Dimension } from 'vs/base/browser/dom';
 import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
 import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
 import { IFileService } from 'vs/platform/files/common/files';
+import { ResourceContextKey } from 'vs/workbench/common/contextkeys';
+import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 
 export class OutputViewPane extends ViewPane {
 
@@ -57,7 +59,9 @@ export class OutputViewPane extends ViewPane {
 	) {
 		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
 		this.scrollLockContextKey = CONTEXT_OUTPUT_SCROLL_LOCK.bindTo(this.contextKeyService);
-		this.editor = instantiationService.createInstance(OutputEditor);
+
+		const editorInstantiationService = instantiationService.createChild(new ServiceCollection([IContextKeyService, this.scopedContextKeyService]));
+		this.editor = editorInstantiationService.createInstance(OutputEditor);
 		this._register(this.editor.onTitleAreaUpdate(() => {
 			this.updateTitle(this.editor.getTitle());
 			this.updateActions();
@@ -146,6 +150,7 @@ export class OutputViewPane extends ViewPane {
 }
 
 class OutputEditor extends AbstractTextResourceEditor {
+	private readonly resourceContext: ResourceContextKey;
 
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -156,9 +161,12 @@ class OutputEditor extends AbstractTextResourceEditor {
 		@IThemeService themeService: IThemeService,
 		@IEditorGroupsService editorGroupService: IEditorGroupsService,
 		@IEditorService editorService: IEditorService,
-		@IFileService fileService: IFileService
+		@IFileService fileService: IFileService,
+		@IContextKeyService contextKeyService: IContextKeyService,
 	) {
 		super(OUTPUT_VIEW_ID, telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorGroupService, editorService, fileService);
+
+		this.resourceContext = this._register(instantiationService.createInstance(ResourceContextKey));
 	}
 
 	override getId(): string {
@@ -218,6 +226,9 @@ class OutputEditor extends AbstractTextResourceEditor {
 			this.input.dispose();
 		}
 		await super.setInput(input, options, context, token);
+
+		this.resourceContext.set(input.resource);
+
 		if (focus) {
 			this.focus();
 		}
@@ -230,6 +241,8 @@ class OutputEditor extends AbstractTextResourceEditor {
 			this.input.dispose();
 		}
 		super.clearInput();
+
+		this.resourceContext.reset();
 	}
 
 	protected override createEditor(parent: HTMLElement): void {
diff --git a/src/vs/workbench/contrib/performance/browser/inputLatencyContrib.ts b/src/vs/workbench/contrib/performance/browser/inputLatencyContrib.ts
index 32f3bbe3273cae..2ea34f84b37e1e 100644
--- a/src/vs/workbench/contrib/performance/browser/inputLatencyContrib.ts
+++ b/src/vs/workbench/contrib/performance/browser/inputLatencyContrib.ts
@@ -58,7 +58,7 @@ export class InputLatencyContrib extends Disposable implements IWorkbenchContrib
 			input: InputLatencyStatisticFragment;
 			render: InputLatencyStatisticFragment;
 			total: InputLatencyStatisticFragment;
-			sampleCount: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'The number of samples measured.' };
+			sampleCount: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; isMeasurement: true; comment: 'The number of samples measured.' };
 		};
 
 		type PerformanceInputLatencyEvent = inputLatency.IInputLatencyMeasurements;
diff --git a/src/vs/workbench/contrib/performance/browser/performance.contribution.ts b/src/vs/workbench/contrib/performance/browser/performance.contribution.ts
index bf9833721c1fe8..5c2fc5fd2ef1d0 100644
--- a/src/vs/workbench/contrib/performance/browser/performance.contribution.ts
+++ b/src/vs/workbench/contrib/performance/browser/performance.contribution.ts
@@ -124,7 +124,7 @@ registerAction2(class PrintEventProfiling extends Action2 {
 			return;
 		}
 		for (const item of EventProfiling.all) {
-			console.log(`${item.name}: ${item.invocationCount}invocations COST ${item.elapsedOverall}ms, ${item.listenerCount} listeners, avg cost is ${item.durations.reduce((a, b) => a + b, 0) / item.durations.length}ms`);
+			console.log(`${item.name}: ${item.invocationCount} invocations COST ${item.elapsedOverall}ms, ${item.listenerCount} listeners, avg cost is ${item.durations.reduce((a, b) => a + b, 0) / item.durations.length}ms`);
 		}
 	}
 });
diff --git a/src/vs/workbench/contrib/performance/electron-sandbox/performance.contribution.ts b/src/vs/workbench/contrib/performance/electron-sandbox/performance.contribution.ts
index 23bd542a43ceb8..49e1c3bf4640d6 100644
--- a/src/vs/workbench/contrib/performance/electron-sandbox/performance.contribution.ts
+++ b/src/vs/workbench/contrib/performance/electron-sandbox/performance.contribution.ts
@@ -11,6 +11,7 @@ import { StartupTimings } from './startupTimings';
 import { RendererProfiling } from 'vs/workbench/contrib/performance/electron-sandbox/rendererAutoProfiler';
 import { IConfigurationRegistry, Extensions as ConfigExt } from 'vs/platform/configuration/common/configurationRegistry';
 import { localize } from 'vs/nls';
+import { applicationConfigurationNodeBase } from 'vs/workbench/common/configuration';
 
 
 Registry.as<IWorkbenchContributionsRegistry>(Extensions.Workbench).registerWorkbenchContribution(
@@ -33,9 +34,7 @@ Registry.as<IWorkbenchContributionsRegistry>(Extensions.Workbench).registerWorkb
 );
 
 Registry.as<IConfigurationRegistry>(ConfigExt.Configuration).registerConfiguration({
-	id: 'application',
-	order: 100,
-	type: 'object',
+	...applicationConfigurationNodeBase,
 	'properties': {
 		'application.experimental.rendererProfiling': {
 			type: 'boolean',
diff --git a/src/vs/workbench/contrib/preferences/browser/media/settingsWidgets.css b/src/vs/workbench/contrib/preferences/browser/media/settingsWidgets.css
index 229cb190ef6695..6805957771d6bf 100644
--- a/src/vs/workbench/contrib/preferences/browser/media/settingsWidgets.css
+++ b/src/vs/workbench/contrib/preferences/browser/media/settingsWidgets.css
@@ -142,10 +142,6 @@
 	background-color: rgba(130, 130, 130, 0.04);
 }
 
-.settings-editor > .settings-body .settings-tree-container .setting-item.setting-item-list .setting-list-row:focus {
-	outline: none;
-}
-
 .settings-editor > .settings-body .settings-tree-container .setting-item.setting-item-list .setting-list-row:hover .monaco-action-bar,
 .settings-editor > .settings-body .settings-tree-container .setting-item.setting-item-list .setting-list-row.selected .monaco-action-bar {
 	display: block;
diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts
index 36918f0e31134b..bdf508033059d2 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts
@@ -24,7 +24,7 @@ import * as languages from 'vs/editor/common/languages';
 import { CodeActionKind } from 'vs/editor/contrib/codeAction/common/types';
 import * as nls from 'vs/nls';
 import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ConfigurationScope, Extensions as ConfigurationExtensions, IConfigurationPropertySchema, IConfigurationRegistry, overrideIdentifiersFromKey, OVERRIDE_PROPERTY_REGEX } from 'vs/platform/configuration/common/configurationRegistry';
+import { ConfigurationScope, Extensions as ConfigurationExtensions, IConfigurationPropertySchema, IConfigurationRegistry, IRegisteredConfigurationPropertySchema, overrideIdentifiersFromKey, OVERRIDE_PROPERTY_REGEX } from 'vs/platform/configuration/common/configurationRegistry';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IMarkerData, IMarkerService, MarkerSeverity, MarkerTag } from 'vs/platform/markers/common/markers';
@@ -43,6 +43,7 @@ import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeat
 import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
 import { isEqual } from 'vs/base/common/resources';
 import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { IStringDictionary } from 'vs/base/common/collections';
 
 export interface IPreferencesRenderer extends IDisposable {
 	render(): void;
@@ -529,6 +530,12 @@ class UnsupportedSettingsRenderer extends Disposable implements languages.CodeAc
 		for (const settingsGroup of this.settingsEditorModel.settingsGroups) {
 			for (const section of settingsGroup.sections) {
 				for (const setting of section.settings) {
+					if (OVERRIDE_PROPERTY_REGEX.test(setting.key)) {
+						if (setting.overrides) {
+							this.handleOverrides(setting.overrides, configurationRegistry, markerData);
+						}
+						continue;
+					}
 					const configuration = configurationRegistry[setting.key];
 					if (configuration) {
 						if (this.handlePolicyConfiguration(setting, configuration, markerData)) {
@@ -548,13 +555,8 @@ class UnsupportedSettingsRenderer extends Disposable implements languages.CodeAc
 								this.handleWorkspaceFolderConfiguration(setting, configuration, markerData);
 								break;
 						}
-					} else if (!OVERRIDE_PROPERTY_REGEX.test(setting.key)) { // Ignore override settings (language specific settings)
-						markerData.push({
-							severity: MarkerSeverity.Hint,
-							tags: [MarkerTag.Unnecessary],
-							...setting.range,
-							message: nls.localize('unknown configuration setting', "Unknown Configuration Setting")
-						});
+					} else {
+						markerData.push(this.gemerateUnknownConfigurationMarker(setting));
 					}
 				}
 			}
@@ -581,6 +583,24 @@ class UnsupportedSettingsRenderer extends Disposable implements languages.CodeAc
 		return true;
 	}
 
+	private handleOverrides(overrides: ISetting[], configurationRegistry: IStringDictionary<IRegisteredConfigurationPropertySchema>, markerData: IMarkerData[]): void {
+		for (const setting of overrides || []) {
+			const configuration = configurationRegistry[setting.key];
+			if (configuration) {
+				if (configuration.scope !== ConfigurationScope.LANGUAGE_OVERRIDABLE) {
+					markerData.push({
+						severity: MarkerSeverity.Hint,
+						tags: [MarkerTag.Unnecessary],
+						...setting.range,
+						message: nls.localize('unsupportLanguageOverrideSetting', "This setting cannot be applied because it is not registered as language override setting.")
+					});
+				}
+			} else {
+				markerData.push(this.gemerateUnknownConfigurationMarker(setting));
+			}
+		}
+	}
+
 	private handleLocalUserConfiguration(setting: ISetting, configuration: IConfigurationPropertySchema, markerData: IMarkerData[]): void {
 		if (!this.userDataProfileService.currentProfile.isDefault) {
 			if (isEqual(this.userDataProfilesService.defaultProfile.settingsResource, this.settingsEditorModel.uri) && configuration.scope !== ConfigurationScope.APPLICATION) {
@@ -683,6 +703,15 @@ class UnsupportedSettingsRenderer extends Disposable implements languages.CodeAc
 		};
 	}
 
+	private gemerateUnknownConfigurationMarker(setting: ISetting): IMarkerData {
+		return {
+			severity: MarkerSeverity.Hint,
+			tags: [MarkerTag.Unnecessary],
+			...setting.range,
+			message: nls.localize('unknown configuration setting', "Unknown Configuration Setting")
+		};
+	}
+
 	private generateUntrustedSettingCodeActions(diagnostics: IMarkerData[]): languages.CodeAction[] {
 		return [{
 			title: nls.localize('manage workspace trust', "Manage Workspace Trust"),
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
index 8df8742a5f9fae..4a1f144badd361 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
@@ -267,7 +267,7 @@ export class SettingsEditor2 extends EditorPane {
 
 		this._register(configurationService.onDidChangeRestrictedSettings(e => {
 			if (e.default.length && this.currentSettingsModel) {
-				this.updateElementsByKey([...e.default]);
+				this.updateElementsByKey(new Set(e.default));
 			}
 		}));
 
@@ -1078,7 +1078,7 @@ export class SettingsEditor2 extends EditorPane {
 			value = undefined;
 		}
 
-		return this.configurationService.updateValue(key, value, overrides, configurationTarget)
+		return this.configurationService.updateValue(key, value, overrides, configurationTarget, { handleDirtyFile: 'save' })
 			.then(() => {
 				const query = this.searchWidget.getValue();
 				if (query.includes(`@${MODIFIED_SETTING_TAG}`)) {
@@ -1189,11 +1189,11 @@ export class SettingsEditor2 extends EditorPane {
 		scheduledRefreshTracker.onDidBlur(() => {
 			scheduledRefreshTracker.dispose();
 			this.scheduledRefreshes.delete(key);
-			this.onConfigUpdate([key]);
+			this.onConfigUpdate(new Set([key]));
 		});
 	}
 
-	private async onConfigUpdate(keys?: string[], forceRefresh = false, schemaChange = false): Promise<void> {
+	private async onConfigUpdate(keys?: ReadonlySet<string>, forceRefresh = false, schemaChange = false): Promise<void> {
 		if (keys && this.settingsTreeModel) {
 			return this.updateElementsByKey(keys);
 		}
@@ -1259,8 +1259,8 @@ export class SettingsEditor2 extends EditorPane {
 		}
 	}
 
-	private updateElementsByKey(keys: string[]): void {
-		if (keys.length) {
+	private updateElementsByKey(keys: ReadonlySet<string>): void {
+		if (keys.size) {
 			if (this.searchResultModel) {
 				keys.forEach(key => this.searchResultModel!.updateElementsByName(key));
 			}
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsEditorSettingIndicators.ts b/src/vs/workbench/contrib/preferences/browser/settingsEditorSettingIndicators.ts
index 23e401e4aa1e0b..8cf1a6291196fc 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsEditorSettingIndicators.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsEditorSettingIndicators.ts
@@ -76,7 +76,8 @@ export class SettingsTreeIndicatorsLabel implements IDisposable {
 	private defaultHoverOptions: Partial<IHoverOptions> = {
 		hoverPosition: HoverPosition.BELOW,
 		showPointer: true,
-		compact: false
+		compact: false,
+		trapFocus: true
 	};
 
 	private addHoverDisposables(disposables: DisposableStore, element: HTMLElement, showHover: (focus: boolean) => IHoverWidget | undefined) {
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts b/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
index 872c7056b432ad..011fd6e58359c6 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
@@ -233,6 +233,16 @@ export const tocData: ITOCEntry<string> = {
 					id: 'application/settingsSync',
 					label: localize('settingsSync', "Settings Sync"),
 					settings: ['settingsSync.*']
+				},
+				{
+					id: 'application/experimental',
+					label: localize('experimental', "Experimental"),
+					settings: ['application.experimental.*']
+				},
+				{
+					id: 'application/other',
+					label: localize('other', "Other"),
+					settings: ['application.*']
 				}
 			]
 		},
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
index e4ed892ae52c41..60fdb58348b8ae 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
@@ -1389,7 +1389,7 @@ class SettingBoolObjectRenderer extends AbstractSettingObjectRenderer implements
 		return this.renderTemplateWithWidget(common, widget);
 	}
 
-	override onDidChangeObject(template: ISettingObjectItemTemplate, e: ISettingListChangeEvent<IObjectDataItem>): void {
+	protected override onDidChangeObject(template: ISettingObjectItemTemplate, e: ISettingListChangeEvent<IObjectDataItem>): void {
 		if (template.context) {
 			super.onDidChangeObject(template, e);
 
@@ -2096,7 +2096,7 @@ export class SettingsTreeFilter implements ITreeFilter<SettingsTreeElement> {
 
 		// Filtered "new extensions" button
 		if (element instanceof SettingsTreeNewExtensionsElement) {
-			if ((this.viewState.tagFilters && this.viewState.tagFilters.size) || this.viewState.filterToCategory) {
+			if (this.viewState.tagFilters?.size || this.viewState.filterToCategory) {
 				return false;
 			}
 		}
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts b/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
index 1e134a6c408a17..3e07232e939ce5 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
@@ -884,15 +884,18 @@ export class SearchResultModel extends SettingsTreeModel {
 		this.root.children = this.root.children
 			.filter(child => child instanceof SettingsTreeSettingElement && child.matchesAllTags(this._viewState.tagFilters) && child.matchesScope(this._viewState.settingsTarget, isRemote) && child.matchesAnyExtension(this._viewState.extensionFilters) && child.matchesAnyId(this._viewState.idFilters) && child.matchesAnyFeature(this._viewState.featureFilters) && child.matchesAllLanguages(this._viewState.languageFilter));
 
-		if (this.newExtensionSearchResults && this.newExtensionSearchResults.filterMatches.length) {
-			const resultExtensionIds = this.newExtensionSearchResults.filterMatches
+		if (this.newExtensionSearchResults?.filterMatches.length) {
+			let resultExtensionIds = this.newExtensionSearchResults.filterMatches
 				.map(result => (<IExtensionSetting>result.setting))
 				.filter(setting => setting.extensionName && setting.extensionPublisher)
 				.map(setting => `${setting.extensionPublisher}.${setting.extensionName}`);
+			resultExtensionIds = arrays.distinct(resultExtensionIds);
 
-			const newExtElement = new SettingsTreeNewExtensionsElement('newExtensions', arrays.distinct(resultExtensionIds));
-			newExtElement.parent = this._root;
-			this._root.children.push(newExtElement);
+			if (resultExtensionIds.length) {
+				const newExtElement = new SettingsTreeNewExtensionsElement('newExtensions', resultExtensionIds);
+				newExtElement.parent = this._root;
+				this._root.children.push(newExtElement);
+			}
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts b/src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts
index 549ccf18d6037e..0f340f69f254a5 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts
@@ -146,7 +146,6 @@ export abstract class AbstractListSettingWidget<TDataItem extends object> extend
 		this.listElement = DOM.append(container, $('div'));
 		this.listElement.setAttribute('role', 'list');
 		this.getContainerClasses().forEach(c => this.listElement.classList.add(c));
-		this.listElement.setAttribute('tabindex', '0');
 		DOM.append(container, this.renderAddButton());
 		this.renderList();
 
@@ -172,12 +171,12 @@ export abstract class AbstractListSettingWidget<TDataItem extends object> extend
 		this.renderList();
 	}
 
+	abstract isItemNew(item: TDataItem): boolean;
 	protected abstract getEmptyItem(): TDataItem;
 	protected abstract getContainerClasses(): string[];
 	protected abstract getActionsForItem(item: TDataItem, idx: number): IAction[];
 	protected abstract renderItem(item: TDataItem, idx: number): RowElementGroup;
 	protected abstract renderEdit(item: TDataItem, idx: number): HTMLElement;
-	protected abstract isItemNew(item: TDataItem): boolean;
 	protected abstract addTooltipsToRow(rowElement: RowElementGroup, item: TDataItem): void;
 	protected abstract getLocalizedStrings(): {
 		deleteActionTooltip: string;
@@ -202,6 +201,12 @@ export abstract class AbstractListSettingWidget<TDataItem extends object> extend
 		const newMode = this.model.items.some(item => !!(item.editing && this.isItemNew(item)));
 		this.container.classList.toggle('setting-list-hide-add-button', !this.isAddButtonVisible() || newMode);
 
+		if (this.model.items.length) {
+			this.listElement.tabIndex = 0;
+		} else {
+			this.listElement.removeAttribute('tabIndex');
+		}
+
 		const header = this.renderHeader();
 		const ITEM_HEIGHT = 24;
 		let listHeight = ITEM_HEIGHT * this.model.items.length;
@@ -662,7 +667,7 @@ export class ListSettingWidget extends AbstractListSettingWidget<IListDataItem>
 		return rowElement;
 	}
 
-	protected isItemNew(item: IListDataItem): boolean {
+	override isItemNew(item: IListDataItem): boolean {
 		return item.value.data === '';
 	}
 
@@ -822,7 +827,7 @@ export class ObjectSettingDropdownWidget extends AbstractListSettingWidget<IObje
 		super.setValue(listData);
 	}
 
-	isItemNew(item: IObjectDataItem): boolean {
+	override isItemNew(item: IObjectDataItem): boolean {
 		return item.key.data === '' && item.value.data === '';
 	}
 
@@ -1174,7 +1179,7 @@ export class ObjectSettingCheckboxWidget extends AbstractListSettingWidget<IObje
 		super.setValue(listData);
 	}
 
-	isItemNew(item: IObjectDataItem): boolean {
+	override isItemNew(item: IObjectDataItem): boolean {
 		return !item.key.data && !item.value.data;
 	}
 
diff --git a/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts b/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts
index fe9e6fc860f978..9bff790e24e43d 100644
--- a/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts
+++ b/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts
@@ -177,8 +177,8 @@ export class ClearCommandHistoryAction extends Action2 {
 
 	constructor() {
 		super({
-			id: 'workbench.action.clearCommandHistory',
-			title: { value: localize('clearCommandHistory', "Clear Command History"), original: 'Clear Command History' },
+			id: 'workbench.action.clearPreviousSessionCommandHistory',
+			title: { value: localize('clearPreviousSessionCommandHistory', "Clear Previous Session Command History"), original: 'Clear Previous Session Command History' },
 			f1: true
 		});
 	}
@@ -193,7 +193,7 @@ export class ClearCommandHistoryAction extends Action2 {
 
 			// Ask for confirmation
 			const { confirmed } = await dialogService.confirm({
-				message: localize('confirmClearMessage', "Do you want to clear the history of recently used commands?"),
+				message: localize('confirmClearMessage', "Do you want to clear the previous session command history?"),
 				detail: localize('confirmClearDetail', "This action is irreversible!"),
 				primaryButton: localize({ key: 'clearButtonLabel', comment: ['&& denotes a mnemonic'] }, "&&Clear"),
 				type: 'warning'
diff --git a/src/vs/workbench/contrib/remote/browser/media/tunnelView.css b/src/vs/workbench/contrib/remote/browser/media/tunnelView.css
index 60ac7f2d491d26..70a8ba93492ef3 100644
--- a/src/vs/workbench/contrib/remote/browser/media/tunnelView.css
+++ b/src/vs/workbench/contrib/remote/browser/media/tunnelView.css
@@ -101,3 +101,7 @@
 	background-repeat: no-repeat;
 	padding: 2px;
 }
+
+.monaco-workbench .codicon.codicon-ports-forwarded-with-process-icon {
+	color: var(--vscode-ports-iconRunningProcessForeground);
+}
diff --git a/src/vs/workbench/contrib/remote/browser/remote.ts b/src/vs/workbench/contrib/remote/browser/remote.ts
index 325f5e35b6c9d1..94bf4f824aa653 100644
--- a/src/vs/workbench/contrib/remote/browser/remote.ts
+++ b/src/vs/workbench/contrib/remote/browser/remote.ts
@@ -52,6 +52,7 @@ import { ILogService } from 'vs/platform/log/common/log';
 import { ITimerService } from 'vs/workbench/services/timer/browser/timerService';
 import { getRemoteName } from 'vs/platform/remote/common/remoteHosts';
 import { IActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
+import { connectionHealthToString } from 'vs/base/parts/ipc/common/ipc.net';
 
 interface HelpInformation {
 	extensionDescription: IExtensionDescription;
@@ -472,8 +473,7 @@ class RemoteViewPaneContainer extends FilterViewPaneContainer implements IViewMo
 		@IThemeService themeService: IThemeService,
 		@IContextMenuService contextMenuService: IContextMenuService,
 		@IExtensionService extensionService: IExtensionService,
-		@IRemoteExplorerService readonly remoteExplorerService: IRemoteExplorerService,
-		@IWorkbenchEnvironmentService readonly environmentService: IWorkbenchEnvironmentService,
+		@IRemoteExplorerService private readonly remoteExplorerService: IRemoteExplorerService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IViewDescriptorService viewDescriptorService: IViewDescriptorService
 	) {
@@ -963,6 +963,26 @@ export class RemoteAgentConnectionStatusListener extends Disposable implements I
 
 						hideProgress();
 						break;
+
+					case PersistentConnectionEventType.ConnectionHealthChanged:
+						type RemoteConnectionHealthClassification = {
+							owner: 'alexdima';
+							comment: 'The remote connection health has changed (round trip time)';
+							remoteName: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'The name of the resolver.' };
+							reconnectionToken: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'The identifier of the connection.' };
+							connectionHealth: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'The health of the connection: good or poor.' };
+						};
+						type RemoteConnectionHealthEvent = {
+							remoteName: string | undefined;
+							reconnectionToken: string;
+							connectionHealth: 'good' | 'poor';
+						};
+						telemetryService.publicLog2<RemoteConnectionHealthEvent, RemoteConnectionHealthClassification>('remoteConnectionHealth', {
+							remoteName: getRemoteName(environmentService.remoteAuthority),
+							reconnectionToken: e.reconnectionToken,
+							connectionHealth: connectionHealthToString(e.connectionHealth)
+						});
+						break;
 				}
 			});
 		}
diff --git a/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts b/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
index 1d76b0416c57d4..cab4ad70c6204e 100644
--- a/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
+++ b/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
@@ -5,7 +5,7 @@
 import * as nls from 'vs/nls';
 import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { Extensions, IViewContainersRegistry, IViewsRegistry, IViewsService, ViewContainer, ViewContainerLocation } from 'vs/workbench/common/views';
+import { Extensions, IViewContainersRegistry, IViewsRegistry, ViewContainer, ViewContainerLocation } from 'vs/workbench/common/views';
 import { Attributes, AutoTunnelSource, IRemoteExplorerService, makeAddress, mapHasAddressLocalhostOrAllInterfaces, OnPortForward, PORT_AUTO_FORWARD_SETTING, PORT_AUTO_SOURCE_SETTING, PORT_AUTO_SOURCE_SETTING_OUTPUT, PORT_AUTO_SOURCE_SETTING_PROCESS, TUNNEL_VIEW_CONTAINER_ID, TUNNEL_VIEW_ID } from 'vs/workbench/services/remote/common/remoteExplorerService';
 import { forwardedPortsViewEnabled, ForwardPortAction, OpenPortInBrowserAction, TunnelPanel, TunnelPanelDescriptor, TunnelViewModel, OpenPortInPreviewAction, openPreviewEnabledContext } from 'vs/workbench/contrib/remote/browser/tunnelView';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
@@ -152,8 +152,8 @@ export class ForwardedPortsView extends Disposable implements IWorkbenchContribu
 
 export class PortRestore implements IWorkbenchContribution {
 	constructor(
-		@IRemoteExplorerService readonly remoteExplorerService: IRemoteExplorerService,
-		@ILogService readonly logService: ILogService
+		@IRemoteExplorerService private readonly remoteExplorerService: IRemoteExplorerService,
+		@ILogService private readonly logService: ILogService
 	) {
 		if (!this.remoteExplorerService.tunnelModel.environmentTunnelsSet) {
 			Event.once(this.remoteExplorerService.tunnelModel.onEnvironmentTunnelsSet)(async () => {
@@ -174,23 +174,22 @@ export class PortRestore implements IWorkbenchContribution {
 export class AutomaticPortForwarding extends Disposable implements IWorkbenchContribution {
 
 	constructor(
-		@ITerminalService readonly terminalService: ITerminalService,
-		@INotificationService readonly notificationService: INotificationService,
-		@IOpenerService readonly openerService: IOpenerService,
-		@IExternalUriOpenerService readonly externalOpenerService: IExternalUriOpenerService,
-		@IViewsService readonly viewsService: IViewsService,
-		@IRemoteExplorerService readonly remoteExplorerService: IRemoteExplorerService,
-		@IWorkbenchEnvironmentService readonly environmentService: IWorkbenchEnvironmentService,
-		@IContextKeyService readonly contextKeyService: IContextKeyService,
-		@IConfigurationService readonly configurationService: IConfigurationService,
-		@IDebugService readonly debugService: IDebugService,
-		@IRemoteAgentService readonly remoteAgentService: IRemoteAgentService,
-		@ITunnelService readonly tunnelService: ITunnelService,
-		@IHostService readonly hostService: IHostService,
-		@ILogService readonly logService: ILogService
+		@ITerminalService terminalService: ITerminalService,
+		@INotificationService notificationService: INotificationService,
+		@IOpenerService openerService: IOpenerService,
+		@IExternalUriOpenerService externalOpenerService: IExternalUriOpenerService,
+		@IRemoteExplorerService remoteExplorerService: IRemoteExplorerService,
+		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IConfigurationService configurationService: IConfigurationService,
+		@IDebugService debugService: IDebugService,
+		@IRemoteAgentService remoteAgentService: IRemoteAgentService,
+		@ITunnelService tunnelService: ITunnelService,
+		@IHostService hostService: IHostService,
+		@ILogService logService: ILogService
 	) {
 		super();
-		if (!this.environmentService.remoteAuthority) {
+		if (!environmentService.remoteAuthority) {
 			return;
 		}
 
@@ -201,7 +200,7 @@ export class AutomaticPortForwarding extends Disposable implements IWorkbenchCon
 				this._register(new OutputAutomaticPortForwarding(terminalService, notificationService, openerService, externalOpenerService,
 					remoteExplorerService, configurationService, debugService, tunnelService, hostService, logService, contextKeyService, () => false));
 			} else {
-				const useProc = () => (this.configurationService.getValue(PORT_AUTO_SOURCE_SETTING) === PORT_AUTO_SOURCE_SETTING_PROCESS);
+				const useProc = () => (configurationService.getValue(PORT_AUTO_SOURCE_SETTING) === PORT_AUTO_SOURCE_SETTING_PROCESS);
 				if (useProc()) {
 					this._register(new ProcAutomaticPortForwarding(configurationService, remoteExplorerService, notificationService,
 						openerService, externalOpenerService, tunnelService, hostService, logService, contextKeyService));
diff --git a/src/vs/workbench/contrib/remote/browser/tunnelFactory.ts b/src/vs/workbench/contrib/remote/browser/tunnelFactory.ts
index 4ea8ea00f02426..30e54e69b2cf7f 100644
--- a/src/vs/workbench/contrib/remote/browser/tunnelFactory.ts
+++ b/src/vs/workbench/contrib/remote/browser/tunnelFactory.ts
@@ -12,6 +12,8 @@ import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { URI } from 'vs/base/common/uri';
 import { IRemoteExplorerService } from 'vs/workbench/services/remote/common/remoteExplorerService';
 import { ILogService } from 'vs/platform/log/common/log';
+import { forwardedPortsViewEnabled } from 'vs/workbench/contrib/remote/browser/tunnelView';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 
 export class TunnelFactoryContribution extends Disposable implements IWorkbenchContribution {
 
@@ -20,11 +22,14 @@ export class TunnelFactoryContribution extends Disposable implements IWorkbenchC
 		@IBrowserWorkbenchEnvironmentService environmentService: IBrowserWorkbenchEnvironmentService,
 		@IOpenerService private openerService: IOpenerService,
 		@IRemoteExplorerService remoteExplorerService: IRemoteExplorerService,
-		@ILogService logService: ILogService
+		@ILogService logService: ILogService,
+		@IContextKeyService contextKeyService: IContextKeyService
 	) {
 		super();
 		const tunnelFactory = environmentService.options?.tunnelProvider?.tunnelFactory;
 		if (tunnelFactory) {
+			// At this point we clearly want the ports view/features since we have a tunnel factory
+			contextKeyService.createKey(forwardedPortsViewEnabled.key, true);
 			let privacyOptions = environmentService.options?.tunnelProvider?.features?.privacyOptions ?? [];
 			if (environmentService.options?.tunnelProvider?.features?.public
 				&& (privacyOptions.length === 0)) {
diff --git a/src/vs/workbench/contrib/remote/browser/tunnelView.ts b/src/vs/workbench/contrib/remote/browser/tunnelView.ts
index 8512acf564a9c3..34dd92a9f5772e 100644
--- a/src/vs/workbench/contrib/remote/browser/tunnelView.ts
+++ b/src/vs/workbench/contrib/remote/browser/tunnelView.ts
@@ -30,7 +30,7 @@ import { INotificationService, Severity } from 'vs/platform/notification/common/
 import { InputBox, MessageType } from 'vs/base/browser/ui/inputbox/inputBox';
 import { once } from 'vs/base/common/functional';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { IThemeService, registerThemingParticipant, ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { IThemeService, ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPane';
 import { URI } from 'vs/base/common/uri';
@@ -43,7 +43,7 @@ import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
 import { copyAddressIcon, forwardedPortWithoutProcessIcon, forwardedPortWithProcessIcon, forwardPortIcon, labelPortIcon, openBrowserIcon, openPreviewIcon, portsViewIcon, privatePortIcon, stopForwardIcon } from 'vs/workbench/contrib/remote/browser/remoteIcons';
 import { IExternalUriOpenerService } from 'vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService';
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { isMacintosh, isWeb } from 'vs/base/common/platform';
+import { isMacintosh } from 'vs/base/common/platform';
 import { ITableColumn, ITableContextMenuEvent, ITableEvent, ITableMouseEvent, ITableRenderer, ITableVirtualDelegate } from 'vs/base/browser/ui/table/table';
 import { WorkbenchTable } from 'vs/platform/list/browser/listService';
 import { Button } from 'vs/base/browser/ui/button/button';
@@ -737,7 +737,6 @@ const TunnelViewMultiSelectionKeyName = 'tunnelViewMultiSelection';
 // host:port[]
 const TunnelViewMultiSelectionContextKey = new RawContextKey<string[] | undefined>(TunnelViewMultiSelectionKeyName, undefined, true);
 const PortChangableContextKey = new RawContextKey<boolean>('portChangable', false, true);
-const WebContextKey = new RawContextKey<boolean>('isWeb', isWeb, true);
 
 export class TunnelPanel extends ViewPane {
 
@@ -1505,6 +1504,8 @@ namespace ChangeTunnelPrivacyAction {
 					source: arg.source
 				});
 			}
+
+			return undefined;
 		};
 	}
 }
@@ -1542,7 +1543,6 @@ const tunnelViewCommandsWeightBonus = 10; // give our commands a little bit more
 const isForwardedExpr = TunnelTypeContextKey.isEqualTo(TunnelType.Forwarded);
 const isForwardedOrDetectedExpr = ContextKeyExpr.or(isForwardedExpr, TunnelTypeContextKey.isEqualTo(TunnelType.Detected));
 const isNotMultiSelectionExpr = TunnelViewMultiSelectionContextKey.isEqualTo(undefined);
-const isNotPrivateExpr = ContextKeyExpr.and(TunnelPrivacyContextKey.notEqualsTo(TunnelPrivacyId.Private), TunnelPrivacyContextKey.notEqualsTo(TunnelPrivacyId.ConstantPrivate));
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: LabelTunnelAction.ID,
@@ -1630,7 +1630,6 @@ MenuRegistry.appendMenuItem(MenuId.TunnelContext, ({
 		title: OpenPortInPreviewAction.LABEL,
 	},
 	when: ContextKeyExpr.and(
-		ContextKeyExpr.or(WebContextKey.negate(), isNotPrivateExpr, openPreviewEnabledContext), //todo
 		isForwardedOrDetectedExpr,
 		isNotMultiSelectionExpr)
 }));
@@ -1769,22 +1768,13 @@ MenuRegistry.appendMenuItem(MenuId.TunnelLocalAddressInline, ({
 		title: OpenPortInPreviewAction.LABEL,
 		icon: openPreviewIcon
 	},
-	when: ContextKeyExpr.and(
-		ContextKeyExpr.or(WebContextKey.negate(), isNotPrivateExpr, openPreviewEnabledContext),
-		isForwardedOrDetectedExpr)
+	when: isForwardedOrDetectedExpr
 }));
 
-const portWithRunningProcessForeground = registerColor('ports.iconRunningProcessForeground', {
+registerColor('ports.iconRunningProcessForeground', {
 	light: STATUS_BAR_HOST_NAME_BACKGROUND,
 	dark: STATUS_BAR_HOST_NAME_BACKGROUND,
 	hcDark: STATUS_BAR_HOST_NAME_BACKGROUND,
 	hcLight: STATUS_BAR_HOST_NAME_BACKGROUND
 }, nls.localize('portWithRunningProcess.foreground', "The color of the icon for a port that has an associated running process."));
 
-registerThemingParticipant((theme, collector) => {
-	const portWithRunningProcessColor = theme.getColor(portWithRunningProcessForeground);
-	if (portWithRunningProcessColor) {
-		collector.addRule(`.monaco-workbench ${ThemeIcon.asCSSSelector(forwardedPortWithProcessIcon)} { color: ${portWithRunningProcessColor} ; }`);
-	}
-
-});
diff --git a/src/vs/workbench/contrib/remote/common/remote.contribution.ts b/src/vs/workbench/contrib/remote/common/remote.contribution.ts
index d95a33548dc38c..88d2a14aff54f0 100644
--- a/src/vs/workbench/contrib/remote/common/remote.contribution.ts
+++ b/src/vs/workbench/contrib/remote/common/remote.contribution.ts
@@ -363,6 +363,11 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
 				],
 				default: 'process'
 			},
+			'remote.forwardOnOpen': {
+				type: 'boolean',
+				description: localize('remote.forwardOnClick', "Controls whether local URLs with a port will be forwarded when opened from the terminal and the debug console."),
+				default: true
+			},
 			// Consider making changes to extensions\configuration-editing\schemas\devContainer.schema.src.json
 			// and extensions\configuration-editing\schemas\attachContainer.schema.json
 			// to keep in sync with devcontainer.json schema.
diff --git a/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts b/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts
index 9fb30ca3f45339..4244735496bf27 100644
--- a/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts
+++ b/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts
@@ -51,6 +51,10 @@ export const REMOTE_TUNNEL_CONNECTION_STATE = new RawContextKey<CONTEXT_KEY_STAT
 
 const SESSION_ID_STORAGE_KEY = 'remoteTunnelAccountPreference';
 
+const REMOTE_TUNNEL_USED_STORAGE_KEY = 'remoteTunnelServiceUsed';
+const REMOTE_TUNNEL_PROMPTED_PREVIEW_STORAGE_KEY = 'remoteTunnelServicePromptedPreview';
+const REMOTE_TUNNEL_EXTENSION_RECOMMENDED_KEY = 'remoteTunnelExtensionRecommended';
+
 type ExistingSessionItem = { session: AuthenticationSession; providerId: string; label: string; description: string };
 type IAuthenticationProvider = { id: string; scopes: string[] };
 type AuthenticationProviderOption = IQuickPickItem & { provider: IAuthenticationProvider };
@@ -103,6 +107,7 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo
 		@ICommandService private commandService: ICommandService,
 		@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService,
 		@IProgressService private progressService: IProgressService,
+		@INotificationService private notificationService: INotificationService
 	) {
 		super();
 
@@ -148,6 +153,8 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo
 		registerLogChannel(LOG_CHANNEL_ID, localize('remoteTunnelLog', "Remote Tunnel Service"), remoteTunnelServiceLogResource, fileService, logService);
 
 		this.initialize();
+
+		this.recommendRemoteExtensionIfNeeded();
 	}
 
 	private get existingSessionId() {
@@ -163,6 +170,68 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo
 		}
 	}
 
+	private async recommendRemoteExtensionIfNeeded() {
+		const remoteExtension = this.serverConfiguration.extension;
+		const shouldRecommend = async () => {
+			if (this.storageService.getBoolean(REMOTE_TUNNEL_EXTENSION_RECOMMENDED_KEY, StorageScope.APPLICATION)) {
+				return false;
+			}
+			if (await this.extensionService.getExtension(remoteExtension.extensionId)) {
+				return false;
+			}
+			const usedOnHost = this.storageService.get(REMOTE_TUNNEL_USED_STORAGE_KEY, StorageScope.APPLICATION);
+			if (!usedOnHost) {
+				return false;
+			}
+			const currentHostName = await this.remoteTunnelService.getHostName();
+			if (!currentHostName || currentHostName === usedOnHost) {
+				return false;
+			}
+			return usedOnHost;
+		};
+		const recommed = async () => {
+			const usedOnHost = await shouldRecommend();
+			if (!usedOnHost) {
+				return false;
+			}
+			this.notificationService.notify({
+				severity: Severity.Info,
+				message:
+					localize(
+						{
+							key: 'recommend.remoteExtension',
+							comment: ['{0} will be a host name, {1} will the link address to the web UI, {6} an extension name. [label](command:commandId) is a markdown link. Only translate the label, do not modify the format']
+						},
+						"'{0}' has turned on remote access. The {1} extension can be used to connect to it.",
+						usedOnHost, remoteExtension.friendlyName
+					),
+				actions: {
+					primary: [
+						new Action('showExtension', localize('action.showExtension', "Show Extension"), undefined, true, () => {
+							return this.commandService.executeCommand('workbench.extensions.action.showExtensionsWithIds', [remoteExtension.extensionId]);
+						}),
+						new Action('doNotShowAgain', localize('action.doNotShowAgain', "Do not show again"), undefined, true, () => {
+							this.storageService.store(REMOTE_TUNNEL_EXTENSION_RECOMMENDED_KEY, true, StorageScope.APPLICATION, StorageTarget.USER);
+						}),
+					]
+				}
+			});
+			return true;
+		};
+		if (await shouldRecommend()) {
+			const storageListener = this.storageService.onDidChangeValue(async e => {
+				if (e.key === REMOTE_TUNNEL_USED_STORAGE_KEY) {
+					const success = await recommed();
+					if (success) {
+						storageListener.dispose();
+					}
+
+				}
+			});
+		}
+	}
+
+
 	private async initialize(): Promise<void> {
 		const status = await this.remoteTunnelService.getTunnelStatus();
 		if (status.type === 'connected') {
@@ -418,6 +487,22 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo
 				const notificationService = accessor.get(INotificationService);
 				const clipboardService = accessor.get(IClipboardService);
 				const commandService = accessor.get(ICommandService);
+				const storageService = accessor.get(IStorageService);
+				const dialogService = accessor.get(IDialogService);
+
+				const didNotifyPreview = storageService.getBoolean(REMOTE_TUNNEL_PROMPTED_PREVIEW_STORAGE_KEY, StorageScope.APPLICATION, false);
+				if (!didNotifyPreview) {
+					const result = await dialogService.confirm({
+						message: localize('tunnel.preview', 'Remote Tunnels is currently in preview. Please report any problems using the "Help: Report Issue" command.'),
+						primaryButton: localize('enable', 'Enable'),
+						secondaryButton: localize('cancel', 'Cancel'),
+					});
+					if (!result.confirmed) {
+						return;
+					}
+
+					storageService.store(REMOTE_TUNNEL_PROMPTED_PREVIEW_STORAGE_KEY, true, StorageScope.APPLICATION, StorageTarget.USER);
+				}
 
 				const connectionInfo = await that.startTunnel(false);
 				if (connectionInfo) {
@@ -443,6 +528,7 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo
 							]
 						}
 					});
+					storageService.store(REMOTE_TUNNEL_USED_STORAGE_KEY, connectionInfo.hostName, StorageScope.APPLICATION, StorageTarget.USER);
 				} else {
 					await notificationService.notify({
 						severity: Severity.Info,
@@ -478,7 +564,7 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo
 			constructor() {
 				super({
 					id: RemoteTunnelCommandIds.connecting,
-					title: localize('remoteTunnel.actions.manage.connecting', 'Remote Tunnel Access in Connecting'),
+					title: localize('remoteTunnel.actions.manage.connecting', 'Remote Tunnel Access is Connecting'),
 					category: REMOTE_TUNNEL_CATEGORY,
 					menu: [{
 						id: MenuId.AccountsContext,
@@ -667,9 +753,9 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
 		[CONFIGURATION_KEY_HOST_NAME]: {
 			description: localize('remoteTunnelAccess.machineName', "The name under which the remote tunnel access is registered. If not set, the host name is used."),
 			type: 'string',
-			scope: ConfigurationScope.APPLICATION,
-			pattern: '^[\\w-]*$',
-			patternErrorMessage: localize('remoteTunnelAccess.machineNameRegex', "The name can only consist of letters, numbers, underscore and minus."),
+			scope: ConfigurationScope.MACHINE,
+			pattern: '^\\w[\\w-]*$',
+			patternErrorMessage: localize('remoteTunnelAccess.machineNameRegex', "The name must only consist of letters, numbers, underscore and dash. It must not start with a dash."),
 			maxLength: 20,
 			default: ''
 		}
diff --git a/src/vs/workbench/contrib/scm/browser/activity.ts b/src/vs/workbench/contrib/scm/browser/activity.ts
index 5c3774a094976a..8593459ec05f7b 100644
--- a/src/vs/workbench/contrib/scm/browser/activity.ts
+++ b/src/vs/workbench/contrib/scm/browser/activity.ts
@@ -40,7 +40,6 @@ export class SCMStatusController implements IWorkbenchContribution {
 		@ISCMService private readonly scmService: ISCMService,
 		@ISCMViewService private readonly scmViewService: ISCMViewService,
 		@IStatusbarService private readonly statusbarService: IStatusbarService,
-		@IContextKeyService readonly contextKeyService: IContextKeyService,
 		@IActivityService private readonly activityService: IActivityService,
 		@IEditorService private readonly editorService: IEditorService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
@@ -154,8 +153,22 @@ export class SCMStatusController implements IWorkbenchContribution {
 			const command = commands[index];
 			const tooltip = `${label}${command.tooltip ? ` - ${command.tooltip}` : ''}`;
 
+			// Get a repository agnostic name for the status bar action, derive this from the
+			// first command argument which is in the form "git.<command>/<number>"
+			let repoAgnosticActionName = command.arguments?.[0];
+			if (repoAgnosticActionName && typeof repoAgnosticActionName === 'string') {
+				repoAgnosticActionName = repoAgnosticActionName
+					.substring(0, repoAgnosticActionName.lastIndexOf('/'))
+					.replace(/^git\./, '');
+				if (repoAgnosticActionName.length > 1) {
+					repoAgnosticActionName = repoAgnosticActionName[0].toLocaleUpperCase() + repoAgnosticActionName.slice(1);
+				}
+			} else {
+				repoAgnosticActionName = '';
+			}
+
 			disposables.add(this.statusbarService.addEntry({
-				name: localize('status.scm', "Source Control"),
+				name: localize('status.scm', "Source Control") + (repoAgnosticActionName ? ` ${repoAgnosticActionName}` : ''),
 				text: command.title,
 				ariaLabel: tooltip,
 				tooltip,
@@ -203,7 +216,7 @@ export class SCMActiveResourceContextKeyController implements IWorkbenchContribu
 	private repositoryDisposables = new Set<IDisposable>();
 
 	constructor(
-		@IContextKeyService readonly contextKeyService: IContextKeyService,
+		@IContextKeyService contextKeyService: IContextKeyService,
 		@IEditorService private readonly editorService: IEditorService,
 		@ISCMService private readonly scmService: ISCMService,
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService
diff --git a/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts b/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
index de57adb944963d..870096edc94e15 100644
--- a/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
+++ b/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
@@ -26,6 +26,7 @@ import { IContextKeyService, IContextKey, ContextKeyExpr, RawContextKey } from '
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { Position } from 'vs/editor/common/core/position';
+import { Range } from 'vs/editor/common/core/range';
 import { rot } from 'vs/base/common/numbers';
 import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { EmbeddedDiffEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget';
@@ -354,8 +355,8 @@ class DirtyDiffWidget extends PeekViewWidget {
 		});
 	}
 
-	protected override revealLine(lineNumber: number) {
-		this.editor.revealLineInCenterIfOutsideViewport(lineNumber, ScrollType.Smooth);
+	protected override revealRange(range: Range) {
+		this.editor.revealLineInCenterIfOutsideViewport(range.endLineNumber, ScrollType.Smooth);
 	}
 
 	hasFocus(): boolean {
diff --git a/src/vs/workbench/contrib/scm/browser/media/scm.css b/src/vs/workbench/contrib/scm/browser/media/scm.css
index 37a9d5a75e2e35..e375da4b32827f 100644
--- a/src/vs/workbench/contrib/scm/browser/media/scm.css
+++ b/src/vs/workbench/contrib/scm/browser/media/scm.css
@@ -200,16 +200,8 @@
 	border-radius: 2px;
 }
 
-.scm-view .scm-input .margin {
-	width: 6px !important;
-}
-
-.scm-input .monaco-scrollable-element {
-	left: 6px !important;
-}
-
 .scm-view .scm-editor-container .monaco-editor {
-	border-radius: 2px !important;
+	border-radius: 2px;
 }
 
 .scm-view .scm-editor-container .monaco-editor .focused .selected-text {
@@ -237,9 +229,7 @@
 	flex-wrap: wrap;
 	padding: 0 4px;
 	overflow: hidden;
-	height: 30px;
-	line-height: 20px;
-	border: 1px solid var(--vscode-button-background);
+	height: 28px;
 }
 
 .scm-view .button-container .monaco-description-button:hover {
@@ -265,15 +255,13 @@
 
 .scm-view .button-container .codicon.codicon-cloud-upload,
 .scm-view .button-container .codicon.codicon-sync {
-	line-height: 20px;
-	margin: 0 0.4em 0 0;
+	margin: 0 4px 0 0;
 }
 
 .scm-view .button-container .codicon.codicon-arrow-up,
 .scm-view .button-container .codicon.codicon-arrow-down {
-	line-height: 20px;
 	font-size: small !important;
-	margin: 0 0.2em 0 0;
+	margin: 0 4px 0 0;
 }
 
 .scm-view .button-container > .monaco-button-dropdown {
@@ -309,13 +297,13 @@
 .scm-view .scm-editor-container {
 	position: relative;
 	box-sizing: border-box;
-	padding: 1px;
-	outline-offset: -1px;
-	outline: 1px solid var(--vscode-input-border);
+	background-color: var(--vscode-input-background);
+	border: 1px solid var(--vscode-input-border, transparent);
 	border-radius: 2px;
 }
 
-.scm-view .scm-editor-container.synthetic-focus {
+.scm-view .scm-editor-container.synthetic-focus,
+.monaco-workbench .part.panel .scm-view .scm-editor-container.synthetic-focus {
 	outline: 1px solid var(--vscode-focusBorder);
 }
 
@@ -392,7 +380,7 @@
 	position: absolute;
 	pointer-events: none;
 	z-index: 1;
-	padding: 2px 6px 3px 6px;
+	padding: 2px 6px;
 	box-sizing: border-box;
 	width: 100%;
 	overflow: hidden;
@@ -407,9 +395,12 @@
 
 .scm-view .scm-editor-container .monaco-editor-background,
 .scm-view .scm-editor-container .monaco-editor,
-.scm-view .scm-editor-container .monaco-editor .margin {
+.scm-view .scm-editor-container .monaco-editor .margin,
+.monaco-workbench .part.basepanel > .content .scm-view .scm-editor-container .monaco-editor,
+.monaco-workbench .part.basepanel > .content .scm-view .scm-editor-container .monaco-editor .margin,
+.monaco-workbench .part.basepanel > .content .scm-view .scm-editor-container .monaco-editor .monaco-editor-background {
 	color: inherit;
-	background-color: var(--vscode-input-background);
+	background-color: unset
 }
 
 .scm-view .scm-editor-container .mtk1 {
diff --git a/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.ts b/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.ts
index 2ae3e55f4d0f8d..c8dd87e468149d 100644
--- a/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.ts
@@ -11,9 +11,7 @@ import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IAction } from 'vs/base/common/actions';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { connectPrimaryMenu, isSCMRepository, StatusBarAction } from './util';
-import { attachBadgeStyler } from 'vs/platform/theme/common/styler';
 import { ITreeNode } from 'vs/base/browser/ui/tree/tree';
 import { ICompressibleTreeRenderer } from 'vs/base/browser/ui/tree/objectTree';
 import { FuzzyScore } from 'vs/base/common/filters';
@@ -22,6 +20,7 @@ import { IListRenderer } from 'vs/base/browser/ui/list/list';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { basename } from 'vs/base/common/resources';
 import { IActionViewItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
+import { defaultCountBadgeStyles } from 'vs/platform/theme/browser/defaultStyles';
 
 interface RepositoryTemplate {
 	readonly label: HTMLElement;
@@ -44,7 +43,6 @@ export class RepositoryRenderer implements ICompressibleTreeRenderer<ISCMReposit
 		@ISCMViewService private scmViewService: ISCMViewService,
 		@ICommandService private commandService: ICommandService,
 		@IContextMenuService private contextMenuService: IContextMenuService,
-		@IThemeService private themeService: IThemeService,
 		@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService,
 	) { }
 
@@ -61,11 +59,10 @@ export class RepositoryRenderer implements ICompressibleTreeRenderer<ISCMReposit
 		const actions = append(provider, $('.actions'));
 		const toolBar = new ToolBar(actions, this.contextMenuService, { actionViewItemProvider: this.actionViewItemProvider });
 		const countContainer = append(provider, $('.count'));
-		const count = new CountBadge(countContainer);
-		const badgeStyler = attachBadgeStyler(count, this.themeService);
+		const count = new CountBadge(countContainer, {}, defaultCountBadgeStyles);
 		const visibilityDisposable = toolBar.onDidChangeDropdownVisibility(e => provider.classList.toggle('active', e));
 
-		const templateDisposable = combinedDisposable(visibilityDisposable, toolBar, badgeStyler);
+		const templateDisposable = combinedDisposable(visibilityDisposable, toolBar);
 
 		return { label, name, description, countContainer, count, toolBar, elementDisposables: new DisposableStore(), templateDisposable };
 	}
diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
index 4687519aa9285d..6f1f0f7d5d5741 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
@@ -24,7 +24,6 @@ import { IAction, ActionRunner, Action, Separator } from 'vs/base/common/actions
 import { ActionBar, IActionViewItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IThemeService, IFileIconTheme, ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { isSCMResource, isSCMResourceGroup, connectPrimaryMenuToInlineActionBar, isSCMRepository, isSCMInput, collectContextMenuActions, getActionViewItemProvider, isSCMActionButton } from './util';
-import { attachBadgeStyler } from 'vs/platform/theme/common/styler';
 import { WorkbenchCompressibleObjectTree, IOpenEvent } from 'vs/platform/list/browser/listService';
 import { IConfigurationService, ConfigurationTarget, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
 import { disposableTimeout, ThrottledDelayer } from 'vs/base/common/async';
@@ -88,8 +87,7 @@ import { DragAndDropController } from 'vs/editor/contrib/dnd/browser/dnd';
 import { DropIntoEditorController } from 'vs/editor/contrib/dropIntoEditor/browser/dropIntoEditorContribution';
 import { MessageController } from 'vs/editor/contrib/message/browser/messageController';
 import { contrastBorder, registerColor } from 'vs/platform/theme/common/colorRegistry';
-import { defaultButtonStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { EditorOptions } from 'vs/editor/common/config/editorOptions';
+import { defaultButtonStyles, defaultCountBadgeStyles } from 'vs/platform/theme/browser/defaultStyles';
 
 type TreeElement = ISCMRepository | ISCMInput | ISCMActionButton | ISCMResourceGroup | IResourceNode<ISCMResource, ISCMResourceGroup> | ISCMResource;
 
@@ -305,8 +303,7 @@ class ResourceGroupRenderer implements ICompressibleTreeRenderer<ISCMResourceGro
 
 	constructor(
 		private actionViewItemProvider: IActionViewItemProvider,
-		@ISCMViewService private scmViewService: ISCMViewService,
-		@IThemeService private themeService: IThemeService,
+		@ISCMViewService private scmViewService: ISCMViewService
 	) { }
 
 	renderTemplate(container: HTMLElement): ResourceGroupTemplate {
@@ -318,9 +315,8 @@ class ResourceGroupRenderer implements ICompressibleTreeRenderer<ISCMResourceGro
 		const actionsContainer = append(element, $('.actions'));
 		const actionBar = new ActionBar(actionsContainer, { actionViewItemProvider: this.actionViewItemProvider });
 		const countContainer = append(element, $('.count'));
-		const count = new CountBadge(countContainer);
-		const styler = attachBadgeStyler(count, this.themeService);
-		const disposables = combinedDisposable(actionBar, styler);
+		const count = new CountBadge(countContainer, {}, defaultCountBadgeStyles);
+		const disposables = combinedDisposable(actionBar);
 
 		return { name, count, actionBar, elementDisposables: new DisposableStore(), disposables };
 	}
@@ -1921,9 +1917,9 @@ class SCMInputWidget {
 		const fontFamily = this.getInputEditorFontFamily();
 		const fontSize = this.getInputEditorFontSize();
 		const lineHeight = this.computeLineHeight(fontSize);
-		// We respect the configured `editor.accessibilitySupport` setting to be able to have wrapping
-		// even when a screen reader is attached.
+		// We must respect some accessibility related settings
 		const accessibilitySupport = this.configurationService.getValue<'auto' | 'off' | 'on'>('editor.accessibilitySupport');
+		const cursorBlinking = this.configurationService.getValue<'blink' | 'smooth' | 'phase' | 'expand' | 'solid'>('editor.cursorBlinking');
 
 		this.setPlaceholderFontStyles(fontFamily, fontSize, lineHeight);
 
@@ -1932,7 +1928,7 @@ class SCMInputWidget {
 
 		const editorOptions: IEditorConstructionOptions = {
 			...getSimpleEditorOptions(),
-			lineDecorationsWidth: 4,
+			lineDecorationsWidth: 6,
 			dragAndDrop: true,
 			cursorWidth: 1,
 			fontSize: fontSize,
@@ -1940,13 +1936,14 @@ class SCMInputWidget {
 			fontFamily: fontFamily,
 			wrappingStrategy: 'advanced',
 			wrappingIndent: 'none',
-			padding: { top: 3, bottom: 3 },
+			padding: { top: 2, bottom: 2 },
 			quickSuggestions: false,
 			scrollbar: { alwaysConsumeMouseWheel: false },
 			overflowWidgetsDomNode,
 			renderWhitespace: 'none',
 			dropIntoEditor: { enabled: true },
-			accessibilitySupport
+			accessibilitySupport,
+			cursorBlinking
 		};
 
 		const codeEditorWidgetOptions: ICodeEditorWidgetOptions = {
@@ -2005,10 +2002,11 @@ class SCMInputWidget {
 			'scm.inputFontFamily',
 			'editor.fontFamily', // When `scm.inputFontFamily` is 'editor', we use it as an effective value
 			'scm.inputFontSize',
-			'editor.accessibilitySupport'
+			'editor.accessibilitySupport',
+			'editor.cursorBlinking'
 		];
 
-		const onInputFontFamilyChanged = Event.filter(
+		const onRelevantSettingChanged = Event.filter(
 			this.configurationService.onDidChangeConfiguration,
 			(e) => {
 				for (const setting of relevantSettings) {
@@ -2020,17 +2018,19 @@ class SCMInputWidget {
 			},
 			this.disposables
 		);
-		this.disposables.add(onInputFontFamilyChanged(() => {
+		this.disposables.add(onRelevantSettingChanged(() => {
 			const fontFamily = this.getInputEditorFontFamily();
 			const fontSize = this.getInputEditorFontSize();
 			const lineHeight = this.computeLineHeight(fontSize);
 			const accessibilitySupport = this.configurationService.getValue<'auto' | 'off' | 'on'>('editor.accessibilitySupport');
+			const cursorBlinking = this.configurationService.getValue<'blink' | 'smooth' | 'phase' | 'expand' | 'solid'>('editor.cursorBlinking');
 
 			this.inputEditor.updateOptions({
 				fontFamily: fontFamily,
 				fontSize: fontSize,
 				lineHeight: lineHeight,
-				accessibilitySupport
+				accessibilitySupport,
+				cursorBlinking
 			});
 
 			this.setPlaceholderFontStyles(fontFamily, fontSize, lineHeight);
@@ -2148,7 +2148,7 @@ class SCMInputWidget {
 		const inputFontFamily = this.configurationService.getValue<string>('scm.inputFontFamily').trim();
 
 		if (inputFontFamily.toLowerCase() === 'editor') {
-			return EditorOptions.fontFamily.validate(this.configurationService.getValue<string | string[]>('editor.fontFamily')).trim();
+			return this.configurationService.getValue<string>('editor.fontFamily').trim();
 		}
 
 		if (inputFontFamily.length !== 0 && inputFontFamily.toLowerCase() !== 'default') {
diff --git a/src/vs/workbench/contrib/search/browser/media/searchview.css b/src/vs/workbench/contrib/search/browser/media/searchview.css
index ad635384a04878..d15057243c48f8 100644
--- a/src/vs/workbench/contrib/search/browser/media/searchview.css
+++ b/src/vs/workbench/contrib/search/browser/media/searchview.css
@@ -11,7 +11,8 @@
 
 .search-view .results {
 	flex-grow: 1;
-	min-height: 0; /* Allow it to be smaller than its contents */
+	min-height: 0;
+	/* Allow it to be smaller than its contents */
 }
 
 .search-view .search-widgets-container {
@@ -36,6 +37,14 @@
 	justify-content: center;
 }
 
+.monaco-workbench .search-view .search-widget .toggle-replace-button:hover {
+	background-color: var(--vscode-toolbar-hoverBackground)
+}
+
+.monaco-workbench .search-view .search-widget .toggle-replace-button:active {
+	background-color: var(--vscode-toolbar-activeBackground)
+}
+
 .search-view .search-widget .search-container,
 .search-view .search-widget .replace-container {
 	margin-left: 18px;
@@ -47,13 +56,13 @@
 
 .search-view .search-widget .monaco-inputbox > .ibwrapper > .mirror,
 .search-view .search-widget .monaco-inputbox > .ibwrapper > textarea.input {
-	padding: 3px 0px 3px 4px;
+	padding: 3px 0px 3px 6px;
 }
 
 /* NOTE: height is also used in searchWidget.ts as a constant*/
 .search-view .search-widget .monaco-inputbox > .ibwrapper > textarea.input {
 	overflow: initial;
-	height: 24px; /* set initial height before measure */
+	height: 26px; /* set initial height before measure */
 }
 
 .search-view .search-widget .monaco-findInput .monaco-scrollable-element .scrollbar {
@@ -163,6 +172,15 @@
 	-webkit-user-select: text;
 }
 
+.search-view .message a {
+	color: var(--vscode-textLink-foreground);
+}
+
+.search-view .message a:hover,
+.search-view .message a:active {
+	color: var(--vscode-textLink-activeForeground);
+}
+
 .search-view .foldermatch,
 .search-view .filematch {
 	display: flex;
@@ -277,6 +295,14 @@
 
 .search-view .replace.findInFileMatch {
 	text-decoration: line-through;
+	background-color: var(--vscode-diffEditor-removedTextBackground);
+	border: 1px solid var(--vscode-diffEditor-removedTextBackground);
+}
+
+/* High Contrast Theming */
+.monaco-workbench.hc-light .search-view .replace.findInFileMatch,
+.monaco-workbench.hc-dark .search-view .replace.findInFileMatch {
+	border: 1px dashed var(--vscode-diffEditor-removedTextBackground);
 }
 
 .search-view .findInFileMatch,
@@ -284,6 +310,22 @@
 	white-space: pre;
 }
 
+.search-view .findInFileMatch {
+	background-color: var(--vscode-editor-findMatchHighlightBackground);
+	border: 1px solid var(--vscode-editor-findMatchHighlightBorder);
+}
+
+/* High Contrast Theming */
+.monaco-workbench.hc-light .search-view .findInFileMatch,
+.monaco-workbench.hc-dark .search-view .findInFileMatch {
+	border: 1px dashed var(--vscode-editor-findMatchHighlightBorder);
+}
+
+.search-view .replaceMatch {
+	background-color: var(--vscode-diffEditor-insertedTextBackground);
+}
+
+/* High Contrast Theming */
 .monaco-workbench.hc-black .search-view .replaceMatch,
 .monaco-workbench.hc-black .search-view .findInFileMatch,
 .monaco-workbench.hc-light .search-view .replaceMatch,
@@ -292,8 +334,17 @@
 	box-sizing: border-box;
 }
 
+.search-view .replaceMatch:not(:empty) {
+	border: 1px solid var(--vscode-diffEditor-insertedLineBackground);
+}
+
 /* High Contrast Theming */
+.monaco-workbench.hc-light .search-view .replaceMatch:not(:empty),
+.monaco-workbench.hc-dark .search-view .replaceMatch:not(:empty) {
+	border: 1px dashed var(--vscode-diffEditor-insertedLineBackground);
+}
 
+/* High Contrast Theming */
 .monaco-workbench.hc-black .search-view .foldermatch,
 .monaco-workbench.hc-black .search-view .filematch,
 .monaco-workbench.hc-black .search-view .linematch,
@@ -317,3 +368,7 @@
 	top: 3px;
 	padding-right: 3px;
 }
+
+.monaco-workbench .search-view .monaco-list.element-focused .monaco-list-row.focused.selected:not(.highlighted) .action-label:focus {
+	outline-color: var(--vscode-list-activeSelectionForeground)
+}
diff --git a/src/vs/workbench/contrib/search/browser/search.contribution.ts b/src/vs/workbench/contrib/search/browser/search.contribution.ts
index b6f7417213322a..2940c53bd64d5f 100644
--- a/src/vs/workbench/contrib/search/browser/search.contribution.ts
+++ b/src/vs/workbench/contrib/search/browser/search.contribution.ts
@@ -180,7 +180,7 @@ configurationRegistry.registerConfiguration({
 		},
 		'search.useGlobalIgnoreFiles': {
 			type: 'boolean',
-			markdownDescription: nls.localize('useGlobalIgnoreFiles', "Controls whether to use global `.gitignore` and `.ignore` files when searching for files. Requires `#search.useIgnoreFiles#` to be enabled."),
+			markdownDescription: nls.localize('useGlobalIgnoreFiles', "Controls whether to use your global gitignore file (e.g., from `$HOME/.config/git/ignore`) when searching for files. Requires `#search.useIgnoreFiles#` to be enabled."),
 			default: false,
 			scope: ConfigurationScope.RESOURCE
 		},
@@ -300,11 +300,11 @@ configurationRegistry.registerConfiguration({
 			enum: ['selectWord', 'goToLocation', 'openLocationToSide'],
 			default: 'goToLocation',
 			enumDescriptions: [
-				nls.localize('search.searchEditor.doubleClickBehaviour.selectWord', "Double clicking selects the word under the cursor."),
-				nls.localize('search.searchEditor.doubleClickBehaviour.goToLocation', "Double clicking opens the result in the active editor group."),
-				nls.localize('search.searchEditor.doubleClickBehaviour.openLocationToSide', "Double clicking opens the result in the editor group to the side, creating one if it does not yet exist."),
+				nls.localize('search.searchEditor.doubleClickBehaviour.selectWord', "Double-clicking selects the word under the cursor."),
+				nls.localize('search.searchEditor.doubleClickBehaviour.goToLocation', "Double-clicking opens the result in the active editor group."),
+				nls.localize('search.searchEditor.doubleClickBehaviour.openLocationToSide', "Double-clicking opens the result in the editor group to the side, creating one if it does not yet exist."),
 			],
-			markdownDescription: nls.localize('search.searchEditor.doubleClickBehaviour', "Configure effect of double clicking a result in a search editor.")
+			markdownDescription: nls.localize('search.searchEditor.doubleClickBehaviour', "Configure effect of double-clicking a result in a search editor.")
 		},
 		'search.searchEditor.reusePriorSearchConfiguration': {
 			type: 'boolean',
diff --git a/src/vs/workbench/contrib/search/browser/searchActionsBase.ts b/src/vs/workbench/contrib/search/browser/searchActionsBase.ts
index 932b714e3cecc6..edfc3b1f7f9054 100644
--- a/src/vs/workbench/contrib/search/browser/searchActionsBase.ts
+++ b/src/vs/workbench/contrib/search/browser/searchActionsBase.ts
@@ -11,7 +11,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { WorkbenchCompressibleObjectTree } from 'vs/platform/list/browser/listService';
 import { IViewsService } from 'vs/workbench/common/views';
 import { SearchView } from 'vs/workbench/contrib/search/browser/searchView';
-import { RenderableMatch, searchComparer } from 'vs/workbench/contrib/search/common/searchModel';
+import { FileMatch, FolderMatch, Match, RenderableMatch, searchComparer } from 'vs/workbench/contrib/search/common/searchModel';
 import { ISearchConfigurationProperties, VIEW_ID } from 'vs/workbench/services/search/common/search';
 
 export const category = { value: nls.localize('search', "Search"), original: 'Search' };
@@ -39,17 +39,41 @@ export function getSearchView(viewsService: IViewsService): SearchView | undefin
 	return viewsService.getActiveViewWithId(VIEW_ID) as SearchView;
 }
 
-export function getElementsToOperateOnInfo(viewer: WorkbenchCompressibleObjectTree<RenderableMatch, void>, currElement: RenderableMatch | undefined, sortConfig: ISearchConfigurationProperties): { elements: RenderableMatch[]; mustReselect: boolean } {
+export function getElementsToOperateOn(viewer: WorkbenchCompressibleObjectTree<RenderableMatch, void>, currElement: RenderableMatch | undefined, sortConfig: ISearchConfigurationProperties): RenderableMatch[] {
 	let elements: RenderableMatch[] = viewer.getSelection().filter((x): x is RenderableMatch => x !== null).sort((a, b) => searchComparer(a, b, sortConfig.sortOrder));
 
-	const mustReselect = !currElement || elements.includes(currElement); // this indicates whether we need to re-focus/re-select on a remove.
-
 	// if selection doesn't include multiple elements, just return current focus element.
 	if (currElement && !(elements.length > 1 && elements.includes(currElement))) {
 		elements = [currElement];
 	}
 
-	return { elements, mustReselect };
+	return elements;
+}
+
+/**
+ * @param elements elements that are going to be removed
+ * @param focusElement element that is focused
+ * @returns whether we need to re-focus on a remove
+ */
+export function shouldRefocus(elements: RenderableMatch[], focusElement: RenderableMatch | undefined) {
+	if (!focusElement) {
+		return false;
+	}
+	return !focusElement || elements.includes(focusElement) || hasDownstreamMatch(elements, focusElement);
+}
+
+function hasDownstreamMatch(elements: RenderableMatch[], focusElement: RenderableMatch) {
+	for (const elem of elements) {
+		if ((elem instanceof FileMatch && focusElement instanceof Match && elem.matches().includes(focusElement)) ||
+			(elem instanceof FolderMatch && (
+				(focusElement instanceof FileMatch && elem.getDownstreamFileMatch(focusElement.resource)) ||
+				(focusElement instanceof Match && elem.getDownstreamFileMatch(focusElement.parent().resource))
+			))) {
+			return true;
+		}
+	}
+	return false;
+
 }
 
 export function openSearchView(viewsService: IViewsService, focus?: boolean): Promise<SearchView | undefined> {
diff --git a/src/vs/workbench/contrib/search/browser/searchActionsCopy.ts b/src/vs/workbench/contrib/search/browser/searchActionsCopy.ts
index 58db3b759d5261..0e1acbdf9d78b9 100644
--- a/src/vs/workbench/contrib/search/browser/searchActionsCopy.ts
+++ b/src/vs/workbench/contrib/search/browser/searchActionsCopy.ts
@@ -26,7 +26,7 @@ registerAction2(class CopyMatchCommandAction extends Action2 {
 				value: nls.localize('copyMatchLabel', "Copy"),
 				original: 'Copy'
 			},
-			category: category.value,
+			category,
 			keybinding: {
 				weight: KeybindingWeight.WorkbenchContrib,
 				when: Constants.FileMatchOrMatchFocusKey,
@@ -57,7 +57,7 @@ registerAction2(class CopyPathCommandAction extends Action2 {
 				value: nls.localize('copyPathLabel', "Copy Path"),
 				original: 'Copy Path'
 			},
-			category: category.value,
+			category,
 			keybinding: {
 				weight: KeybindingWeight.WorkbenchContrib,
 				when: Constants.FileMatchOrFolderMatchWithResourceFocusKey,
@@ -91,7 +91,7 @@ registerAction2(class CopyAllCommandAction extends Action2 {
 				value: nls.localize('copyAllLabel', "Copy All"),
 				original: 'Copy All'
 			},
-			category: category.value,
+			category,
 			menu: [{
 				id: MenuId.SearchContext,
 				when: Constants.HasSearchResults,
diff --git a/src/vs/workbench/contrib/search/browser/searchActionsFind.ts b/src/vs/workbench/contrib/search/browser/searchActionsFind.ts
index 2d8cf8d99294b3..17fc4b72cdcee1 100644
--- a/src/vs/workbench/contrib/search/browser/searchActionsFind.ts
+++ b/src/vs/workbench/contrib/search/browser/searchActionsFind.ts
@@ -28,7 +28,7 @@ import { ExplorerFolderContext, ExplorerRootContext, FilesExplorerFocusCondition
 import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
 import { ExplorerViewPaneContainer } from 'vs/workbench/contrib/files/browser/explorerViewlet';
 import { onUnexpectedError } from 'vs/base/common/errors';
-import { category, getElementsToOperateOnInfo, getSearchView, openSearchView } from 'vs/workbench/contrib/search/browser/searchActionsBase';
+import { category, getElementsToOperateOn, getSearchView, openSearchView } from 'vs/workbench/contrib/search/browser/searchActionsBase';
 
 
 //#region Interfaces
@@ -110,7 +110,7 @@ registerAction2(class RevealInSideBarForSearchResultsAction extends Action2 {
 				value: nls.localize('revealInSideBar', "Reveal in Explorer View"),
 				original: 'Reveal in Explorer View'
 			},
-			category: category,
+			category,
 			menu: [{
 				id: MenuId.SearchContext,
 				when: ContextKeyExpr.and(Constants.FileFocusKey, Constants.HasSearchResults),
@@ -193,7 +193,7 @@ registerAction2(class FindInFilesAction extends Action2 {
 					},
 				]
 			},
-			category: category,
+			category,
 			keybinding: {
 				weight: KeybindingWeight.WorkbenchContrib,
 				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyF,
@@ -342,7 +342,7 @@ async function searchWithFolderCommand(accessor: ServicesAccessor, isFromExplore
 }
 
 function getMultiSelectedSearchResources(viewer: WorkbenchCompressibleObjectTree<RenderableMatch, void>, currElement: RenderableMatch | undefined, sortConfig: ISearchConfigurationProperties): URI[] {
-	return getElementsToOperateOnInfo(viewer, currElement, sortConfig).elements
+	return getElementsToOperateOn(viewer, currElement, sortConfig)
 		.map((renderableMatch) => ((renderableMatch instanceof Match) ? null : renderableMatch.resource))
 		.filter((renderableMatch): renderableMatch is URI => (renderableMatch !== null));
 }
diff --git a/src/vs/workbench/contrib/search/browser/searchActionsNav.ts b/src/vs/workbench/contrib/search/browser/searchActionsNav.ts
index 77a6b79b1f1da7..4d54a81a28ac51 100644
--- a/src/vs/workbench/contrib/search/browser/searchActionsNav.ts
+++ b/src/vs/workbench/contrib/search/browser/searchActionsNav.ts
@@ -90,7 +90,7 @@ registerAction2(class ToggleCaseSensitiveCommandAction extends Action2 {
 				value: nls.localize('ToggleCaseSensitiveCommandId.label', "Toggle Case Sensitive"),
 				original: 'Toggle Case Sensitive'
 			},
-			category: category,
+			category,
 			keybinding: Object.assign({
 				weight: KeybindingWeight.WorkbenchContrib,
 				when: isMacintosh ? ContextKeyExpr.and(Constants.SearchViewFocusedKey, Constants.FileMatchOrFolderMatchFocusKey.toNegated()) : Constants.SearchViewFocusedKey,
@@ -117,7 +117,7 @@ registerAction2(class ToggleWholeWordCommandAction extends Action2 {
 				weight: KeybindingWeight.WorkbenchContrib,
 				when: Constants.SearchViewFocusedKey,
 			}, ToggleWholeWordKeybinding),
-			category: category.value,
+			category,
 		});
 	}
 
@@ -138,7 +138,7 @@ registerAction2(class ToggleRegexCommandAction extends Action2 {
 				weight: KeybindingWeight.WorkbenchContrib,
 				when: Constants.SearchViewFocusedKey,
 			}, ToggleRegexKeybinding),
-			category: category.value,
+			category,
 		});
 	}
 
@@ -159,7 +159,7 @@ registerAction2(class TogglePreserveCaseAction extends Action2 {
 				weight: KeybindingWeight.WorkbenchContrib,
 				when: Constants.SearchViewFocusedKey,
 			}, TogglePreserveCaseKeybinding),
-			category: category.value,
+			category,
 		});
 	}
 
@@ -247,7 +247,7 @@ registerAction2(class AddCursorsAtSearchResultsAction extends Action2 {
 				when: ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.FileMatchOrMatchFocusKey),
 				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyL,
 			},
-			category: category.value,
+			category,
 		});
 	}
 
@@ -359,7 +359,7 @@ registerAction2(class ToggleSearchOnTypeAction extends Action2 {
 				value: nls.localize('toggleTabs', 'Toggle Search on Type'),
 				original: 'Toggle Search on Type'
 			},
-			category: category.value,
+			category,
 		});
 
 	}
@@ -381,7 +381,7 @@ registerAction2(class FocusSearchListCommandAction extends Action2 {
 				value: nls.localize('focusSearchListCommandLabel', "Focus List"),
 				original: 'Focus List'
 			},
-			category: category,
+			category,
 			f1: true
 		});
 	}
@@ -403,7 +403,7 @@ registerAction2(class FocusNextSearchResultAction extends Action2 {
 				primary: KeyCode.F4,
 				weight: KeybindingWeight.WorkbenchContrib,
 			}],
-			category: category,
+			category,
 			f1: true,
 			precondition: ContextKeyExpr.or(Constants.HasSearchResults, SearchEditorConstants.InSearchEditor),
 		});
@@ -426,7 +426,7 @@ registerAction2(class FocusPreviousSearchResultAction extends Action2 {
 				primary: KeyMod.Shift | KeyCode.F4,
 				weight: KeybindingWeight.WorkbenchContrib,
 			}],
-			category: category,
+			category,
 			f1: true,
 			precondition: ContextKeyExpr.or(Constants.HasSearchResults, SearchEditorConstants.InSearchEditor),
 		});
@@ -449,7 +449,7 @@ registerAction2(class ReplaceInFilesAction extends Action2 {
 				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyH,
 				weight: KeybindingWeight.WorkbenchContrib,
 			}],
-			category: category,
+			category,
 			f1: true,
 			menu: [{
 				id: MenuId.MenubarEditMenu,
diff --git a/src/vs/workbench/contrib/search/browser/searchActionsRemoveReplace.ts b/src/vs/workbench/contrib/search/browser/searchActionsRemoveReplace.ts
index 857f868b810c91..cd55030865f89f 100644
--- a/src/vs/workbench/contrib/search/browser/searchActionsRemoveReplace.ts
+++ b/src/vs/workbench/contrib/search/browser/searchActionsRemoveReplace.ts
@@ -21,7 +21,7 @@ import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { category, getElementsToOperateOnInfo, getSearchView } from 'vs/workbench/contrib/search/browser/searchActionsBase';
+import { category, getElementsToOperateOn, getSearchView, shouldRefocus } from 'vs/workbench/contrib/search/browser/searchActionsBase';
 
 
 //#region Interfaces
@@ -101,8 +101,7 @@ registerAction2(class RemoveAction extends Action2 {
 			element = viewer.getFocus()[0] ?? undefined;
 		}
 
-		const opInfo = getElementsToOperateOnInfo(viewer, element, configurationService.getValue<ISearchConfigurationProperties>('search'));
-		const elementsToRemove = opInfo.elements;
+		const elementsToRemove = getElementsToOperateOn(viewer, element, configurationService.getValue<ISearchConfigurationProperties>('search'));
 		let focusElement = viewer.getFocus()[0] ?? undefined;
 
 		if (elementsToRemove.length === 0) {
@@ -114,7 +113,8 @@ registerAction2(class RemoveAction extends Action2 {
 		}
 
 		let nextFocusElement;
-		if (opInfo.mustReselect && focusElement) {
+		const shouldRefocusMatch = shouldRefocus(elementsToRemove, focusElement);
+		if (focusElement && shouldRefocusMatch) {
 			nextFocusElement = getElementToFocusAfterRemoved(viewer, focusElement, elementsToRemove);
 		}
 
@@ -124,7 +124,7 @@ registerAction2(class RemoveAction extends Action2 {
 			searchResult.batchRemove(elementsToRemove);
 		}
 
-		if (opInfo.mustReselect && focusElement) {
+		if (focusElement && shouldRefocusMatch) {
 			if (!nextFocusElement) {
 				nextFocusElement = getLastNodeFromSameType(viewer, focusElement);
 			}
@@ -276,8 +276,7 @@ function performReplace(accessor: ServicesAccessor,
 	const element: RenderableMatch | null = context?.element ?? viewer.getFocus()[0];
 
 	// since multiple elements can be selected, we need to check the type of the FolderMatch/FileMatch/Match before we perform the replace.
-	const opInfo = getElementsToOperateOnInfo(viewer, element ?? undefined, configurationService.getValue<ISearchConfigurationProperties>('search'));
-	const elementsToReplace = opInfo.elements;
+	const elementsToReplace = getElementsToOperateOn(viewer, element ?? undefined, configurationService.getValue<ISearchConfigurationProperties>('search'));
 	let focusElement = viewer.getFocus()[0];
 
 	if (!focusElement || (focusElement && !arrayContainsElementOrParent(focusElement, elementsToReplace)) || (focusElement instanceof SearchResult)) {
diff --git a/src/vs/workbench/contrib/search/browser/searchActionsTopBar.ts b/src/vs/workbench/contrib/search/browser/searchActionsTopBar.ts
index 9c9d8c92057f94..41f56ddbc1ddc2 100644
--- a/src/vs/workbench/contrib/search/browser/searchActionsTopBar.ts
+++ b/src/vs/workbench/contrib/search/browser/searchActionsTopBar.ts
@@ -31,7 +31,7 @@ registerAction2(class ClearSearchHistoryCommandAction extends Action2 {
 				value: nls.localize('clearSearchHistoryLabel', "Clear Search History"),
 				original: 'Clear Search History'
 			},
-			category: category,
+			category,
 			f1: true
 		});
 
diff --git a/src/vs/workbench/contrib/search/browser/searchMessage.ts b/src/vs/workbench/contrib/search/browser/searchMessage.ts
index 3b8757c26a9747..869e622637cbba 100644
--- a/src/vs/workbench/contrib/search/browser/searchMessage.ts
+++ b/src/vs/workbench/contrib/search/browser/searchMessage.ts
@@ -10,7 +10,7 @@ import { parseLinkedText } from 'vs/base/common/linkedText';
 import Severity from 'vs/base/common/severity';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { INotificationService } from 'vs/platform/notification/common/notification';
-import { SeverityIcon } from 'vs/platform/severityIcon/common/severityIcon';
+import { SeverityIcon } from 'vs/platform/severityIcon/browser/severityIcon';
 import { TextSearchCompleteMessage, TextSearchCompleteMessageType } from 'vs/workbench/services/search/common/searchExtTypes';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { Schemas } from 'vs/base/common/network';
diff --git a/src/vs/workbench/contrib/search/browser/searchResultsView.ts b/src/vs/workbench/contrib/search/browser/searchResultsView.ts
index 493a1ae7fce095..4094ea8f550eb3 100644
--- a/src/vs/workbench/contrib/search/browser/searchResultsView.ts
+++ b/src/vs/workbench/contrib/search/browser/searchResultsView.ts
@@ -15,8 +15,6 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { FileKind } from 'vs/platform/files/common/files';
 import { ILabelService } from 'vs/platform/label/common/label';
 import { ISearchConfigurationProperties } from 'vs/workbench/services/search/common/search';
-import { attachBadgeStyler } from 'vs/platform/theme/common/styler';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IResourceLabel, ResourceLabels } from 'vs/workbench/browser/labels';
 import { SearchView } from 'vs/workbench/contrib/search/browser/searchView';
@@ -31,6 +29,7 @@ import { ISearchActionContext } from 'vs/workbench/contrib/search/browser/search
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { FileFocusKey, FolderFocusKey, MatchFocusKey } from 'vs/workbench/contrib/search/common/constants';
+import { defaultCountBadgeStyles } from 'vs/platform/theme/browser/defaultStyles';
 
 interface IFolderMatchTemplate {
 	label: IResourceLabel;
@@ -88,7 +87,6 @@ export class FolderMatchRenderer extends Disposable implements ICompressibleTree
 	constructor(
 		private searchView: SearchView,
 		private labels: ResourceLabels,
-		@IThemeService private readonly themeService: IThemeService,
 		@IWorkspaceContextService protected contextService: IWorkspaceContextService,
 		@ILabelService private readonly labelService: ILabelService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
@@ -122,8 +120,7 @@ export class FolderMatchRenderer extends Disposable implements ICompressibleTree
 		const folderMatchElement = DOM.append(container, DOM.$('.foldermatch'));
 		const label = this.labels.create(folderMatchElement, { supportDescriptionHighlights: true, supportHighlights: true });
 		disposables.add(label);
-		const badge = new CountBadge(DOM.append(folderMatchElement, DOM.$('.badge')));
-		disposables.add(attachBadgeStyler(badge, this.themeService));
+		const badge = new CountBadge(DOM.append(folderMatchElement, DOM.$('.badge')), {}, defaultCountBadgeStyles);
 		const actionBarContainer = DOM.append(folderMatchElement, DOM.$('.actionBarContainer'));
 
 		const disposableElements = new DisposableStore();
@@ -195,7 +192,6 @@ export class FileMatchRenderer extends Disposable implements ICompressibleTreeRe
 	constructor(
 		private searchView: SearchView,
 		private labels: ResourceLabels,
-		@IThemeService private readonly themeService: IThemeService,
 		@IWorkspaceContextService protected contextService: IWorkspaceContextService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
@@ -213,8 +209,7 @@ export class FileMatchRenderer extends Disposable implements ICompressibleTreeRe
 		const fileMatchElement = DOM.append(container, DOM.$('.filematch'));
 		const label = this.labels.create(fileMatchElement);
 		disposables.add(label);
-		const badge = new CountBadge(DOM.append(fileMatchElement, DOM.$('.badge')));
-		disposables.add(attachBadgeStyler(badge, this.themeService));
+		const badge = new CountBadge(DOM.append(fileMatchElement, DOM.$('.badge')), {}, defaultCountBadgeStyles);
 		const actionBarContainer = DOM.append(fileMatchElement, DOM.$('.actionBarContainer'));
 
 		const contextKeyService = this.contextKeyService.createOverlay([[FileFocusKey.key, true], [FolderFocusKey.key, false], [MatchFocusKey.key, false]]);
@@ -249,6 +244,11 @@ export class FileMatchRenderer extends Disposable implements ICompressibleTreeRe
 		templateData.badge.setTitleFormat(count > 1 ? nls.localize('searchMatches', "{0} matches found", count) : nls.localize('searchMatch', "{0} match found", count));
 
 		templateData.actions.context = <ISearchActionContext>{ viewer: this.searchView.getControl(), element: fileMatch };
+
+		// when hidesExplorerArrows: true, then the file nodes should still have a twistie because it would otherwise
+		// be hard to tell whether the node is collapsed or expanded.
+		const twistieContainer = templateData.el.parentElement?.parentElement?.querySelector('.monaco-tl-twistie');
+		twistieContainer?.classList.add('force-twistie');
 	}
 
 	disposeElement(element: ITreeNode<RenderableMatch, any>, index: number, templateData: IFileMatchTemplate): void {
diff --git a/src/vs/workbench/contrib/search/browser/searchView.ts b/src/vs/workbench/contrib/search/browser/searchView.ts
index bae146a3d3845a..64443c4960050e 100644
--- a/src/vs/workbench/contrib/search/browser/searchView.ts
+++ b/src/vs/workbench/contrib/search/browser/searchView.ts
@@ -49,9 +49,8 @@ import { IProgress, IProgressService, IProgressStep } from 'vs/platform/progress
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { defaultInputBoxStyles, defaultToggleStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { diffInserted, diffInsertedOutline, diffRemoved, diffRemovedOutline, editorFindMatchHighlight, editorFindMatchHighlightBorder, foreground, listActiveSelectionForeground, textLinkActiveForeground, textLinkForeground, toolbarActiveBackground, toolbarHoverBackground } from 'vs/platform/theme/common/colorRegistry';
-import { isHighContrast } from 'vs/platform/theme/common/theme';
-import { IColorTheme, ICssStyleCollector, IThemeService, registerThemingParticipant, ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { foreground } from 'vs/platform/theme/common/colorRegistry';
+import { IColorTheme, ICssStyleCollector, IFileIconTheme, IThemeService, registerThemingParticipant, ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { OpenFileFolderAction, OpenFolderAction } from 'vs/workbench/browser/actions/workspaceActions';
 import { ResourceListDnDHandler } from 'vs/workbench/browser/dnd';
@@ -265,6 +264,7 @@ export class SearchView extends ViewPane {
 			return;
 		}
 		this.isTreeLayoutViewVisible = visible;
+		this.updateIndentStyles(this.themeService.getFileIconTheme());
 		this.refreshTree();
 	}
 
@@ -406,6 +406,13 @@ export class SearchView extends ViewPane {
 		this._register(this.viewModel.searchResult.onChange((event) => this.onSearchResultsChanged(event)));
 
 		this._register(this.onDidChangeBodyVisibility(visible => this.onVisibilityChanged(visible)));
+
+		this.updateIndentStyles(this.themeService.getFileIconTheme());
+		this._register(this.themeService.onDidFileIconThemeChange(this.updateIndentStyles, this));
+	}
+
+	private updateIndentStyles(theme: IFileIconTheme): void {
+		this.resultsElement.classList.toggle('hide-arrows', this.isTreeLayoutViewVisible && theme.hidesExplorerArrows);
 	}
 
 	private onVisibilityChanged(visible: boolean): void {
@@ -741,7 +748,7 @@ export class SearchView extends ViewPane {
 	}
 
 	private createSearchResultsView(container: HTMLElement): void {
-		this.resultsElement = dom.append(container, $('.results.show-file-icons'));
+		this.resultsElement = dom.append(container, $('.results.show-file-icons.file-icon-themable-tree'));
 		const delegate = this.instantiationService.createInstance(SearchDelegate);
 
 		const identityProvider: IIdentityProvider<RenderableMatch> = {
@@ -1902,20 +1909,24 @@ export class SearchView extends ViewPane {
 	}
 
 	public override saveState(): void {
-		const isRegex = this.searchWidget.searchInput.getRegex();
-		const isWholeWords = this.searchWidget.searchInput.getWholeWords();
-		const isCaseSensitive = this.searchWidget.searchInput.getCaseSensitive();
-		const contentPattern = this.searchWidget.searchInput.getValue();
 		const patternExcludes = this.inputPatternExcludes.getValue().trim();
 		const patternIncludes = this.inputPatternIncludes.getValue().trim();
 		const onlyOpenEditors = this.inputPatternIncludes.onlySearchInOpenEditors();
 		const useExcludesAndIgnoreFiles = this.inputPatternExcludes.useExcludesAndIgnoreFiles();
 		const preserveCase = this.viewModel.preserveCase;
 
-		this.viewletState['query.contentPattern'] = contentPattern;
-		this.viewletState['query.regex'] = isRegex;
-		this.viewletState['query.wholeWords'] = isWholeWords;
-		this.viewletState['query.caseSensitive'] = isCaseSensitive;
+		if (this.searchWidget.searchInput) {
+			const isRegex = this.searchWidget.searchInput.getRegex();
+			const isWholeWords = this.searchWidget.searchInput.getWholeWords();
+			const isCaseSensitive = this.searchWidget.searchInput.getCaseSensitive();
+			const contentPattern = this.searchWidget.searchInput.getValue();
+
+			this.viewletState['query.contentPattern'] = contentPattern;
+			this.viewletState['query.regex'] = isRegex;
+			this.viewletState['query.wholeWords'] = isWholeWords;
+			this.viewletState['query.caseSensitive'] = isCaseSensitive;
+		}
+
 		this.viewletState['query.folderExclusions'] = patternExcludes;
 		this.viewletState['query.folderIncludes'] = patternIncludes;
 		this.viewletState['query.useExcludesAndIgnoreFiles'] = useExcludesAndIgnoreFiles;
@@ -1980,41 +1991,6 @@ export class SearchView extends ViewPane {
 }
 
 registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) => {
-	const matchHighlightColor = theme.getColor(editorFindMatchHighlight);
-	if (matchHighlightColor) {
-		collector.addRule(`.monaco-workbench .search-view .findInFileMatch { background-color: ${matchHighlightColor}; }`);
-	}
-
-	const diffInsertedColor = theme.getColor(diffInserted);
-	if (diffInsertedColor) {
-		collector.addRule(`.monaco-workbench .search-view .replaceMatch { background-color: ${diffInsertedColor}; }`);
-	}
-
-	const diffRemovedColor = theme.getColor(diffRemoved);
-	if (diffRemovedColor) {
-		collector.addRule(`.monaco-workbench .search-view .replace.findInFileMatch { background-color: ${diffRemovedColor}; }`);
-	}
-
-	const diffInsertedOutlineColor = theme.getColor(diffInsertedOutline);
-	if (diffInsertedOutlineColor) {
-		collector.addRule(`.monaco-workbench .search-view .replaceMatch:not(:empty) { border: 1px ${isHighContrast(theme.type) ? 'dashed' : 'solid'} ${diffInsertedOutlineColor}; }`);
-	}
-
-	const diffRemovedOutlineColor = theme.getColor(diffRemovedOutline);
-	if (diffRemovedOutlineColor) {
-		collector.addRule(`.monaco-workbench .search-view .replace.findInFileMatch { border: 1px ${isHighContrast(theme.type) ? 'dashed' : 'solid'} ${diffRemovedOutlineColor}; }`);
-	}
-
-	const findMatchHighlightBorder = theme.getColor(editorFindMatchHighlightBorder);
-	if (findMatchHighlightBorder) {
-		collector.addRule(`.monaco-workbench .search-view .findInFileMatch { border: 1px ${isHighContrast(theme.type) ? 'dashed' : 'solid'} ${findMatchHighlightBorder}; }`);
-	}
-
-	const outlineSelectionColor = theme.getColor(listActiveSelectionForeground);
-	if (outlineSelectionColor) {
-		collector.addRule(`.monaco-workbench .search-view .monaco-list.element-focused .monaco-list-row.focused.selected:not(.highlighted) .action-label:focus { outline-color: ${outlineSelectionColor} }`);
-	}
-
 	if (theme.type === 'dark') {
 		const foregroundColor = theme.getColor(foreground);
 		if (foregroundColor) {
@@ -2022,27 +1998,6 @@ registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) =
 			collector.addRule(`.search-view .message { color: ${fgWithOpacity}; }`);
 		}
 	}
-
-	const link = theme.getColor(textLinkForeground);
-	if (link) {
-		collector.addRule(`.monaco-workbench .search-view .message a { color: ${link}; }`);
-	}
-
-	const activeLink = theme.getColor(textLinkActiveForeground);
-	if (activeLink) {
-		collector.addRule(`.monaco-workbench .search-view .message a:hover,
-			.monaco-workbench .search-view .message a:active { color: ${activeLink}; }`);
-	}
-
-	const toolbarHoverColor = theme.getColor(toolbarHoverBackground);
-	if (toolbarHoverColor) {
-		collector.addRule(`.monaco-workbench .search-view .search-widget .toggle-replace-button:hover { background-color: ${toolbarHoverColor} }`);
-	}
-
-	const toolbarActiveColor = theme.getColor(toolbarActiveBackground);
-	if (toolbarActiveColor) {
-		collector.addRule(`.monaco-workbench .search-view .search-widget .toggle-replace-button:active { background-color: ${toolbarActiveColor} }`);
-	}
 });
 
 class SearchLinkButton extends Disposable {
diff --git a/src/vs/workbench/contrib/search/browser/searchWidget.ts b/src/vs/workbench/contrib/search/browser/searchWidget.ts
index 46d48bb7f75d72..8bed7c00d3a57a 100644
--- a/src/vs/workbench/contrib/search/browser/searchWidget.ts
+++ b/src/vs/workbench/contrib/search/browser/searchWidget.ts
@@ -38,7 +38,7 @@ import { showHistoryKeybindingHint } from 'vs/platform/history/browser/historyWi
 import { defaultInputBoxStyles, defaultToggleStyles } from 'vs/platform/theme/browser/defaultStyles';
 
 /** Specified in searchview.css */
-export const SingleLineInputHeight = 24;
+const SingleLineInputHeight = 26;
 
 export interface ISearchWidgetOptions {
 	value?: string;
diff --git a/src/vs/workbench/contrib/search/common/searchModel.ts b/src/vs/workbench/contrib/search/common/searchModel.ts
index c3d03a99764d11..2f2aa775da9ee1 100644
--- a/src/vs/workbench/contrib/search/common/searchModel.ts
+++ b/src/vs/workbench/contrib/search/common/searchModel.ts
@@ -109,25 +109,37 @@ export class Match {
 
 		const fullMatchText = this.fullMatchText();
 		let replaceString = searchModel.replacePattern.getReplaceString(fullMatchText, searchModel.preserveCase);
+		if (replaceString !== null) {
+			return replaceString;
+		}
 
-		// If match string is not matching then regex pattern has a lookahead expression
-		if (replaceString === null) {
-			const fullMatchTextWithSurroundingContent = this.fullMatchText(true);
-			replaceString = searchModel.replacePattern.getReplaceString(fullMatchTextWithSurroundingContent, searchModel.preserveCase);
-
-			// Search/find normalize line endings - check whether \r prevents regex from matching
-			if (replaceString === null) {
-				const fullMatchTextWithoutCR = fullMatchTextWithSurroundingContent.replace(/\r\n/g, '\n');
-				replaceString = searchModel.replacePattern.getReplaceString(fullMatchTextWithoutCR, searchModel.preserveCase);
+		// Search/find normalize line endings - check whether \r prevents regex from matching
+		const fullMatchTextWithoutCR = fullMatchText.replace(/\r\n/g, '\n');
+		if (fullMatchTextWithoutCR !== fullMatchText) {
+			replaceString = searchModel.replacePattern.getReplaceString(fullMatchTextWithoutCR, searchModel.preserveCase);
+			if (replaceString !== null) {
+				return replaceString;
 			}
 		}
 
-		// Match string is still not matching. Could be unsupported matches (multi-line).
-		if (replaceString === null) {
-			replaceString = searchModel.replacePattern.pattern;
+		// If match string is not matching then regex pattern has a lookahead expression
+		const contextMatchTextWithSurroundingContent = this.fullMatchText(true);
+		replaceString = searchModel.replacePattern.getReplaceString(contextMatchTextWithSurroundingContent, searchModel.preserveCase);
+		if (replaceString !== null) {
+			return replaceString;
+		}
+
+		// Search/find normalize line endings, this time in full context
+		const contextMatchTextWithoutCR = contextMatchTextWithSurroundingContent.replace(/\r\n/g, '\n');
+		if (contextMatchTextWithoutCR !== contextMatchTextWithSurroundingContent) {
+			replaceString = searchModel.replacePattern.getReplaceString(contextMatchTextWithoutCR, searchModel.preserveCase);
+			if (replaceString !== null) {
+				return replaceString;
+			}
 		}
 
-		return replaceString;
+		// Match string is still not matching. Could be unsupported matches (multi-line).
+		return searchModel.replacePattern.pattern;
 	}
 
 	fullMatchText(includeSurrounding = false): string {
@@ -228,7 +240,7 @@ export class FileMatch extends Disposable implements IFileMatch {
 		private _closestRoot: FolderMatchWorkspaceRoot | null,
 		@IModelService private readonly modelService: IModelService,
 		@IReplaceService private readonly replaceService: IReplaceService,
-		@ILabelService readonly labelService: ILabelService,
+		@ILabelService labelService: ILabelService,
 	) {
 		super();
 		this._resource = this.rawMatch.resource;
@@ -511,7 +523,7 @@ export class FolderMatch extends Disposable {
 		private _closestRoot: FolderMatchWorkspaceRoot | null,
 		@IReplaceService private readonly replaceService: IReplaceService,
 		@IInstantiationService protected readonly instantiationService: IInstantiationService,
-		@ILabelService readonly labelService: ILabelService,
+		@ILabelService labelService: ILabelService,
 		@IUriIdentityService protected readonly uriIdentityService: IUriIdentityService
 	) {
 		super();
@@ -1096,10 +1108,17 @@ export class SearchResult extends Disposable {
 	}
 
 	batchRemove(elementsToRemove: RenderableMatch[]) {
+		// need to check that we aren't trying to remove elements twice
+		const removedElems: RenderableMatch[] = [];
+
 		try {
 			this._onChange.pause();
-			elementsToRemove.forEach((currentElement) =>
-				currentElement.parent().remove(<(FolderMatch | FileMatch)[] & Match & FileMatch[]>currentElement)
+			elementsToRemove.forEach((currentElement) => {
+				if (!arrayContainsElementOrParent(currentElement, removedElems)) {
+					currentElement.parent().remove(<(FolderMatch | FileMatch)[] & Match & FileMatch[]>currentElement);
+					removedElems.push(currentElement);
+				}
+			}
 			);
 		} finally {
 			this._onChange.resume();
diff --git a/src/vs/workbench/contrib/search/test/browser/searchActions.test.ts b/src/vs/workbench/contrib/search/test/browser/searchActions.test.ts
index 783ee335c4c374..063b3f7bf142a3 100644
--- a/src/vs/workbench/contrib/search/test/browser/searchActions.test.ts
+++ b/src/vs/workbench/contrib/search/test/browser/searchActions.test.ts
@@ -14,7 +14,7 @@ import { TestConfigurationService } from 'vs/platform/configuration/test/common/
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
-import { IFileMatch } from 'vs/workbench/services/search/common/search';
+import { IFileMatch, QueryType } from 'vs/workbench/services/search/common/search';
 import { getElementToFocusAfterRemoved, getLastNodeFromSameType } from 'vs/workbench/contrib/search/browser/searchActionsRemoveReplace';
 import { FileMatch, FileMatchOrMatch, FolderMatch, Match, SearchModel } from 'vs/workbench/contrib/search/common/searchModel';
 import { MockObjectTree } from 'vs/workbench/contrib/search/test/browser/mockSearchTree';
@@ -112,7 +112,7 @@ suite('Search Actions', () => {
 
 		const searchModel = instantiationService.createInstance(SearchModel);
 		const folderMatch = instantiationService.createInstance(FolderMatch, URI.file('somepath'), '', 0, {
-			type: 1, folderQueries: [{ folder: createFileUriFromPathFromRoot() }], contentPattern: {
+			type: QueryType.Text, folderQueries: [{ folder: createFileUriFromPathFromRoot() }], contentPattern: {
 				pattern: ''
 			}
 		}, searchModel.searchResult, searchModel, null);
diff --git a/src/vs/workbench/contrib/search/test/browser/searchViewlet.test.ts b/src/vs/workbench/contrib/search/test/browser/searchViewlet.test.ts
index b77466a34c428c..986e61e433be77 100644
--- a/src/vs/workbench/contrib/search/test/browser/searchViewlet.test.ts
+++ b/src/vs/workbench/contrib/search/test/browser/searchViewlet.test.ts
@@ -177,7 +177,7 @@ suite('Search - Viewlet', () => {
 	function aFolderMatch(path: string, index: number, parent?: SearchResult): FolderMatch {
 		const searchModel = instantiation.createInstance(SearchModel);
 		return instantiation.createInstance(FolderMatch, createFileUriFromPathFromRoot(path), path, index, {
-			type: 1, folderQueries: [{ folder: createFileUriFromPathFromRoot() }], contentPattern: {
+			type: QueryType.Text, folderQueries: [{ folder: createFileUriFromPathFromRoot() }], contentPattern: {
 				pattern: ''
 			}
 		}, parent ?? aSearchResult().folderMatches()[0], searchModel, null);
@@ -186,7 +186,7 @@ suite('Search - Viewlet', () => {
 	function aSearchResult(): SearchResult {
 		const searchModel = instantiation.createInstance(SearchModel);
 		searchModel.searchResult.query = {
-			type: 1, folderQueries: [{ folder: createFileUriFromPathFromRoot() }], contentPattern: {
+			type: QueryType.Text, folderQueries: [{ folder: createFileUriFromPathFromRoot() }], contentPattern: {
 				pattern: ''
 			}
 		};
diff --git a/src/vs/workbench/contrib/search/test/common/searchModel.test.ts b/src/vs/workbench/contrib/search/test/common/searchModel.test.ts
index c62b157915d93b..5c9caf163a18b6 100644
--- a/src/vs/workbench/contrib/search/test/common/searchModel.test.ts
+++ b/src/vs/workbench/contrib/search/test/common/searchModel.test.ts
@@ -13,7 +13,7 @@ import { ModelService } from 'vs/editor/common/services/modelService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { IFileMatch, IFileSearchStats, IFolderQuery, ISearchComplete, ISearchProgressItem, ISearchQuery, ISearchService, ITextSearchMatch, OneLineRange, TextSearchMatch } from 'vs/workbench/services/search/common/search';
+import { IFileMatch, IFileSearchStats, IFolderQuery, ISearchComplete, ISearchProgressItem, ISearchQuery, ISearchService, ITextSearchMatch, OneLineRange, QueryType, TextSearchMatch } from 'vs/workbench/services/search/common/search';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
 import { SearchModel } from 'vs/workbench/contrib/search/common/searchModel';
@@ -137,7 +137,7 @@ suite('SearchModel', () => {
 		instantiationService.stub(ISearchService, searchServiceWithResults(results));
 
 		const testObject: SearchModel = instantiationService.createInstance(SearchModel);
-		await testObject.search({ contentPattern: { pattern: 'somestring' }, type: 1, folderQueries });
+		await testObject.search({ contentPattern: { pattern: 'somestring' }, type: QueryType.Text, folderQueries });
 
 		const actual = testObject.searchResult.matches();
 
@@ -168,7 +168,7 @@ suite('SearchModel', () => {
 		instantiationService.stub(ISearchService, searchServiceWithResults(results));
 
 		const testObject: SearchModel = instantiationService.createInstance(SearchModel);
-		await testObject.search({ contentPattern: { pattern: 'somestring' }, type: 1, folderQueries });
+		await testObject.search({ contentPattern: { pattern: 'somestring' }, type: QueryType.Text, folderQueries });
 
 		assert.ok(target.calledThrice);
 		const data = target.args[2];
@@ -185,7 +185,7 @@ suite('SearchModel', () => {
 		instantiationService.stub(ISearchService, searchServiceWithResults([]));
 
 		const testObject = instantiationService.createInstance(SearchModel);
-		const result = testObject.search({ contentPattern: { pattern: 'somestring' }, type: 1, folderQueries });
+		const result = testObject.search({ contentPattern: { pattern: 'somestring' }, type: QueryType.Text, folderQueries });
 
 		return result.then(() => {
 			return timeout(1).then(() => {
@@ -206,7 +206,7 @@ suite('SearchModel', () => {
 			{ results: [], stats: testSearchStats, messages: [] }));
 
 		const testObject = instantiationService.createInstance(SearchModel);
-		const result = testObject.search({ contentPattern: { pattern: 'somestring' }, type: 1, folderQueries });
+		const result = testObject.search({ contentPattern: { pattern: 'somestring' }, type: QueryType.Text, folderQueries });
 
 		return result.then(() => {
 			return timeout(1).then(() => {
@@ -228,7 +228,7 @@ suite('SearchModel', () => {
 		instantiationService.stub(ISearchService, searchServiceWithError(new Error('error')));
 
 		const testObject = instantiationService.createInstance(SearchModel);
-		const result = testObject.search({ contentPattern: { pattern: 'somestring' }, type: 1, folderQueries });
+		const result = testObject.search({ contentPattern: { pattern: 'somestring' }, type: QueryType.Text, folderQueries });
 
 		return result.then(() => { }, () => {
 			return timeout(1).then(() => {
@@ -249,7 +249,7 @@ suite('SearchModel', () => {
 		instantiationService.stub(ISearchService, 'textSearch', deferredPromise.p);
 
 		const testObject = instantiationService.createInstance(SearchModel);
-		const result = testObject.search({ contentPattern: { pattern: 'somestring' }, type: 1, folderQueries });
+		const result = testObject.search({ contentPattern: { pattern: 'somestring' }, type: QueryType.Text, folderQueries });
 
 		deferredPromise.cancel();
 
@@ -271,12 +271,12 @@ suite('SearchModel', () => {
 				new TextSearchMatch('preview 2', lineOneRange))];
 		instantiationService.stub(ISearchService, searchServiceWithResults(results));
 		const testObject: SearchModel = instantiationService.createInstance(SearchModel);
-		await testObject.search({ contentPattern: { pattern: 'somestring' }, type: 1, folderQueries });
+		await testObject.search({ contentPattern: { pattern: 'somestring' }, type: QueryType.Text, folderQueries });
 		assert.ok(!testObject.searchResult.isEmpty());
 
 		instantiationService.stub(ISearchService, searchServiceWithResults([]));
 
-		testObject.search({ contentPattern: { pattern: 'somestring' }, type: 1, folderQueries });
+		testObject.search({ contentPattern: { pattern: 'somestring' }, type: QueryType.Text, folderQueries });
 		assert.ok(testObject.searchResult.isEmpty());
 	});
 
@@ -285,9 +285,9 @@ suite('SearchModel', () => {
 		instantiationService.stub(ISearchService, canceleableSearchService(tokenSource));
 		const testObject: SearchModel = instantiationService.createInstance(SearchModel);
 
-		testObject.search({ contentPattern: { pattern: 'somestring' }, type: 1, folderQueries });
+		testObject.search({ contentPattern: { pattern: 'somestring' }, type: QueryType.Text, folderQueries });
 		instantiationService.stub(ISearchService, searchServiceWithResults([]));
-		testObject.search({ contentPattern: { pattern: 'somestring' }, type: 1, folderQueries });
+		testObject.search({ contentPattern: { pattern: 'somestring' }, type: QueryType.Text, folderQueries });
 
 		assert.ok(tokenSource.token.isCancellationRequested);
 	});
@@ -300,24 +300,24 @@ suite('SearchModel', () => {
 		instantiationService.stub(ISearchService, searchServiceWithResults(results));
 
 		const testObject: SearchModel = instantiationService.createInstance(SearchModel);
-		await testObject.search({ contentPattern: { pattern: 're' }, type: 1, folderQueries });
+		await testObject.search({ contentPattern: { pattern: 're' }, type: QueryType.Text, folderQueries });
 		testObject.replaceString = 'hello';
 		let match = testObject.searchResult.matches()[0].matches()[0];
 		assert.strictEqual('hello', match.replaceString);
 
-		await testObject.search({ contentPattern: { pattern: 're', isRegExp: true }, type: 1, folderQueries });
+		await testObject.search({ contentPattern: { pattern: 're', isRegExp: true }, type: QueryType.Text, folderQueries });
 		match = testObject.searchResult.matches()[0].matches()[0];
 		assert.strictEqual('hello', match.replaceString);
 
-		await testObject.search({ contentPattern: { pattern: 're(?:vi)', isRegExp: true }, type: 1, folderQueries });
+		await testObject.search({ contentPattern: { pattern: 're(?:vi)', isRegExp: true }, type: QueryType.Text, folderQueries });
 		match = testObject.searchResult.matches()[0].matches()[0];
 		assert.strictEqual('hello', match.replaceString);
 
-		await testObject.search({ contentPattern: { pattern: 'r(e)(?:vi)', isRegExp: true }, type: 1, folderQueries });
+		await testObject.search({ contentPattern: { pattern: 'r(e)(?:vi)', isRegExp: true }, type: QueryType.Text, folderQueries });
 		match = testObject.searchResult.matches()[0].matches()[0];
 		assert.strictEqual('hello', match.replaceString);
 
-		await testObject.search({ contentPattern: { pattern: 'r(e)(?:vi)', isRegExp: true }, type: 1, folderQueries });
+		await testObject.search({ contentPattern: { pattern: 'r(e)(?:vi)', isRegExp: true }, type: QueryType.Text, folderQueries });
 		testObject.replaceString = 'hello$1';
 		match = testObject.searchResult.matches()[0].matches()[0];
 		assert.strictEqual('helloe', match.replaceString);
diff --git a/src/vs/workbench/contrib/search/test/common/searchResult.test.ts b/src/vs/workbench/contrib/search/test/common/searchResult.test.ts
index 9ca82db188a9d7..522da80b2b5c11 100644
--- a/src/vs/workbench/contrib/search/test/common/searchResult.test.ts
+++ b/src/vs/workbench/contrib/search/test/common/searchResult.test.ts
@@ -483,7 +483,7 @@ suite('SearchResult', () => {
 	function aSearchResult(): SearchResult {
 		const searchModel = instantiationService.createInstance(SearchModel);
 		searchModel.searchResult.query = {
-			type: 1, folderQueries: [{ folder: createFileUriFromPathFromRoot() }], contentPattern: {
+			type: QueryType.Text, folderQueries: [{ folder: createFileUriFromPathFromRoot() }], contentPattern: {
 				pattern: ''
 			}
 		};
diff --git a/src/vs/workbench/contrib/searchEditor/browser/media/searchEditor.css b/src/vs/workbench/contrib/searchEditor/browser/media/searchEditor.css
index 00a8155d5409ef..69a2d0c0dce2ae 100644
--- a/src/vs/workbench/contrib/searchEditor/browser/media/searchEditor.css
+++ b/src/vs/workbench/contrib/searchEditor/browser/media/searchEditor.css
@@ -13,7 +13,7 @@
 }
 
 .search-editor .query-container {
-	margin: 0px 12px 12px 2px;
+	margin: 0px 12px 12px 19px;
 	padding-top: 6px;
 }
 
@@ -34,7 +34,6 @@
 
 .search-editor .search-widget .search-container,
 .search-editor .search-widget .replace-container {
-	margin-left: 18px;
 	display: flex;
 	align-items: center;
 }
@@ -52,7 +51,7 @@
 .search-editor .search-widget .monaco-inputbox > .ibwrapper > .mirror,
 .search-editor .search-widget .monaco-inputbox > .ibwrapper > textarea.input {
 	padding: 3px;
-	padding-left: 4px;
+	padding-left: 6px;
 }
 
 .search-editor .search-widget .monaco-inputbox > .ibwrapper > .mirror {
@@ -62,7 +61,7 @@
 /* NOTE: height is also used in searchWidget.ts as a constant*/
 .search-editor .search-widget .monaco-inputbox > .ibwrapper > textarea.input {
 	overflow: initial;
-	height: 24px; /* set initial height before measure */
+	height: 26px; /* set initial height before measure */
 }
 
 .search-editor .monaco-inputbox > .ibwrapper > textarea.input {
@@ -79,6 +78,10 @@
 	max-width: 50px;
 }
 
+.search-editor .search-widget .context-lines-input input[type=number]::-webkit-inner-spin-button {
+	/* Hide arrow button that shows in type=number fields */
+	-webkit-appearance: none !important;
+}
 
 .search-editor .search-widget .replace-container {
 	margin-top: 6px;
@@ -125,7 +128,6 @@
 .search-editor .includes-excludes {
 	min-height: 1em;
 	position: relative;
-	margin: 0 0 0 17px;
 }
 
 .search-editor .includes-excludes .expand {
@@ -165,7 +167,7 @@
 }
 
 .search-editor .message {
-	padding-left: 22px;
+	padding-left: 7px;
 	padding-right: 22px;
 	padding-top: 0px;
 }
@@ -173,3 +175,14 @@
 .search-editor a.prominent {
 	text-decoration: underline;
 }
+
+.monaco-editor .searchEditorFindMatch {
+	box-sizing: border-box;
+	background-color: var(--vscode-searchEditor-findMatchBackground);
+	border: 1px solid var(--vscode-searchEditor-findMatchBorder);
+}
+
+.monaco-editor.hc-black .searchEditorFindMatch,
+.monaco-editor.hc-light .searchEditorFindMatch {
+	border: 1px dotted var(--vscode-searchEditor-findMatchBorder);
+}
diff --git a/src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.ts b/src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.ts
index 5540e023a3d0cf..ab8698990c3404 100644
--- a/src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.ts
+++ b/src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.ts
@@ -280,7 +280,7 @@ registerAction2(class extends Action2 {
 	constructor() {
 		super({
 			id: OpenNewEditorToSideCommandId,
-			title: { value: localize('search.openNewEditorToSide', "Open new Search Editor to the Side"), original: 'Open new Search Editor to the Side' },
+			title: { value: localize('search.openNewEditorToSide', "Open New Search Editor to the Side"), original: 'Open new Search Editor to the Side' },
 			category,
 			f1: true,
 			description: openArgDescription
diff --git a/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts b/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
index cdea9d6e3c81df..50e18fe5f1915d 100644
--- a/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
+++ b/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
@@ -32,8 +32,8 @@ import { ILabelService } from 'vs/platform/label/common/label';
 import { IEditorProgressService, LongRunningOperation } from 'vs/platform/progress/common/progress';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { inputBorder, registerColor, searchEditorFindMatch, searchEditorFindMatchBorder } from 'vs/platform/theme/common/colorRegistry';
-import { IThemeService, registerThemingParticipant, ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { inputBorder, registerColor } from 'vs/platform/theme/common/colorRegistry';
+import { IThemeService, ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { AbstractTextCodeEditor } from 'vs/workbench/browser/parts/editor/textCodeEditor';
 import { EditorInputCapabilities, IEditorOpenContext } from 'vs/workbench/common/editor';
@@ -44,7 +44,7 @@ import { InputBoxFocusedKey } from 'vs/workbench/contrib/search/common/constants
 import { ITextQueryBuilderOptions, QueryBuilder } from 'vs/workbench/services/search/common/queryBuilder';
 import { getOutOfWorkspaceEditorResources } from 'vs/workbench/contrib/search/common/search';
 import { SearchModel, SearchResult } from 'vs/workbench/contrib/search/common/searchModel';
-import { InSearchEditor, SearchEditorFindMatchClass, SearchEditorID, SearchEditorInputTypeId } from 'vs/workbench/contrib/searchEditor/browser/constants';
+import { InSearchEditor, SearchEditorID, SearchEditorInputTypeId } from 'vs/workbench/contrib/searchEditor/browser/constants';
 import type { SearchConfiguration, SearchEditorInput } from 'vs/workbench/contrib/searchEditor/browser/searchEditorInput';
 import { serializeSearchResultForEditor } from 'vs/workbench/contrib/searchEditor/browser/searchEditorSerialization';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
@@ -59,7 +59,6 @@ import { IEditorOptions } from 'vs/platform/editor/common/editor';
 import { renderSearchMessage } from 'vs/workbench/contrib/search/browser/searchMessage';
 import { EditorExtensionsRegistry, IEditorContributionDescription } from 'vs/editor/browser/editorExtensions';
 import { UnusualLineTerminatorsDetector } from 'vs/editor/contrib/unusualLineTerminators/browser/unusualLineTerminators';
-import { isHighContrast } from 'vs/platform/theme/common/theme';
 import { defaultToggleStyles, getInputBoxStyle } from 'vs/platform/theme/browser/defaultStyles';
 
 const RESULT_LINE_REGEX = /^(\s+)(\d+)(: |  )(\s*)(.*)$/;
@@ -103,10 +102,9 @@ export class SearchEditor extends AbstractTextCodeEditor<SearchEditorViewState>
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IContextViewService private readonly contextViewService: IContextViewService,
 		@ICommandService private readonly commandService: ICommandService,
-		@IContextKeyService readonly contextKeyService: IContextKeyService,
-		@IOpenerService readonly openerService: IOpenerService,
+		@IOpenerService private readonly openerService: IOpenerService,
 		@INotificationService private readonly notificationService: INotificationService,
-		@IEditorProgressService readonly progressService: IEditorProgressService,
+		@IEditorProgressService progressService: IEditorProgressService,
 		@ITextResourceConfigurationService textResourceService: ITextResourceConfigurationService,
 		@IEditorGroupsService editorGroupService: IEditorGroupsService,
 		@IEditorService editorService: IEditorService,
@@ -739,15 +737,6 @@ export class SearchEditor extends AbstractTextCodeEditor<SearchEditorViewState>
 	}
 }
 
-registerThemingParticipant((theme, collector) => {
-	collector.addRule(`.monaco-editor .${SearchEditorFindMatchClass} { background-color: ${theme.getColor(searchEditorFindMatch)}; }`);
-
-	const findMatchHighlightBorder = theme.getColor(searchEditorFindMatchBorder);
-	if (findMatchHighlightBorder) {
-		collector.addRule(`.monaco-editor .${SearchEditorFindMatchClass} { border: 1px ${isHighContrast(theme.type) ? 'dotted' : 'solid'} ${findMatchHighlightBorder}; box-sizing: border-box; }`);
-	}
-});
-
 const searchEditorTextInputBorder = registerColor('searchEditor.textInputBorder', { dark: inputBorder, light: inputBorder, hcDark: inputBorder, hcLight: inputBorder }, localize('textInputBoxBorder', "Search editor text input box border."));
 
 function findNextRange(matchRanges: Range[], currentPosition: Position) {
diff --git a/src/vs/workbench/contrib/searchEditor/browser/searchEditorModel.ts b/src/vs/workbench/contrib/searchEditor/browser/searchEditorModel.ts
index 2100486f38db34..4a6b5d4d598bce 100644
--- a/src/vs/workbench/contrib/searchEditor/browser/searchEditorModel.ts
+++ b/src/vs/workbench/contrib/searchEditor/browser/searchEditorModel.ts
@@ -30,9 +30,7 @@ export class SearchConfigurationModel {
 export class SearchEditorModel {
 	constructor(
 		private resource: URI,
-		@IWorkingCopyBackupService readonly workingCopyBackupService: IWorkingCopyBackupService,
-	) {
-	}
+	) { }
 
 	async resolve(): Promise<SearchEditorData> {
 		return assertIsDefined(searchEditorModelFactory.models.get(this.resource)).resolve();
diff --git a/src/vs/workbench/contrib/snippets/browser/commands/configureSnippets.ts b/src/vs/workbench/contrib/snippets/browser/commands/configureSnippets.ts
index baee9823a1f401..907a9206aab716 100644
--- a/src/vs/workbench/contrib/snippets/browser/commands/configureSnippets.ts
+++ b/src/vs/workbench/contrib/snippets/browser/commands/configureSnippets.ts
@@ -12,6 +12,7 @@ import * as nls from 'vs/nls';
 import { MenuId } from 'vs/platform/actions/common/actions';
 import { IFileService } from 'vs/platform/files/common/files';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { ILabelService } from 'vs/platform/label/common/label';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { IQuickInputService, IQuickPickItem, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
@@ -32,12 +33,13 @@ interface ISnippetPick extends IQuickPickItem {
 	hint?: true;
 }
 
-async function computePicks(snippetService: ISnippetsService, userDataProfileService: IUserDataProfileService, languageService: ILanguageService) {
+async function computePicks(snippetService: ISnippetsService, userDataProfileService: IUserDataProfileService, languageService: ILanguageService, labelService: ILabelService) {
 
 	const existing: ISnippetPick[] = [];
 	const future: ISnippetPick[] = [];
 
 	const seen = new Set<string>();
+	const added = new Map<string, { snippet: ISnippetPick; detail: string }>();
 
 	for (const file of await snippetService.getSnippetFiles()) {
 
@@ -52,7 +54,13 @@ async function computePicks(snippetService: ISnippetsService, userDataProfileSer
 
 			// list scopes for global snippets
 			const names = new Set<string>();
+			let source: string | undefined;
+
 			outer: for (const snippet of file.data) {
+				if (!source) {
+					source = snippet.source;
+				}
+
 				for (const scope of snippet.scopes) {
 					const name = languageService.getLanguageName(scope);
 					if (name) {
@@ -66,13 +74,26 @@ async function computePicks(snippetService: ISnippetsService, userDataProfileSer
 				}
 			}
 
-			existing.push({
+			const snippet: ISnippetPick = {
 				label: basename(file.location),
 				filepath: file.location,
 				description: names.size === 0
 					? nls.localize('global.scope', "(global)")
 					: nls.localize('global.1', "({0})", [...names].join(', '))
-			});
+			};
+			existing.push(snippet);
+
+			if (!source) {
+				continue;
+			}
+
+			const detail = nls.localize('detail.label', "({0}) {1}", source, labelService.getUriLabel(file.location, { relative: true }));
+			const lastItem = added.get(basename(file.location));
+			if (lastItem) {
+				snippet.detail = detail;
+				lastItem.snippet.detail = lastItem.detail;
+			}
+			added.set(basename(file.location), { snippet, detail });
 
 		} else {
 			// language snippet
@@ -232,8 +253,9 @@ export class ConfigureSnippets extends SnippetsAction {
 		const workspaceService = accessor.get(IWorkspaceContextService);
 		const fileService = accessor.get(IFileService);
 		const textFileService = accessor.get(ITextFileService);
+		const labelService = accessor.get(ILabelService);
 
-		const picks = await computePicks(snippetService, userDataProfileService, languageService);
+		const picks = await computePicks(snippetService, userDataProfileService, languageService, labelService);
 		const existing: QuickPickInput[] = picks.existing;
 
 		type SnippetPick = IQuickPickItem & { uri: URI } & { scope: string };
diff --git a/src/vs/workbench/contrib/snippets/browser/commands/insertSnippet.ts b/src/vs/workbench/contrib/snippets/browser/commands/insertSnippet.ts
index d8b905d5f79e48..0e7f47962ee9e7 100644
--- a/src/vs/workbench/contrib/snippets/browser/commands/insertSnippet.ts
+++ b/src/vs/workbench/contrib/snippets/browser/commands/insertSnippet.ts
@@ -79,7 +79,7 @@ export class InsertSnippetAction extends SnippetEditorAction {
 		});
 	}
 
-	async runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, args: any[]) {
+	async runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, arg: any) {
 
 		const languageService = accessor.get(ILanguageService);
 		const snippetService = accessor.get(ISnippetsService);
@@ -94,7 +94,7 @@ export class InsertSnippetAction extends SnippetEditorAction {
 		const snippet = await new Promise<Snippet | undefined>((resolve, reject) => {
 
 			const { lineNumber, column } = editor.getPosition();
-			const { snippet, name, langId } = Args.fromUser(args[0]);
+			const { snippet, name, langId } = Args.fromUser(arg);
 
 			if (snippet) {
 				return resolve(new Snippet(
diff --git a/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.ts b/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.ts
index 077f15cb5f75a9..39ed50f4814359 100644
--- a/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.ts
+++ b/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { MarkdownString } from 'vs/base/common/htmlContent';
-import { compare, compareSubstring } from 'vs/base/common/strings';
+import { compare, compareSubstring, firstNonWhitespaceIndex } from 'vs/base/common/strings';
 import { Position } from 'vs/editor/common/core/position';
 import { IRange, Range } from 'vs/editor/common/core/range';
 import { ITextModel } from 'vs/editor/common/model';
@@ -112,8 +112,12 @@ export class SnippetCompletionProvider implements CompletionItemProvider {
 				continue snippet;
 			}
 
+			// don't eat into leading whitespace unless the snippet prefix starts with whitespace
+			const minPos = firstNonWhitespaceIndex(snippet.prefixLow) === 0
+				? Math.max(0, model.getLineFirstNonWhitespaceColumn(position.lineNumber) - 1)
+				: 0;
 
-			column: for (let pos = Math.max(0, columnOffset - snippet.prefixLow.length); pos < lineContentLow.length; pos++) {
+			column: for (let pos = Math.max(minPos, columnOffset - snippet.prefixLow.length); pos < lineContentLow.length; pos++) {
 
 				if (!isPatternInWord(lineContentLow, pos, columnOffset, snippet.prefixLow, 0, snippet.prefixLow.length)) {
 					continue column;
diff --git a/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts b/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts
index b4581ae1494bf2..406ff2a20b1480 100644
--- a/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts
+++ b/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts
@@ -666,7 +666,7 @@ suite('SnippetsService', function () {
 
 	});
 
-	test('still show suggestions in string when disable string suggestion #136611', async function () {
+	test('still show suggestions in string when disable string suggestion #136611 (part 2)', async function () {
 
 		snippetService = new SimpleSnippetService([
 			new Snippet(false, ['fooLang'], 'aaa', 'aaa', '', 'value', '', SnippetSource.User, generateUuid()),
@@ -799,4 +799,21 @@ suite('SnippetsService', function () {
 
 		model.dispose();
 	});
+
+	test('Hyphen in snippet prefix de-indents snippet #139016', async function () {
+		snippetService = new SimpleSnippetService([
+			new Snippet(false, ['fooLang'], 'foo', 'Foo- Bar', '', 'Foo', '', SnippetSource.User, generateUuid()),
+		]);
+		const model = instantiateTextModel(instantiationService, '    bar', 'fooLang');
+		const provider = new SnippetCompletionProvider(languageService, snippetService, new TestLanguageConfigurationService());
+		const result = await provider.provideCompletionItems(
+			model,
+			new Position(1, 8),
+			{ triggerKind: CompletionTriggerKind.Invoke }
+		);
+
+		assert.strictEqual(result.suggestions.length, 1);
+		const first = result.suggestions[0];
+		assert.strictEqual((<CompletionItemRanges>first.range).insert.startColumn, 5);
+	});
 });
diff --git a/src/vs/workbench/contrib/splash/browser/partsSplash.ts b/src/vs/workbench/contrib/splash/browser/partsSplash.ts
index 8e3099ac3a718e..7ab36045c32072 100644
--- a/src/vs/workbench/contrib/splash/browser/partsSplash.ts
+++ b/src/vs/workbench/contrib/splash/browser/partsSplash.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { onDidChangeFullscreen, isFullscreen } from 'vs/base/browser/browser';
-import { getTotalHeight, getTotalWidth } from 'vs/base/browser/dom';
+import * as dom from 'vs/base/browser/dom';
 import { Color } from 'vs/base/common/color';
 import { Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
 import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
 import { editorBackground, foreground } from 'vs/platform/theme/common/colorRegistry';
 import { getThemeTypeSelector, IThemeService } from 'vs/platform/theme/common/themeService';
@@ -19,7 +19,7 @@ import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editor
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import * as perf from 'vs/base/common/performance';
 import { assertIsDefined } from 'vs/base/common/types';
-import { RunOnceScheduler } from 'vs/base/common/async';
+import { runWhenIdle } from 'vs/base/common/async';
 import { ISplashStorageService } from 'vs/workbench/contrib/splash/browser/splash';
 
 export class PartsSplash {
@@ -36,7 +36,7 @@ export class PartsSplash {
 		@IWorkbenchEnvironmentService private readonly _environmentService: IWorkbenchEnvironmentService,
 		@ILifecycleService lifecycleService: ILifecycleService,
 		@IEditorGroupsService editorGroupsService: IEditorGroupsService,
-		@IConfigurationService configService: IConfigurationService,
+		@IConfigurationService private readonly _configService: IConfigurationService,
 		@ISplashStorageService private readonly _partSplashService: ISplashStorageService
 	) {
 		lifecycleService.when(LifecyclePhase.Restored).then(_ => {
@@ -44,21 +44,18 @@ export class PartsSplash {
 			perf.mark('code/didRemovePartsSplash');
 		});
 
-		const savePartsSplashSoon = new RunOnceScheduler(() => this._savePartsSplash(), 800);
-		Event.any(onDidChangeFullscreen, editorGroupsService.onDidLayout)(() => {
-			savePartsSplashSoon.schedule();
+		let lastIdleSchedule: IDisposable | undefined;
+		Event.any(onDidChangeFullscreen, editorGroupsService.onDidLayout, _themeService.onDidColorThemeChange)(() => {
+			lastIdleSchedule?.dispose();
+			lastIdleSchedule = runWhenIdle(() => this._savePartsSplash(), 800);
 		}, undefined, this._disposables);
 
-		configService.onDidChangeConfiguration(e => {
+		_configService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('window.titleBarStyle')) {
 				this._didChangeTitleBarStyle = true;
 				this._savePartsSplash();
 			}
 		}, this, this._disposables);
-
-		_themeService.onDidColorThemeChange(_ => {
-			this._savePartsSplash();
-		}, this, this._disposables);
 	}
 
 	dispose(): void {
@@ -69,6 +66,7 @@ export class PartsSplash {
 		const theme = this._themeService.getColorTheme();
 
 		this._partSplashService.saveWindowSplash({
+			zoomLevel: this._configService.getValue<undefined>('window.zoomLevel'),
 			baseTheme: getThemeTypeSelector(theme.type),
 			colorInfo: {
 				foreground: theme.getColor(foreground)?.toString(),
@@ -84,10 +82,10 @@ export class PartsSplash {
 			layoutInfo: !this._shouldSaveLayoutInfo() ? undefined : {
 				sideBarSide: this._layoutService.getSideBarPosition() === Position.RIGHT ? 'right' : 'left',
 				editorPartMinWidth: DEFAULT_EDITOR_MIN_DIMENSIONS.width,
-				titleBarHeight: this._layoutService.isVisible(Parts.TITLEBAR_PART) ? getTotalHeight(assertIsDefined(this._layoutService.getContainer(Parts.TITLEBAR_PART))) : 0,
-				activityBarWidth: this._layoutService.isVisible(Parts.ACTIVITYBAR_PART) ? getTotalWidth(assertIsDefined(this._layoutService.getContainer(Parts.ACTIVITYBAR_PART))) : 0,
-				sideBarWidth: this._layoutService.isVisible(Parts.SIDEBAR_PART) ? getTotalWidth(assertIsDefined(this._layoutService.getContainer(Parts.SIDEBAR_PART))) : 0,
-				statusBarHeight: this._layoutService.isVisible(Parts.STATUSBAR_PART) ? getTotalHeight(assertIsDefined(this._layoutService.getContainer(Parts.STATUSBAR_PART))) : 0,
+				titleBarHeight: this._layoutService.isVisible(Parts.TITLEBAR_PART) ? dom.getTotalHeight(assertIsDefined(this._layoutService.getContainer(Parts.TITLEBAR_PART))) : 0,
+				activityBarWidth: this._layoutService.isVisible(Parts.ACTIVITYBAR_PART) ? dom.getTotalWidth(assertIsDefined(this._layoutService.getContainer(Parts.ACTIVITYBAR_PART))) : 0,
+				sideBarWidth: this._layoutService.isVisible(Parts.SIDEBAR_PART) ? dom.getTotalWidth(assertIsDefined(this._layoutService.getContainer(Parts.SIDEBAR_PART))) : 0,
+				statusBarHeight: this._layoutService.isVisible(Parts.STATUSBAR_PART) ? dom.getTotalHeight(assertIsDefined(this._layoutService.getContainer(Parts.STATUSBAR_PART))) : 0,
 				windowBorder: this._layoutService.hasWindowBorder(),
 				windowBorderRadius: this._layoutService.getWindowBorderRadius()
 			}
diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
index da9c552689c376..6be73c68b3a2f3 100644
--- a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
+++ b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
@@ -1205,11 +1205,6 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		if (!task) {
 			throw new TaskError(Severity.Info, nls.localize('TaskServer.noTask', 'Task to execute is undefined'), TaskErrors.TaskNotFound);
 		}
-		if (this._inProgressTasks.has(task._label)) {
-			this._logService.info('Prevented duplicate task from running', task._label);
-			return;
-		}
-		this._inProgressTasks.add(task._label);
 		const resolver = this._createResolver();
 		let executeTaskResult: ITaskSummary | undefined;
 		try {
@@ -1225,8 +1220,6 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		} catch (error) {
 			this._handleError(error);
 			return Promise.reject(error);
-		} finally {
-			this._inProgressTasks.delete(task._label);
 		}
 	}
 
@@ -1838,6 +1831,12 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 
 	private async _executeTask(task: Task, resolver: ITaskResolver, runSource: TaskRunSource): Promise<ITaskSummary> {
 		let taskToRun: Task = task;
+		const qualifiedLabel = task.getQualifiedLabel();
+		if (this._inProgressTasks.has(qualifiedLabel)) {
+			this._logService.info('Prevented duplicate task from running', qualifiedLabel);
+			return { exitCode: 0 };
+		}
+		this._inProgressTasks.add(qualifiedLabel);
 		if (await this._saveBeforeRun()) {
 			await this._configurationService.reloadConfiguration();
 			await this._updateWorkspaceTasks();
@@ -1852,8 +1851,10 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		await ProblemMatcherRegistry.onReady();
 		const executeResult = runSource === TaskRunSource.Reconnect ? this._getTaskSystem().reconnect(taskToRun, resolver) : this._getTaskSystem().run(taskToRun, resolver);
 		if (executeResult) {
+			this._inProgressTasks.delete(qualifiedLabel);
 			return this._handleExecuteResult(executeResult, runSource);
 		}
+		this._inProgressTasks.delete(qualifiedLabel);
 		return { exitCode: 0 };
 	}
 
@@ -1913,6 +1914,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		if (!this._taskSystem) {
 			return { success: true, task: undefined };
 		}
+		this._inProgressTasks.delete(task.getQualifiedLabel());
 		return this._taskSystem.terminate(task);
 	}
 
@@ -2362,6 +2364,10 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		}
 		const taskSystemInfo: ITaskSystemInfo | undefined = workspaceFolder ? this._getTaskSystemInfo(workspaceFolder.uri.scheme) : undefined;
 		const problemReporter = new ProblemReporter(this._outputChannel);
+		if (!taskSystemInfo) {
+			problemReporter.fatal(nls.localize('TaskSystem.workspaceFolderError', 'Workspace folder was undefined'));
+			return true;
+		}
 		const parseResult = TaskConfig.parse(workspaceFolder, this._workspace, taskSystemInfo ? taskSystemInfo.platform : Platform.platform, config, problemReporter, source, this._contextKeyService, isRecentTask);
 		let hasErrors = false;
 		if (!parseResult.validationStatus.isOK() && (parseResult.validationStatus.state !== ValidationState.Info)) {
@@ -2824,8 +2830,9 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 							return true;
 						}
 					}
-				} else if (type && t.type === type) {
+				} else if (type && t.type === type || (CustomTask.is(t) && t.customizes()?.type === type)) {
 					return true;
+
 				}
 				return false;
 			});
diff --git a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
index 7af4215700a691..2ec5b0ac053ee9 100644
--- a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
+++ b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
@@ -31,7 +31,7 @@ import { URI } from 'vs/base/common/uri';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ILogService } from 'vs/platform/log/common/log';
 import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IShellLaunchConfig, TerminalLocation, TerminalSettingId, WaitOnExitValue } from 'vs/platform/terminal/common/terminal';
+import { IShellLaunchConfig, TerminalSettingId, WaitOnExitValue } from 'vs/platform/terminal/common/terminal';
 import { formatMessageForTerminal } from 'vs/platform/terminal/common/terminalStrings';
 import { ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { IViewDescriptorService, IViewsService, ViewContainerLocation } from 'vs/workbench/common/views';
@@ -214,11 +214,25 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 	private readonly _onDidStateChange: Emitter<ITaskEvent>;
 	private _reconnectedTerminals: ITerminalInstance[] | undefined;
 
-	get taskShellIntegrationStartSequence(): string {
-		return this._configurationService.getValue(TaskSettingId.ShowDecorations) ? VSCodeSequence(VSCodeOscPt.PromptStart) + VSCodeSequence(VSCodeOscPt.Property, `${VSCodeOscProperty.Task}=True`) + VSCodeSequence(VSCodeOscPt.CommandStart) : '';
+	taskShellIntegrationStartSequence(cwd: string | URI | undefined): string {
+		if (!this._configurationService.getValue(TaskSettingId.ShowDecorations)) {
+			return '';
+		}
+		return (
+			VSCodeSequence(VSCodeOscPt.PromptStart) +
+			VSCodeSequence(VSCodeOscPt.Property, `${VSCodeOscProperty.Task}=True`) +
+			(cwd
+				? VSCodeSequence(VSCodeOscPt.Property, `${VSCodeOscProperty.Cwd}=${typeof cwd === 'string' ? cwd : cwd.fsPath}`)
+				: ''
+			) +
+			VSCodeSequence(VSCodeOscPt.CommandStart)
+		);
 	}
 	get taskShellIntegrationOutputSequence(): string {
-		return this._configurationService.getValue(TaskSettingId.ShowDecorations) ? VSCodeSequence(VSCodeOscPt.CommandExecuted) : '';
+		if (!this._configurationService.getValue(TaskSettingId.ShowDecorations)) {
+			return '';
+		}
+		return VSCodeSequence(VSCodeOscPt.CommandExecuted);
 	}
 
 	constructor(
@@ -1071,6 +1085,17 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 		const terminalName = this._createTerminalName(task);
 		const type = ReconnectionType;
 		const originalCommand = task.command.name;
+		let cwd: string | URI | undefined;
+		if (options.cwd) {
+			cwd = options.cwd;
+			if (!path.isAbsolute(cwd)) {
+				if (workspaceFolder && (workspaceFolder.uri.scheme === Schemas.file)) {
+					cwd = path.join(workspaceFolder.uri.fsPath, cwd);
+				}
+			}
+			// This must be normalized to the OS
+			cwd = isUNC(cwd) ? cwd : resources.toLocalResource(URI.from({ scheme: Schemas.file, path: cwd }), this._environmentService.remoteAuthority, this._pathService.defaultUriScheme);
+		}
 		if (isShellCommand) {
 			let os: Platform.OperatingSystem;
 			switch (platform) {
@@ -1175,19 +1200,19 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 			shellLaunchConfig.args = windowsShellArgs ? combinedShellArgs.join(' ') : combinedShellArgs;
 			if (task.command.presentation && task.command.presentation.echo) {
 				if (needsFolderQualification && workspaceFolder) {
-					shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence + formatMessageForTerminal(nls.localize({
+					shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(nls.localize({
 						key: 'task.executingInFolder',
 						comment: ['The workspace folder the task is running in', 'The task command line or label']
 					}, 'Executing task in folder {0}: {1}', workspaceFolder.name, commandLine), { excludeLeadingNewLine: true }) + this.taskShellIntegrationOutputSequence;
 				} else {
-					shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence + formatMessageForTerminal(nls.localize({
+					shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(nls.localize({
 						key: 'task.executing.shellIntegration',
 						comment: ['The task command line or label']
 					}, 'Executing task: {0}', commandLine), { excludeLeadingNewLine: true }) + this.taskShellIntegrationOutputSequence;
 				}
 			} else {
 				shellLaunchConfig.initialText = {
-					text: this.taskShellIntegrationStartSequence + this.taskShellIntegrationOutputSequence,
+					text: this.taskShellIntegrationStartSequence(cwd) + this.taskShellIntegrationOutputSequence,
 					trailingNewLine: false
 				};
 			}
@@ -1218,33 +1243,26 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 					return args.join(' ');
 				};
 				if (needsFolderQualification && workspaceFolder) {
-					shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence + formatMessageForTerminal(nls.localize({
+					shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(nls.localize({
 						key: 'task.executingInFolder',
 						comment: ['The workspace folder the task is running in', 'The task command line or label']
 					}, 'Executing task in folder {0}: {1}', workspaceFolder.name, `${shellLaunchConfig.executable} ${getArgsToEcho(shellLaunchConfig.args)}`), { excludeLeadingNewLine: true }) + this.taskShellIntegrationOutputSequence;
 				} else {
-					shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence + formatMessageForTerminal(nls.localize({
+					shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(nls.localize({
 						key: 'task.executing.shell-integration',
 						comment: ['The task command line or label']
 					}, 'Executing task: {0}', `${shellLaunchConfig.executable} ${getArgsToEcho(shellLaunchConfig.args)}`), { excludeLeadingNewLine: true }) + this.taskShellIntegrationOutputSequence;
 				}
 			} else {
 				shellLaunchConfig.initialText = {
-					text: this.taskShellIntegrationStartSequence + this.taskShellIntegrationOutputSequence,
+					text: this.taskShellIntegrationStartSequence(cwd) + this.taskShellIntegrationOutputSequence,
 					trailingNewLine: false
 				};
 			}
 		}
 
-		if (options.cwd) {
-			let cwd = options.cwd;
-			if (!path.isAbsolute(cwd)) {
-				if (workspaceFolder && (workspaceFolder.uri.scheme === Schemas.file)) {
-					cwd = path.join(workspaceFolder.uri.fsPath, cwd);
-				}
-			}
-			// This must be normalized to the OS
-			shellLaunchConfig.cwd = isUNC(cwd) ? cwd : resources.toLocalResource(URI.from({ scheme: Schemas.file, path: cwd }), this._environmentService.remoteAuthority, this._pathService.defaultUriScheme);
+		if (cwd) {
+			shellLaunchConfig.cwd = cwd;
 		}
 		if (options.env) {
 			if (shellLaunchConfig.env) {
@@ -1318,7 +1336,7 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 			this._logService.trace(`No terminal found to split for group ${group}`);
 		}
 		// Either no group is used, no terminal with the group exists or splitting an existing terminal failed.
-		const createdTerminal = await this._terminalService.createTerminal({ location: TerminalLocation.Panel, config: launchConfigs });
+		const createdTerminal = await this._terminalService.createTerminal({ config: launchConfigs });
 		createdTerminal.onDisposed((terminal) => this._fireTaskEvent({ kind: TaskEventKind.Terminated, exitReason: terminal.exitReason, taskId: task.getRecentlyUsedKey() }));
 		return createdTerminal;
 	}
diff --git a/src/vs/workbench/contrib/tasks/common/problemMatcher.ts b/src/vs/workbench/contrib/tasks/common/problemMatcher.ts
index f67b71187edc5e..7dcaa2085e0c96 100644
--- a/src/vs/workbench/contrib/tasks/common/problemMatcher.ts
+++ b/src/vs/workbench/contrib/tasks/common/problemMatcher.ts
@@ -1695,9 +1695,25 @@ export namespace Schemas {
 					},
 					{
 						type: 'array',
-						items: {
-							type: 'string'
-						},
+						prefixItems: [
+							{
+								type: 'string',
+								enum: ['absolute', 'relative', 'autoDetect', 'search']
+							},
+						],
+						minItems: 1,
+						maxItems: 1,
+						additionalItems: false
+					},
+					{
+						type: 'array',
+						prefixItems: [
+							{ type: 'string', enum: ['relative', 'autoDetect'] },
+							{ type: 'string' },
+						],
+						minItems: 2,
+						maxItems: 2,
+						additionalItems: false,
 						examples: [
 							['relative', '${workspaceFolder}'],
 							['autoDetect', '${workspaceFolder}'],
@@ -1705,7 +1721,7 @@ export namespace Schemas {
 					},
 					{
 						type: 'array',
-						items: [
+						prefixItems: [
 							{ type: 'string', enum: ['search'] },
 							{
 								type: 'object',
@@ -1726,6 +1742,8 @@ export namespace Schemas {
 								required: ['include']
 							}
 						],
+						minItems: 2,
+						maxItems: 2,
 						additionalItems: false,
 						examples: [
 							['search', { 'include': ['${workspaceFolder}'] }],
diff --git a/src/vs/workbench/contrib/terminal/browser/links/terminalLink.ts b/src/vs/workbench/contrib/terminal/browser/links/terminalLink.ts
index 8e9bcde15abaac..b9fa2e70f3b92c 100644
--- a/src/vs/workbench/contrib/terminal/browser/links/terminalLink.ts
+++ b/src/vs/workbench/contrib/terminal/browser/links/terminalLink.ts
@@ -9,16 +9,11 @@ import * as dom from 'vs/base/browser/dom';
 import { RunOnceScheduler } from 'vs/base/common/async';
 import { convertBufferRangeToViewport } from 'vs/workbench/contrib/terminal/browser/links/terminalLinkHelpers';
 import { isMacintosh } from 'vs/base/common/platform';
-import { localize } from 'vs/nls';
 import { Emitter, Event } from 'vs/base/common/event';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { TerminalLinkType } from 'vs/workbench/contrib/terminal/browser/links/links';
 import { IHoverAction } from 'vs/workbench/services/hover/browser/hover';
 
-export const OPEN_FILE_LABEL = localize('openFile', 'Open file in editor');
-export const FOLDER_IN_WORKSPACE_LABEL = localize('focusFolder', 'Focus folder in explorer');
-export const FOLDER_NOT_IN_WORKSPACE_LABEL = localize('openFolder', 'Open folder in new window');
-
 export class TerminalLink extends DisposableStore implements ILink {
 	decorations: ILinkDecorations;
 	asyncActivate: Promise<void> | undefined;
diff --git a/src/vs/workbench/contrib/terminal/browser/links/terminalLinkDetectorAdapter.ts b/src/vs/workbench/contrib/terminal/browser/links/terminalLinkDetectorAdapter.ts
index 43d8923d291113..3efd5be7426642 100644
--- a/src/vs/workbench/contrib/terminal/browser/links/terminalLinkDetectorAdapter.ts
+++ b/src/vs/workbench/contrib/terminal/browser/links/terminalLinkDetectorAdapter.ts
@@ -42,9 +42,23 @@ export class TerminalLinkDetectorAdapter extends Disposable implements ILinkProv
 		super();
 	}
 
+	private _activeProvideLinkRequests: Map<number, Promise<TerminalLink[]>> = new Map();
 	async provideLinks(bufferLineNumber: number, callback: (links: ILink[] | undefined) => void) {
-		this._activeLinks?.forEach(l => l.dispose());
-		this._activeLinks = await this._provideLinks(bufferLineNumber);
+		let activeRequest = this._activeProvideLinkRequests.get(bufferLineNumber);
+		if (activeRequest) {
+			await activeRequest;
+			callback(this._activeLinks);
+			return;
+		}
+		if (this._activeLinks) {
+			for (const link of this._activeLinks) {
+				link.dispose();
+			}
+		}
+		activeRequest = this._provideLinks(bufferLineNumber);
+		this._activeProvideLinkRequests.set(bufferLineNumber, activeRequest);
+		this._activeLinks = await activeRequest;
+		this._activeProvideLinkRequests.delete(bufferLineNumber);
 		callback(this._activeLinks);
 	}
 
diff --git a/src/vs/workbench/contrib/terminal/browser/links/terminalLinkHelpers.ts b/src/vs/workbench/contrib/terminal/browser/links/terminalLinkHelpers.ts
index c882247c15ddc6..2133cd6bdb108a 100644
--- a/src/vs/workbench/contrib/terminal/browser/links/terminalLinkHelpers.ts
+++ b/src/vs/workbench/contrib/terminal/browser/links/terminalLinkHelpers.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { IViewportRange, IBufferRange, IBufferLine, IBufferCellPosition, IBuffer } from 'xterm';
+import type { IViewportRange, IBufferRange, IBufferLine, IBuffer, IBufferCellPosition } from 'xterm';
 import { IRange } from 'vs/editor/common/core/range';
 import { OperatingSystem } from 'vs/base/common/platform';
 import { IPath, posix, win32 } from 'vs/base/common/path';
@@ -38,7 +38,7 @@ export function convertLinkRangeToBuffer(
 	let startOffset = 0;
 	const startWrappedLineCount = Math.ceil(range.startColumn / bufferWidth);
 	for (let y = 0; y < Math.min(startWrappedLineCount); y++) {
-		const lineLength = Math.min(bufferWidth, range.startColumn - y * bufferWidth);
+		const lineLength = Math.min(bufferWidth, (range.startColumn - 1) - y * bufferWidth);
 		let lineOffset = 0;
 		const line = lines[y];
 		// Sanity check for line, apparently this can happen but it's not clear under what
@@ -65,9 +65,8 @@ export function convertLinkRangeToBuffer(
 	let endOffset = 0;
 	const endWrappedLineCount = Math.ceil(range.endColumn / bufferWidth);
 	for (let y = Math.max(0, startWrappedLineCount - 1); y < endWrappedLineCount; y++) {
-		const start = (y === startWrappedLineCount - 1 ? (range.startColumn + startOffset) % bufferWidth : 0);
+		const start = (y === startWrappedLineCount - 1 ? (range.startColumn - 1 + startOffset) % bufferWidth : 0);
 		const lineLength = Math.min(bufferWidth, range.endColumn + startOffset - y * bufferWidth);
-		const startLineOffset = (y === startWrappedLineCount - 1 ? startOffset : 0);
 		let lineOffset = 0;
 		const line = lines[y];
 		// Sanity check for line, apparently this can happen but it's not clear under what
@@ -76,17 +75,27 @@ export function convertLinkRangeToBuffer(
 		if (!line) {
 			break;
 		}
-		for (let x = start; x < Math.min(bufferWidth, lineLength + lineOffset + startLineOffset); x++) {
-			const cell = line.getCell(x)!;
+		for (let x = start; x < Math.min(bufferWidth, lineLength + lineOffset); x++) {
+			const cell = line.getCell(x);
+			// This is unexpected but it means the character doesn't exist, so we shouldn't add to
+			// the offset
+			if (!cell) {
+				break;
+			}
 			const width = cell.getWidth();
-			// Offset for 0 cells following wide characters
+			const chars = cell.getChars();
+			// Offset for null cells following wide characters
 			if (width === 2) {
 				lineOffset++;
 			}
 			// Offset for early wrapping when the last cell in row is a wide character
-			if (x === bufferWidth - 1 && cell.getChars() === '') {
+			if (x === bufferWidth - 1 && chars === '') {
 				lineOffset++;
 			}
+			// Offset multi-code characters like emoji
+			if (chars.length > 1) {
+				lineOffset -= chars.length - 1;
+			}
 		}
 		endOffset += lineOffset;
 	}
@@ -124,7 +133,7 @@ export function convertBufferRangeToViewport(bufferRange: IBufferRange, viewport
 export function getXtermLineContent(buffer: IBuffer, lineStart: number, lineEnd: number, cols: number): string {
 	// Cap the maximum number of lines generated to prevent potential performance problems. This is
 	// more of a sanity check as the wrapped line should already be trimmed down at this point.
-	const maxLineLength = Math.max(2048 / cols * 2);
+	const maxLineLength = Math.max(2048, cols * 2);
 	lineEnd = Math.min(lineEnd, lineStart + maxLineLength);
 	let content = '';
 	for (let i = lineStart; i <= lineEnd; i++) {
@@ -138,45 +147,98 @@ export function getXtermLineContent(buffer: IBuffer, lineStart: number, lineEnd:
 	return content;
 }
 
-
-export function positionIsInRange(position: IBufferCellPosition, range: IBufferRange): boolean {
-	if (position.y < range.start.y || position.y > range.end.y) {
-		return false;
-	}
-	if (position.y === range.start.y && position.x < range.start.x) {
-		return false;
-	}
-	if (position.y === range.end.y && position.x > range.end.x) {
-		return false;
+export function getXtermRangesByAttr(buffer: IBuffer, lineStart: number, lineEnd: number, cols: number): IBufferRange[] {
+	let bufferRangeStart: IBufferCellPosition | undefined = undefined;
+	let lastFgAttr: number = -1;
+	let lastBgAttr: number = -1;
+	const ranges: IBufferRange[] = [];
+	for (let y = lineStart; y <= lineEnd; y++) {
+		const line = buffer.getLine(y);
+		if (!line) {
+			continue;
+		}
+		for (let x = 0; x < cols; x++) {
+			const cell = line.getCell(x);
+			if (!cell) {
+				break;
+			}
+			// HACK: Re-construct the attributes from fg and bg, this is hacky as it relies
+			// upon the internal buffer bit layout
+			const thisFgAttr = (
+				cell.isBold() |
+				cell.isInverse() |
+				cell.isStrikethrough() |
+				cell.isUnderline()
+			);
+			const thisBgAttr = (
+				cell.isDim() |
+				cell.isItalic()
+			);
+			if (lastFgAttr === -1 || lastBgAttr === -1) {
+				bufferRangeStart = { x, y };
+			} else {
+				if (lastFgAttr !== thisFgAttr || lastBgAttr !== thisBgAttr) {
+					// TODO: x overflow
+					const bufferRangeEnd = { x, y };
+					ranges.push({
+						start: bufferRangeStart!,
+						end: bufferRangeEnd
+					});
+					bufferRangeStart = { x, y };
+				}
+			}
+			lastFgAttr = thisFgAttr;
+			lastBgAttr = thisBgAttr;
+		}
 	}
-	return true;
+	return ranges;
 }
 
+
+// export function positionIsInRange(position: IBufferCellPosition, range: IBufferRange): boolean {
+// 	if (position.y < range.start.y || position.y > range.end.y) {
+// 		return false;
+// 	}
+// 	if (position.y === range.start.y && position.x < range.start.x) {
+// 		return false;
+// 	}
+// 	if (position.y === range.end.y && position.x > range.end.x) {
+// 		return false;
+// 	}
+// 	return true;
+// }
+
 /**
  * For shells with the CommandDetection capability, the cwd for a command relative to the line of
  * the particular link can be used to narrow down the result for an exact file match.
  */
-export function updateLinkWithRelativeCwd(capabilities: ITerminalCapabilityStore, y: number, text: string, pathSeparator: string): string | undefined {
+export function updateLinkWithRelativeCwd(capabilities: ITerminalCapabilityStore, y: number, text: string, osPath: IPath): string[] | undefined {
 	const cwd = capabilities.get(TerminalCapability.CommandDetection)?.getCwdForLine(y);
 	if (!cwd) {
 		return undefined;
 	}
-	if (!text.includes(pathSeparator)) {
-		text = cwd + pathSeparator + text;
+	const result: string[] = [];
+	const sep = osPath.sep;
+	if (!text.includes(sep)) {
+		result.push(osPath.resolve(cwd + sep + text));
 	} else {
 		let commonDirs = 0;
 		let i = 0;
-		const cwdPath = cwd.split(pathSeparator).reverse();
-		const linkPath = text.split(pathSeparator);
+		const cwdPath = cwd.split(sep).reverse();
+		const linkPath = text.split(sep);
+		// Get all results as candidates, prioritizing the link with the most common directories.
+		// For example if in the directory /home/common and the link is common/file, the result
+		// should be: `['/home/common/common/file', '/home/common/file']`. The first is the most
+		// likely as cwd detection is active.
 		while (i < cwdPath.length) {
+			result.push(osPath.resolve(cwd + sep + linkPath.slice(commonDirs).join(sep)));
 			if (cwdPath[i] === linkPath[i]) {
 				commonDirs++;
 			}
 			i++;
 		}
-		text = cwd + pathSeparator + linkPath.slice(commonDirs).join(pathSeparator);
 	}
-	return text;
+	return result;
 }
 
 export function osPathModule(os: OperatingSystem): IPath {
diff --git a/src/vs/workbench/contrib/terminal/browser/links/terminalLinkManager.ts b/src/vs/workbench/contrib/terminal/browser/links/terminalLinkManager.ts
index 7afc439f9ac1a7..77e664b365b493 100644
--- a/src/vs/workbench/contrib/terminal/browser/links/terminalLinkManager.ts
+++ b/src/vs/workbench/contrib/terminal/browser/links/terminalLinkManager.ts
@@ -8,7 +8,7 @@ import { IMarkdownString, MarkdownString } from 'vs/base/common/htmlContent';
 import { DisposableStore, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { Schemas } from 'vs/base/common/network';
 import { posix, win32 } from 'vs/base/common/path';
-import { isMacintosh, OperatingSystem, OS } from 'vs/base/common/platform';
+import { isMacintosh, isWindows, OperatingSystem, OS } from 'vs/base/common/platform';
 import { URI } from 'vs/base/common/uri';
 import * as nls from 'vs/nls';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -21,7 +21,7 @@ import { TerminalExternalLinkDetector } from 'vs/workbench/contrib/terminal/brow
 import { TerminalLink } from 'vs/workbench/contrib/terminal/browser/links/terminalLink';
 import { TerminalLinkDetectorAdapter } from 'vs/workbench/contrib/terminal/browser/links/terminalLinkDetectorAdapter';
 import { TerminalLocalFileLinkOpener, TerminalLocalFolderInWorkspaceLinkOpener, TerminalLocalFolderOutsideWorkspaceLinkOpener, TerminalSearchLinkOpener, TerminalUrlLinkOpener } from 'vs/workbench/contrib/terminal/browser/links/terminalLinkOpeners';
-import { lineAndColumnClause, TerminalLocalLinkDetector, unixLocalLinkClause, winDrivePrefix, winLocalLinkClause } from 'vs/workbench/contrib/terminal/browser/links/terminalLocalLinkDetector';
+import { TerminalLocalLinkDetector, winDrivePrefix } from 'vs/workbench/contrib/terminal/browser/links/terminalLocalLinkDetector';
 import { TerminalUriLinkDetector } from 'vs/workbench/contrib/terminal/browser/links/terminalUriLinkDetector';
 import { TerminalWordLinkDetector } from 'vs/workbench/contrib/terminal/browser/links/terminalWordLinkDetector';
 import { ITerminalExternalLinkProvider, TerminalLinkQuickPickEvent } from 'vs/workbench/contrib/terminal/browser/terminal';
@@ -34,9 +34,9 @@ import { IHoverAction } from 'vs/workbench/services/hover/browser/hover';
 import type { ILink, ILinkProvider, IViewportRange, Terminal } from 'xterm';
 import { convertBufferRangeToViewport } from 'vs/workbench/contrib/terminal/browser/links/terminalLinkHelpers';
 import { RunOnceScheduler } from 'vs/base/common/async';
+import { removeLinkSuffix } from 'vs/workbench/contrib/terminal/browser/links/terminalLinkParsing';
 
 export type XtermLinkMatcherHandler = (event: MouseEvent | undefined, link: string) => Promise<void>;
-export type XtermLinkMatcherValidationCallback = (uri: string, callback: (isValid: boolean) => void) => void;
 
 interface IPath {
 	join(...paths: string[]): string;
@@ -73,9 +73,21 @@ export class TerminalLinkManager extends DisposableStore {
 	) {
 		super();
 
+		let enableFileLinks: boolean = true;
+		const enableFileLinksConfig = this._configurationService.getValue<ITerminalConfiguration>(TERMINAL_CONFIG_SECTION).enableFileLinks as ITerminalConfiguration['enableFileLinks'] | boolean;
+		switch (enableFileLinksConfig) {
+			case 'off':
+			case false: // legacy from v1.75
+				enableFileLinks = false;
+				break;
+			case 'notRemote':
+				enableFileLinks = !this._processManager.remoteAuthority;
+				break;
+		}
+
 		// Setup link detectors in their order of priority
 		this._setupLinkDetector(TerminalUriLinkDetector.id, this._instantiationService.createInstance(TerminalUriLinkDetector, this._xterm, this._resolvePath.bind(this)));
-		if (this._configurationService.getValue<ITerminalConfiguration>(TERMINAL_CONFIG_SECTION).enableFileLinks) {
+		if (enableFileLinks) {
 			this._setupLinkDetector(TerminalLocalLinkDetector.id, this._instantiationService.createInstance(TerminalLocalLinkDetector, this._xterm, capabilities, this._processManager.os || OS, this._resolvePath.bind(this)));
 		}
 		this._setupLinkDetector(TerminalWordLinkDetector.id, this._instantiationService.createInstance(TerminalWordLinkDetector, this._xterm));
@@ -85,7 +97,7 @@ export class TerminalLinkManager extends DisposableStore {
 		});
 
 		// Setup link openers
-		const localFileOpener = this._instantiationService.createInstance(TerminalLocalFileLinkOpener, this._processManager.os || OS);
+		const localFileOpener = this._instantiationService.createInstance(TerminalLocalFileLinkOpener);
 		const localFolderInWorkspaceOpener = this._instantiationService.createInstance(TerminalLocalFolderInWorkspaceLinkOpener);
 		this._openers.set(TerminalBuiltinLinkType.LocalFile, localFileOpener);
 		this._openers.set(TerminalBuiltinLinkType.LocalFolderInWorkspace, localFolderInWorkspaceOpener);
@@ -322,15 +334,6 @@ export class TerminalLinkManager extends DisposableStore {
 		return newLinkProvider;
 	}
 
-	protected get _localLinkRegex(): RegExp {
-		if (!this._processManager) {
-			throw new Error('Process manager is required');
-		}
-		const baseLocalLinkClause = this._processManager.os === OperatingSystem.Windows ? winLocalLinkClause : unixLocalLinkClause;
-		// Append line and column number regex
-		return new RegExp(`${baseLocalLinkClause}(${lineAndColumnClause})`);
-	}
-
 	protected _isLinkActivationModifierDown(event: MouseEvent): boolean {
 		const editorConf = this._configurationService.getValue<{ multiCursorModifier: 'ctrlCmd' | 'alt' }>('editor');
 		if (editorConf.multiCursorModifier === 'ctrlCmd') {
@@ -460,16 +463,30 @@ export class TerminalLinkManager extends DisposableStore {
 			}
 		}
 
-		const preprocessedLink = this._preprocessPath(link);
-		if (!preprocessedLink) {
+		// Remove any line/col suffix before processing the path
+		let linkUrl = removeLinkSuffix(link);
+		if (!linkUrl) {
 			this._resolvedLinkCache.set(link, null);
 			return null;
 		}
 
-		const linkUrl = this.extractLinkUrl(preprocessedLink);
-		if (!linkUrl) {
-			this._resolvedLinkCache.set(link, null);
-			return null;
+		// If the link looks like a /mnt/ WSL path and this is a Windows frontend, use the backend
+		// to get the resolved path from the wslpath util.
+		if (isWindows && link.match(/^\/mnt\/[a-z]/i) && this._processManager.backend) {
+			linkUrl = await this._processManager.backend.getWslPath(linkUrl, 'unix-to-win');
+		}
+		// Skip preprocessing if it looks like a special Windows -> WSL link
+		else if (isWindows && link.match(/^(?:\/\/|\\\\)wsl(?:\$|\.localhost)(\/|\\)/)) {
+			// No-op, it's already the right format
+		}
+		// Handle all non-WSL links
+		else {
+			const preprocessedLink = this._preprocessPath(linkUrl);
+			if (!preprocessedLink) {
+				this._resolvedLinkCache.set(link, null);
+				return null;
+			}
+			linkUrl = preprocessedLink;
 		}
 
 		try {
@@ -501,19 +518,6 @@ export class TerminalLinkManager extends DisposableStore {
 			return null;
 		}
 	}
-
-	/**
-	 * Returns url from link as link may contain line and column information.
-	 *
-	 * @param link url link which may contain line and column number.
-	 */
-	extractLinkUrl(link: string): string | null {
-		const matches: string[] | null = this._localLinkRegex.exec(link);
-		if (!matches) {
-			return null;
-		}
-		return matches[1];
-	}
 }
 
 export interface ILineColumnInfo {
diff --git a/src/vs/workbench/contrib/terminal/browser/links/terminalLinkOpeners.ts b/src/vs/workbench/contrib/terminal/browser/links/terminalLinkOpeners.ts
index 202e80186dbc91..b9f87b84940bce 100644
--- a/src/vs/workbench/contrib/terminal/browser/links/terminalLinkOpeners.ts
+++ b/src/vs/workbench/contrib/terminal/browser/links/terminalLinkOpeners.ts
@@ -15,19 +15,17 @@ import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { ITerminalLinkOpener, ITerminalSimpleLink } from 'vs/workbench/contrib/terminal/browser/links/links';
 import { osPathModule, updateLinkWithRelativeCwd } from 'vs/workbench/contrib/terminal/browser/links/terminalLinkHelpers';
-import { ILineColumnInfo } from 'vs/workbench/contrib/terminal/browser/links/terminalLinkManager';
-import { getLocalLinkRegex, lineAndColumnClause, lineAndColumnClauseGroupCount, unixLineAndColumnMatchIndex, winLineAndColumnMatchIndex } from 'vs/workbench/contrib/terminal/browser/links/terminalLocalLinkDetector';
 import { ITerminalCapabilityStore, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { IHostService } from 'vs/workbench/services/host/browser/host';
 import { QueryBuilder } from 'vs/workbench/services/search/common/queryBuilder';
 import { ISearchService } from 'vs/workbench/services/search/common/search';
-import { basename } from 'vs/base/common/path';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { getLinkSuffix } from 'vs/workbench/contrib/terminal/browser/links/terminalLinkParsing';
 
 export class TerminalLocalFileLinkOpener implements ITerminalLinkOpener {
 	constructor(
-		private readonly _os: OperatingSystem,
 		@IEditorService private readonly _editorService: IEditorService,
 	) {
 	}
@@ -36,81 +34,16 @@ export class TerminalLocalFileLinkOpener implements ITerminalLinkOpener {
 		if (!link.uri) {
 			throw new Error('Tried to open file link without a resolved URI');
 		}
-		const lineColumnInfo: ILineColumnInfo = this.extractLineColumnInfo(link.text, link.uri);
-		const selection: ITextEditorSelection = {
-			startLineNumber: lineColumnInfo.lineNumber,
-			startColumn: lineColumnInfo.columnNumber
+		const linkSuffix = getLinkSuffix(link.text);
+		const selection: ITextEditorSelection | undefined = linkSuffix?.row === undefined ? undefined : {
+			startLineNumber: linkSuffix?.row ?? 1,
+			startColumn: linkSuffix?.col ?? 1
 		};
 		await this._editorService.openEditor({
 			resource: link.uri,
 			options: { pinned: true, selection, revealIfOpened: true }
 		});
 	}
-
-	/**
-	 * Returns line and column number of URl if that is present, otherwise line 1 column 1.
-	 *
-	 * @param link Url link which may contain line and column number.
-	 */
-	extractLineColumnInfo(link: string, uri: URI): ILineColumnInfo {
-		const lineColumnInfo: ILineColumnInfo = {
-			lineNumber: 1,
-			columnNumber: 1
-		};
-
-		// Calculate the file name end using the URI if possible, this will help with sanitizing the
-		// link for the match regex. The actual path isn't important in extracting the line and
-		// column from the regex so modifying the link text before the file name is safe.
-		const fileName = basename(uri.path);
-		const index = link.indexOf(fileName);
-		const fileNameEndIndex: number = index !== -1 ? index + fileName.length : link.length;
-
-		// Sanitize the link text such that the folders and file name do not contain whitespace.
-		let sanitizedLink = link.slice(0, fileNameEndIndex).replace(/\s/g, '_') + link.slice(fileNameEndIndex);
-
-		// Remove / suffixes from Windows paths such that the windows link regex works
-		// (eg. /c:/file -> c:/file)
-		if (this._os === OperatingSystem.Windows && sanitizedLink.match(/^\/[a-z]:\//i)) {
-			sanitizedLink = sanitizedLink.slice(1);
-		}
-
-		// The local link regex only works for non file:// links, check these for a simple
-		// `:line:col` suffix
-		if (sanitizedLink.startsWith('file://')) {
-			const simpleMatches = sanitizedLink.match(/:(\d+)(:(\d+))?$/);
-			if (simpleMatches) {
-				if (simpleMatches[1] !== undefined) {
-					lineColumnInfo.lineNumber = parseInt(simpleMatches[1]);
-				}
-				if (simpleMatches[3] !== undefined) {
-					lineColumnInfo.columnNumber = parseInt(simpleMatches[3]);
-				}
-			}
-			return lineColumnInfo;
-		}
-
-		const matches: string[] | null = getLocalLinkRegex(this._os).exec(sanitizedLink);
-		if (!matches) {
-			return lineColumnInfo;
-		}
-
-		const lineAndColumnMatchIndex = this._os === OperatingSystem.Windows ? winLineAndColumnMatchIndex : unixLineAndColumnMatchIndex;
-		for (let i = 0; i < lineAndColumnClause.length; i++) {
-			const lineMatchIndex = lineAndColumnMatchIndex + (lineAndColumnClauseGroupCount * i);
-			const rowNumber = matches[lineMatchIndex];
-			if (rowNumber) {
-				lineColumnInfo['lineNumber'] = parseInt(rowNumber, 10);
-				// Check if column number exists
-				const columnNumber = matches[lineMatchIndex + 2];
-				if (columnNumber) {
-					lineColumnInfo['columnNumber'] = parseInt(columnNumber, 10);
-				}
-				break;
-			}
-		}
-
-		return lineColumnInfo;
-	}
 }
 
 export class TerminalLocalFolderInWorkspaceLinkOpener implements ITerminalLinkOpener {
@@ -156,13 +89,20 @@ export class TerminalSearchLinkOpener implements ITerminalLinkOpener {
 	}
 
 	async open(link: ITerminalSimpleLink): Promise<void> {
-		const pathSeparator = osPathModule(this._os).sep;
+		const osPath = osPathModule(this._os);
+		const pathSeparator = osPath.sep;
 		// Remove file:/// and any leading ./ or ../ since quick access doesn't understand that format
 		let text = link.text.replace(/^file:\/\/\/?/, '');
-		text = osPathModule(this._os).normalize(text).replace(/^(\.+[\\/])+/, '');
+		text = osPath.normalize(text).replace(/^(\.+[\\/])+/, '');
+
+		// Remove `:<one or more non number characters>` from the end of the link.
+		// Examples:
+		// - Ruby stack traces: <link>:in ...
+		// - Grep output: <link>:<result line>
+		// This only happens when the colon is _not_ followed by a forward- or back-slash as that
+		// would break absolute Windows paths (eg. `C:/Users/...`).
+		text = text.replace(/:[^\\/][^\d]+$/, '');
 
-		// Remove `:in` from the end which is how Ruby outputs stack traces
-		text = text.replace(/:in$/, '');
 		// If any of the names of the folders in the workspace matches
 		// a prefix of the link, remove that prefix and continue
 		this._workspaceContextService.getWorkspace().folders.forEach((folder) => {
@@ -173,7 +113,7 @@ export class TerminalSearchLinkOpener implements ITerminalLinkOpener {
 		});
 		let cwdResolvedText = text;
 		if (this._capabilities.has(TerminalCapability.CommandDetection)) {
-			cwdResolvedText = updateLinkWithRelativeCwd(this._capabilities, link.bufferRange.start.y, text, pathSeparator) || text;
+			cwdResolvedText = updateLinkWithRelativeCwd(this._capabilities, link.bufferRange.start.y, text, osPath)?.[0] || text;
 		}
 
 		// Try open the cwd resolved link first
@@ -300,6 +240,7 @@ export class TerminalUrlLinkOpener implements ITerminalLinkOpener {
 	constructor(
 		private readonly _isRemote: boolean,
 		@IOpenerService private readonly _openerService: IOpenerService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService
 	) {
 	}
 
@@ -310,8 +251,9 @@ export class TerminalUrlLinkOpener implements ITerminalLinkOpener {
 		// It's important to use the raw string value here to avoid converting pre-encoded values
 		// from the URL like `%2B` -> `+`.
 		this._openerService.open(link.text, {
-			allowTunneling: this._isRemote,
+			allowTunneling: this._isRemote && this._configurationService.getValue('remote.forwardOnOpen'),
 			allowContributedOpeners: true,
+			openExternal: true
 		});
 	}
 }
diff --git a/src/vs/workbench/contrib/terminal/browser/links/terminalLinkParsing.ts b/src/vs/workbench/contrib/terminal/browser/links/terminalLinkParsing.ts
new file mode 100644
index 00000000000000..6ab7f45143ee84
--- /dev/null
+++ b/src/vs/workbench/contrib/terminal/browser/links/terminalLinkParsing.ts
@@ -0,0 +1,96 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Lazy } from 'vs/base/common/lazy';
+
+/**
+ * A regex that extracts the link suffix which contains line and column information.
+ */
+const linkSuffixRegex = new Lazy<RegExp>(() => {
+	let ri = 0;
+	let ci = 0;
+	function l(): string {
+		return `(?<row${ri++}>\\d+)`;
+	}
+	function c(): string {
+		return `(?<col${ci++}>\\d+)`;
+	}
+
+	// The comments in the regex below use real strings/numbers for better readability, here's
+	// the legend:
+	// - Path = foo
+	// - Row  = 339
+	// - Col  = 12
+	//
+	// These all support single quote ' in the place of " and [] in the place of ()
+	const lineAndColumnRegexClauses = [
+		// foo:339
+		// foo:339:12
+		// foo 339
+		// foo 339:12                   [#140780]
+		// "foo",339
+		// "foo",339:12
+		`(?::| |['"],)${l()}(:${c()})?$`,
+		// "foo", line 339               [#40468]
+		// "foo", line 339, col 12
+		// "foo", line 339, column 12
+		// "foo":line 339
+		// "foo":line 339, col 12
+		// "foo":line 339, column 12
+		// "foo": line 339
+		// "foo": line 339, col 12
+		// "foo": line 339, column 12
+		// "foo" on line 339
+		// "foo" on line 339, col 12
+		// "foo" on line 339, column 12
+		`['"](?:, |: ?| on )line ${l()}(, col(?:umn)? ${c()})?$`,
+		// foo(339)
+		// foo(339,12)
+		// foo(339, 12)
+		// foo (339)
+		// foo (339,12)
+		// foo (339, 12)
+		` ?[\\[\\(]${l()}(?:, ?${c()})?[\\]\\)]`,
+	];
+
+	const suffixClause = lineAndColumnRegexClauses
+		// Join all clauses together
+		.join('|')
+		// Convert spaces to allow the non-breaking space char (ascii 160)
+		.replace(/ /g, `[${'\u00A0'} ]`);
+
+	return new RegExp(`(${suffixClause})`);
+});
+
+/**
+ * Removes the optional link suffix which contains line and column information.
+ * @param link The link to parse.
+ */
+export function removeLinkSuffix(link: string): string {
+	const suffix = getLinkSuffix(link)?.suffix;
+	if (!suffix) {
+		return link;
+	}
+	return link.substring(0, suffix.index);
+}
+
+/**
+ * Returns the optional link suffix which contains line and column information.
+ * @param link The link to parse.
+ */
+export function getLinkSuffix(link: string): { row: number | undefined; col: number | undefined; suffix: { index: number; text: string } } | null {
+	const matches = linkSuffixRegex.getValue().exec(link);
+	const groups = matches?.groups;
+	if (!groups || matches.length < 1) {
+		return null;
+	}
+	const rowString = groups.row0 || groups.row1 || groups.row2;
+	const colString = groups.col0 || groups.col1 || groups.col2;
+	return {
+		row: rowString !== undefined ? parseInt(rowString) : undefined,
+		col: colString !== undefined ? parseInt(colString) : undefined,
+		suffix: { index: matches.index, text: matches[0] }
+	};
+}
diff --git a/src/vs/workbench/contrib/terminal/browser/links/terminalLocalLinkDetector.ts b/src/vs/workbench/contrib/terminal/browser/links/terminalLocalLinkDetector.ts
index dd4e98400043d2..8534df2b796dcd 100644
--- a/src/vs/workbench/contrib/terminal/browser/links/terminalLocalLinkDetector.ts
+++ b/src/vs/workbench/contrib/terminal/browser/links/terminalLocalLinkDetector.ts
@@ -8,9 +8,9 @@ import { URI } from 'vs/base/common/uri';
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { ITerminalLinkDetector, ITerminalSimpleLink, ResolvedLink, TerminalBuiltinLinkType } from 'vs/workbench/contrib/terminal/browser/links/links';
-import { convertLinkRangeToBuffer, getXtermLineContent, osPathModule, updateLinkWithRelativeCwd } from 'vs/workbench/contrib/terminal/browser/links/terminalLinkHelpers';
+import { convertLinkRangeToBuffer, getXtermLineContent, getXtermRangesByAttr, osPathModule, updateLinkWithRelativeCwd } from 'vs/workbench/contrib/terminal/browser/links/terminalLinkHelpers';
 import { ITerminalCapabilityStore, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { IBufferLine, Terminal } from 'xterm';
+import { IBufferLine, IBufferRange, Terminal } from 'xterm';
 
 const enum Constants {
 	/**
@@ -31,21 +31,27 @@ const enum Constants {
 	MaxResolvedLinkLength = 1024,
 }
 
-const pathPrefix = '(\\.\\.?|\\~)';
-const pathSeparatorClause = '\\/';
-// '":; are allowed in paths but they are often separators so ignore them
-// Also disallow \\ to prevent a catastropic backtracking case #24795
-const excludedPathCharactersClause = '[^\\0\\s!`&*()\\[\\]\'":;\\\\]';
+const enum RegexPathConstants {
+	PathPrefix = '(\\.\\.?|\\~)',
+	PathSeparatorClause = '\\/',
+	// '":; are allowed in paths but they are often separators so ignore them
+	// Also disallow \\ to prevent a catastropic backtracking case #24795
+	ExcludedPathCharactersClause = '[^\\0\\s!`&*()\'":;\\\\]',
+	ExcludedStartPathCharactersClause = '[^\\0\\s!`&*()\\[\\]\'":;\\\\]',
+	WinOtherPathPrefix = '\\.\\.?|\\~',
+	WinPathSeparatorClause = '(\\\\|\\/)',
+	WinExcludedPathCharactersClause = '[^\\0<>\\?\\|\\/\\s!`&*()\'":;]',
+	WinExcludedStartPathCharactersClause = '[^\\0<>\\?\\|\\/\\s!`&*()\\[\\]\'":;]',
+}
+
 /** A regex that matches paths in the form /foo, ~/foo, ./foo, ../foo, foo/bar */
-export const unixLocalLinkClause = '((' + pathPrefix + '|(' + excludedPathCharactersClause + ')+)?(' + pathSeparatorClause + '(' + excludedPathCharactersClause + ')+)+)';
+export const unixLocalLinkClause = '((' + RegexPathConstants.PathPrefix + '|(' + RegexPathConstants.ExcludedStartPathCharactersClause + RegexPathConstants.ExcludedPathCharactersClause + '*))?(' + RegexPathConstants.PathSeparatorClause + '(' + RegexPathConstants.ExcludedPathCharactersClause + ')+)+)';
 
 export const winDrivePrefix = '(?:\\\\\\\\\\?\\\\)?[a-zA-Z]:';
-const winPathPrefix = '(' + winDrivePrefix + '|\\.\\.?|\\~)';
-const winPathSeparatorClause = '(\\\\|\\/)';
-const winExcludedPathCharactersClause = '[^\\0<>\\?\\|\\/\\s!`&*()\\[\\]\'":;]';
 /** A regex that matches paths in the form \\?\c:\foo c:\foo, ~\foo, .\foo, ..\foo, foo\bar */
-export const winLocalLinkClause = '((' + winPathPrefix + '|(' + winExcludedPathCharactersClause + ')+)?(' + winPathSeparatorClause + '(' + winExcludedPathCharactersClause + ')+)+)';
+export const winLocalLinkClause = '((' + `(${winDrivePrefix}|${RegexPathConstants.WinOtherPathPrefix})` + '|(' + RegexPathConstants.WinExcludedStartPathCharactersClause + RegexPathConstants.WinExcludedPathCharactersClause + '*))?(' + RegexPathConstants.WinPathSeparatorClause + '(' + RegexPathConstants.WinExcludedPathCharactersClause + ')+)+)';
 
+// TODO: This should eventually move to the more structured terminalLinkParsing
 /** As xterm reads from DOM, space in that case is nonbreaking char ASCII code - 160,
 replacing space with nonBreakningSpace or space ASCII code - 32. */
 export const lineAndColumnClause = [
@@ -58,12 +64,12 @@ export const lineAndColumnClause = [
 	'(([^:\\s\\(\\)<>\'\"\\[\\]]*)(:(\\d+))?(:(\\d+))?)' // (file path):336, (file path):336:9
 ].join('|').replace(/ /g, `[${'\u00A0'} ]`);
 
-// Changing any regex may effect this value, hence changes this as well if required.
-export const winLineAndColumnMatchIndex = 12;
-export const unixLineAndColumnMatchIndex = 11;
-
-// Each line and column clause have 6 groups (ie no. of expressions in round brackets)
-export const lineAndColumnClauseGroupCount = 6;
+const fallbackMatchers: RegExp[] = [
+	// Python style error: File "<path>", line <line>
+	/^\s*File (?<link>"(?<path>.+)"(, line (?<line>\d+))?)/,
+	// The whole line is the path
+	/^(?<link>(?<path>.+))/
+];
 
 export class TerminalLocalLinkDetector implements ITerminalLinkDetector {
 	static id = 'local';
@@ -119,6 +125,17 @@ export class TerminalLocalLinkDetector implements ITerminalLinkDetector {
 				break;
 			}
 
+			// HACK: In order to support both links containing [ and ] characters as well as the
+			// `<file>[<line>, <col>]` pattern, we need to detect the part after the comma and fix
+			// up the link here as before that will be matched as a regular file path.
+			if (link.match(/\[\d+,$/)) {
+				const partialText = text.slice(rex.lastIndex);
+				const suffixMatch = partialText.match(/^ \d+\]/);
+				if (suffixMatch) {
+					link += suffixMatch[0];
+				}
+			}
+
 			// Adjust the link range to exclude a/ and b/ if it looks like a git diff
 			if (
 				// --- a/foo/bar
@@ -131,6 +148,11 @@ export class TerminalLocalLinkDetector implements ITerminalLinkDetector {
 				stringIndex += 2;
 			}
 
+			// Don't try resolve any links of excessive length
+			if (link.length > Constants.MaxResolvedLinkLength) {
+				continue;
+			}
+
 			// Convert the link text's string index into a wrapped buffer range
 			const bufferRange = convertLinkRangeToBuffer(lines, this.xterm.cols, {
 				startColumn: stringIndex + 1,
@@ -139,25 +161,20 @@ export class TerminalLocalLinkDetector implements ITerminalLinkDetector {
 				endLineNumber: 1
 			}, startLine);
 
-
-			// Don't try resolve any links of excessive length
-			if (link.length > Constants.MaxResolvedLinkLength) {
-				continue;
-			}
-
 			// Get a single link candidate if the cwd of the line is known
 			const linkCandidates: string[] = [];
-			if (osPathModule(this._os).isAbsolute(link)) {
+			if (osPathModule(this._os).isAbsolute(link) || link.startsWith('~')) {
 				linkCandidates.push(link);
 			} else {
 				if (this._capabilities.has(TerminalCapability.CommandDetection)) {
-					const absolutePath = updateLinkWithRelativeCwd(this._capabilities, bufferRange.start.y, link, osPathModule(this._os).sep);
+					const osModule = osPathModule(this._os);
+					const absolutePath = updateLinkWithRelativeCwd(this._capabilities, bufferRange.start.y, link, osModule);
 					// Only add a single exact link candidate if the cwd is available, this may cause
 					// the link to not be resolved but that should only occur when the actual file does
 					// not exist. Doing otherwise could cause unexpected results where handling via the
 					// word link detector is preferable.
 					if (absolutePath) {
-						linkCandidates.push(absolutePath);
+						linkCandidates.push(...absolutePath);
 					}
 				} else {
 					// Fallback to resolving against the initial cwd, removing any relative directory prefixes
@@ -167,26 +184,105 @@ export class TerminalLocalLinkDetector implements ITerminalLinkDetector {
 					}
 				}
 			}
-			const linkStat = await this._validateLinkCandidates(linkCandidates);
-
-			// Create the link if validated
-			if (linkStat) {
-				let type: TerminalBuiltinLinkType;
-				if (linkStat.isDirectory) {
-					if (this._isDirectoryInsideWorkspace(linkStat.uri)) {
-						type = TerminalBuiltinLinkType.LocalFolderInWorkspace;
-					} else {
-						type = TerminalBuiltinLinkType.LocalFolderOutsideWorkspace;
+
+			// If any candidates end with special characters that are likely to not be part of the
+			// link, add a candidate excluding them.
+			const specialEndCharRegex = /[\[\]]$/;
+			const trimRangeMap: Map<string, number> = new Map();
+			const specialEndLinkCandidates: string[] = [];
+			for (const candidate of linkCandidates) {
+				let previous = candidate;
+				let removed = previous.replace(specialEndCharRegex, '');
+				let trimRange = 0;
+				while (removed !== previous) {
+					trimRange++;
+					specialEndLinkCandidates.push(removed);
+					trimRangeMap.set(removed, trimRange);
+					previous = removed;
+					removed = removed.replace(specialEndCharRegex, '');
+				}
+			}
+			linkCandidates.push(...specialEndLinkCandidates);
+
+			// Validate and add link
+			const simpleLink = await this._validateAndGetLink(undefined, bufferRange, linkCandidates, trimRangeMap);
+			if (simpleLink) {
+				links.push(simpleLink);
+			}
+
+			// Stop early if too many links exist in the line
+			if (++resolvedLinkCount >= Constants.MaxResolvedLinksInLine) {
+				break;
+			}
+		}
+
+		// Match against the fallback matchers which are mainly designed to catch paths with spaces
+		// that aren't possible using the regular mechanism.
+		if (links.length === 0) {
+			for (const matcher of fallbackMatchers) {
+				const match = text.match(matcher);
+				const group = match?.groups;
+				if (!group) {
+					continue;
+				}
+				const link = group?.link;
+				const path = group?.path;
+				const line = group?.line;
+				if (!link || !path) {
+					continue;
+				}
+
+				// Don't try resolve any links of excessive length
+				if (link.length > Constants.MaxResolvedLinkLength) {
+					continue;
+				}
+
+				// Convert the link text's string index into a wrapped buffer range
+				stringIndex = text.indexOf(link);
+				const bufferRange = convertLinkRangeToBuffer(lines, this.xterm.cols, {
+					startColumn: stringIndex + 1,
+					startLineNumber: 1,
+					endColumn: stringIndex + link.length + 1,
+					endLineNumber: 1
+				}, startLine);
+
+				// Validate and add link
+				const simpleLink = await this._validateAndGetLink(line ? `${path}:${line}` : path, bufferRange, [path]);
+				if (simpleLink) {
+					links.push(simpleLink);
+				}
+
+				// Only match a single fallback matcher
+				break;
+			}
+		}
+
+		// Sometimes links are styled specially in the terminal like underlined or bolded, try split
+		// the line by attributes and test whether it matches a path
+		if (links.length === 0) {
+			const rangeCandidates = getXtermRangesByAttr(this.xterm.buffer.active, startLine, endLine, this.xterm.cols);
+			for (const rangeCandidate of rangeCandidates) {
+				let text = '';
+				for (let y = rangeCandidate.start.y; y <= rangeCandidate.end.y; y++) {
+					const line = this.xterm.buffer.active.getLine(y);
+					if (!line) {
+						break;
 					}
-				} else {
-					type = TerminalBuiltinLinkType.LocalFile;
+					const lineStartX = y === rangeCandidate.start.y ? rangeCandidate.start.x : 0;
+					const lineEndX = y === rangeCandidate.end.y ? rangeCandidate.end.x : this.xterm.cols - 1;
+					text += line.translateToString(false, lineStartX, lineEndX);
+				}
+
+				// HACK: Adjust to 1-based for link API
+				rangeCandidate.start.x++;
+				rangeCandidate.start.y++;
+				rangeCandidate.end.y++;
+
+				// Validate and add link
+				const simpleLink = await this._validateAndGetLink(text, rangeCandidate, [text]);
+				if (simpleLink) {
+					links.push(simpleLink);
 				}
-				links.push({
-					text: linkStat.link,
-					uri: linkStat.uri,
-					bufferRange,
-					type
-				});
 
 				// Stop early if too many links exist in the line
 				if (++resolvedLinkCount >= Constants.MaxResolvedLinksInLine) {
@@ -217,6 +313,45 @@ export class TerminalLocalLinkDetector implements ITerminalLinkDetector {
 		}
 		return undefined;
 	}
+
+	/**
+	 * Validates a set of link candidates and returns a link if validated.
+	 * @param linkText The link text, this should be undefined to use the link stat value
+	 * @param trimRangeMap A map of link candidates to the amount of buffer range they need trimmed.
+	 */
+	private async _validateAndGetLink(linkText: string | undefined, bufferRange: IBufferRange, linkCandidates: string[], trimRangeMap?: Map<string, number>): Promise<ITerminalSimpleLink | undefined> {
+		const linkStat = await this._validateLinkCandidates(linkCandidates);
+		if (linkStat) {
+			let type: TerminalBuiltinLinkType;
+			if (linkStat.isDirectory) {
+				if (this._isDirectoryInsideWorkspace(linkStat.uri)) {
+					type = TerminalBuiltinLinkType.LocalFolderInWorkspace;
+				} else {
+					type = TerminalBuiltinLinkType.LocalFolderOutsideWorkspace;
+				}
+			} else {
+				type = TerminalBuiltinLinkType.LocalFile;
+			}
+
+			// Offset the buffer range if the link range was trimmed
+			const trimRange = trimRangeMap?.get(linkStat.link);
+			if (trimRange) {
+				bufferRange.end.x -= trimRange;
+				if (bufferRange.end.x < 0) {
+					bufferRange.end.y--;
+					bufferRange.end.x += this.xterm.cols;
+				}
+			}
+
+			return {
+				text: linkText ?? linkStat.link,
+				uri: linkStat.uri,
+				bufferRange: bufferRange,
+				type
+			};
+		}
+		return undefined;
+	}
 }
 
 export function getLocalLinkRegex(os: OperatingSystem): RegExp {
diff --git a/src/vs/workbench/contrib/terminal/browser/links/terminalUriLinkDetector.ts b/src/vs/workbench/contrib/terminal/browser/links/terminalUriLinkDetector.ts
index ffe6418a869032..d1729c5746187d 100644
--- a/src/vs/workbench/contrib/terminal/browser/links/terminalUriLinkDetector.ts
+++ b/src/vs/workbench/contrib/terminal/browser/links/terminalUriLinkDetector.ts
@@ -76,33 +76,46 @@ export class TerminalUriLinkDetector implements ITerminalLinkDetector {
 				continue;
 			}
 
-			const linkStat = await this._resolvePath(text, uri);
-
-			// Create the link if validated
-			if (linkStat) {
-				let type: TerminalBuiltinLinkType;
-				if (linkStat.isDirectory) {
-					if (this._isDirectoryInsideWorkspace(linkStat.uri)) {
-						type = TerminalBuiltinLinkType.LocalFolderInWorkspace;
+			// As a fallback URI, treat the authority as local to the workspace. This is required
+			// for `ls --hyperlink` support for example which includes the hostname in the URI like
+			// `file://Some-Hostname/mnt/c/foo/bar`.
+			const uriCandidates: URI[] = [uri];
+			if (uri.authority.length > 0) {
+				uriCandidates.push(URI.from({ ...uri, authority: undefined }));
+			}
+
+			// Iterate over all candidates, pushing the candidate on the first that's verified
+			for (const uriCandidate of uriCandidates) {
+				const linkStat = await this._resolvePath(text, uriCandidate);
+
+				// Create the link if validated
+				if (linkStat) {
+					let type: TerminalBuiltinLinkType;
+					if (linkStat.isDirectory) {
+						if (this._isDirectoryInsideWorkspace(uriCandidate)) {
+							type = TerminalBuiltinLinkType.LocalFolderInWorkspace;
+						} else {
+							type = TerminalBuiltinLinkType.LocalFolderOutsideWorkspace;
+						}
 					} else {
-						type = TerminalBuiltinLinkType.LocalFolderOutsideWorkspace;
+						type = TerminalBuiltinLinkType.LocalFile;
 					}
-				} else {
-					type = TerminalBuiltinLinkType.LocalFile;
-				}
-				links.push({
-					// Use computedLink.url if it's a string to retain the line/col suffix
-					text: typeof computedLink.url === 'string' ? computedLink.url : linkStat.link,
-					uri: linkStat.uri,
-					bufferRange,
-					type
-				});
-
-				// Stop early if too many links exist in the line
-				if (++resolvedLinkCount >= Constants.MaxResolvedLinksInLine) {
+					links.push({
+						// Use computedLink.url if it's a string to retain the line/col suffix
+						text: typeof computedLink.url === 'string' ? computedLink.url : linkStat.link,
+						uri: uriCandidate,
+						bufferRange,
+						type
+					});
+					resolvedLinkCount++;
 					break;
 				}
 			}
+
+			// Stop early if too many links exist in the line
+			if (++resolvedLinkCount >= Constants.MaxResolvedLinksInLine) {
+				break;
+			}
 		}
 
 		return links;
diff --git a/src/vs/workbench/contrib/terminal/browser/links/terminalWordLinkDetector.ts b/src/vs/workbench/contrib/terminal/browser/links/terminalWordLinkDetector.ts
index 637ff8dad9c58f..6e5a22f1d325cd 100644
--- a/src/vs/workbench/contrib/terminal/browser/links/terminalWordLinkDetector.ts
+++ b/src/vs/workbench/contrib/terminal/browser/links/terminalWordLinkDetector.ts
@@ -3,7 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { URI } from 'vs/base/common/uri';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { matchesScheme } from 'vs/platform/opener/common/opener';
+import { IProductService } from 'vs/platform/product/common/productService';
 import { ITerminalSimpleLink, ITerminalLinkDetector, TerminalBuiltinLinkType } from 'vs/workbench/contrib/terminal/browser/links/links';
 import { convertLinkRangeToBuffer, getXtermLineContent } from 'vs/workbench/contrib/terminal/browser/links/terminalLinkHelpers';
 import { ITerminalConfiguration, TERMINAL_CONFIG_SECTION } from 'vs/workbench/contrib/terminal/common/terminal';
@@ -32,6 +35,7 @@ export class TerminalWordLinkDetector implements ITerminalLinkDetector {
 	constructor(
 		readonly xterm: Terminal,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IProductService private readonly _productService: IProductService,
 	) {
 	}
 
@@ -68,6 +72,22 @@ export class TerminalWordLinkDetector implements ITerminalLinkDetector {
 				},
 				startLine
 			);
+
+			// Support this product's URL protocol
+			if (matchesScheme(word.text, this._productService.urlProtocol)) {
+				const uri = URI.parse(word.text);
+				if (uri) {
+					links.push({
+						text: word.text,
+						uri,
+						bufferRange,
+						type: TerminalBuiltinLinkType.Url
+					});
+				}
+				continue;
+			}
+
+			// Search links
 			links.push({
 				text: word.text,
 				bufferRange,
diff --git a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh b/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh
index 301596464f075b..65abb408438263 100755
--- a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh
+++ b/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh
@@ -37,6 +37,27 @@ if [ -z "$VSCODE_SHELL_INTEGRATION" ]; then
 	builtin return
 fi
 
+__vsc_get_trap() {
+	# 'trap -p DEBUG' outputs a shell command like `trap -- '…shellcode…' DEBUG`.
+	# The terms are quoted literals, but are not guaranteed to be on a single line.
+	# (Consider a trap like $'echo foo\necho \'bar\'').
+	# To parse, we splice those terms into an expression capturing them into an array.
+	# This preserves the quoting of those terms: when we `eval` that expression, they are preserved exactly.
+	# This is different than simply exploding the string, which would split everything on IFS, oblivious to quoting.
+	builtin local -a terms
+	builtin eval "terms=( $(trap -p "${1:-DEBUG}") )"
+	#                    |________________________|
+	#                            |
+	#        \-------------------*--------------------/
+	# terms=( trap  --  '…arbitrary shellcode…'  DEBUG )
+	#        |____||__| |_____________________| |_____|
+	#          |    |            |                |
+	#          0    1            2                3
+	#                            |
+	#                   \--------*----/
+	builtin printf '%s' "${terms[2]:-}"
+}
+
 # The property (P) and command (E) codes embed values which require escaping.
 # Backslashes are doubled. Non-alphanumeric characters are converted to escaped hex.
 __vsc_escape_value() {
@@ -181,16 +202,8 @@ if [[ -n "${bash_preexec_imported:-}" ]]; then
 	precmd_functions+=(__vsc_prompt_cmd)
 	preexec_functions+=(__vsc_preexec_only)
 else
-	__vsc_dbg_trap="$(trap -p DEBUG)"
-	if [[ "$__vsc_dbg_trap" =~ .*\[\[.* ]]; then
-		#HACK - is there a better way to do this?
-		__vsc_dbg_trap=${__vsc_dbg_trap#'trap -- '*}
-		__vsc_dbg_trap=${__vsc_dbg_trap%' DEBUG'}
-		__vsc_dbg_trap=${__vsc_dbg_trap#"'"*}
-		__vsc_dbg_trap=${__vsc_dbg_trap%"'"}
-	else
-		__vsc_dbg_trap="$(trap -p DEBUG | cut -d' ' -f3 | tr -d \')"
-	fi
+	__vsc_dbg_trap="$(__vsc_get_trap DEBUG)"
+
 	if [[ -z "$__vsc_dbg_trap" ]]; then
 		__vsc_preexec_only() {
 			if [ "$__vsc_in_command_execution" = "0" ]; then
@@ -203,7 +216,7 @@ else
 		__vsc_preexec_all() {
 			if [ "$__vsc_in_command_execution" = "0" ]; then
 				__vsc_in_command_execution="1"
-				builtin eval ${__vsc_dbg_trap}
+				builtin eval "${__vsc_dbg_trap}"
 				__vsc_preexec
 			fi
 		}
diff --git a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-rc.zsh b/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-rc.zsh
index 65f580784a862b..9acebf9238b6f5 100644
--- a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-rc.zsh
+++ b/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-rc.zsh
@@ -14,17 +14,21 @@ fi
 # as disable it by unsetting the variable.
 VSCODE_SHELL_INTEGRATION=1
 
+# By default, zsh will set the $HISTFILE to the $ZDOTDIR location automatically. In the case of the
+# shell integration being injected, this means that the terminal will use a different history file
+# to other terminals. To fix this issue, set $HISTFILE back to the default location before ~/.zshrc
+# is called as that may depend upon the value.
+if [[  "$VSCODE_INJECTION" == "1" ]]; then
+	HISTFILE=$USER_ZDOTDIR/.zsh_history
+fi
+
 # Only fix up ZDOTDIR if shell integration was injected (not manually installed) and has not been called yet
 if [[ "$VSCODE_INJECTION" == "1" ]]; then
 	if [[ $options[norcs] = off  && -f $USER_ZDOTDIR/.zshrc ]]; then
 		VSCODE_ZDOTDIR=$ZDOTDIR
 		ZDOTDIR=$USER_ZDOTDIR
+		# A user's custom HISTFILE location might be set when their .zshrc file is sourced below
 		. $USER_ZDOTDIR/.zshrc
-		ZDOTDIR=$VSCODE_ZDOTDIR
-	fi
-
-	if [[ -f $USER_ZDOTDIR/.zsh_history ]]; then
-		HISTFILE=$USER_ZDOTDIR/.zsh_history
 	fi
 fi
 
diff --git a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration.fish b/src/vs/workbench/contrib/terminal/browser/media/shellIntegration.fish
index b21517cf07fe75..8db7aca4ad975e 100644
--- a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration.fish
+++ b/src/vs/workbench/contrib/terminal/browser/media/shellIntegration.fish
@@ -75,7 +75,7 @@ end
 # Sent whenever a new fish prompt is about to be displayed.
 # Updates the current working directory.
 function __vsc_update_cwd --on-event fish_prompt
-	__vsc_esc P "Cwd=$(__vsc_escape_value "$PWD")"
+	__vsc_esc P Cwd=(__vsc_escape_value "$PWD")
 
 	# If a command marker exists, remove it.
 	# Otherwise, the commandline is empty and no command was run.
diff --git a/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts b/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
index 16238ea7baf1aa..ee8371a0eedee2 100644
--- a/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
+++ b/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
@@ -314,12 +314,12 @@ class RemoteTerminalBackend extends BaseTerminalBackend implements ITerminalBack
 		return resolverResult.options?.extensionHostEnv as any;
 	}
 
-	async getWslPath(original: string): Promise<string> {
+	async getWslPath(original: string, direction: 'unix-to-win' | 'win-to-unix'): Promise<string> {
 		const env = await this._remoteAgentService.getEnvironment();
 		if (env?.os !== OperatingSystem.Windows) {
 			return original;
 		}
-		return this._remoteTerminalChannel?.getWslPath(original) || original;
+		return this._remoteTerminalChannel?.getWslPath(original, direction) || original;
 	}
 
 	async setTerminalLayoutInfo(layout?: ITerminalsLayoutInfoById): Promise<void> {
diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
index 34bad1acf3af1f..849cf3cdd70aad 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
@@ -165,15 +165,17 @@ function registerSendSequenceKeybinding(text: string, rule: { when?: ContextKeyE
 	});
 }
 
-// The text representation of `^<letter>` is `'A'.charCodeAt(0) + 1`.
-const CTRL_LETTER_OFFSET = 64;
+const enum Constants {
+	/** The text representation of `^<letter>` is `'A'.charCodeAt(0) + 1`. */
+	CtrlLetterOffset = 64
+}
 
 // An extra Windows-only ctrl+v keybinding is used for pwsh that sends ctrl+v directly to the
 // shell, this gets handled by PSReadLine which properly handles multi-line pastes. This is
 // disabled in accessibility mode as PowerShell does not run PSReadLine when it detects a screen
 // reader. This works even when clipboard.readText is not supported.
 if (isWindows) {
-	registerSendSequenceKeybinding(String.fromCharCode('V'.charCodeAt(0) - CTRL_LETTER_OFFSET), { // ctrl+v
+	registerSendSequenceKeybinding(String.fromCharCode('V'.charCodeAt(0) - Constants.CtrlLetterOffset), { // ctrl+v
 		when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, WindowsShellType.PowerShell), CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
 		primary: KeyMod.CtrlCmd | KeyCode.KeyV
 	});
@@ -208,21 +210,21 @@ registerSendSequenceKeybinding('\x1b[1;2H', { // Shift+home
 
 // send ctrl+c to the iPad when the terminal is focused and ctrl+c is pressed to kill the process (work around for #114009)
 if (isIOS) {
-	registerSendSequenceKeybinding(String.fromCharCode('C'.charCodeAt(0) - CTRL_LETTER_OFFSET), { // ctrl+c
+	registerSendSequenceKeybinding(String.fromCharCode('C'.charCodeAt(0) - Constants.CtrlLetterOffset), { // ctrl+c
 		when: ContextKeyExpr.and(TerminalContextKeys.focus),
 		primary: KeyMod.WinCtrl | KeyCode.KeyC
 	});
 }
 
 // Delete word left: ctrl+w
-registerSendSequenceKeybinding(String.fromCharCode('W'.charCodeAt(0) - CTRL_LETTER_OFFSET), {
+registerSendSequenceKeybinding(String.fromCharCode('W'.charCodeAt(0) - Constants.CtrlLetterOffset), {
 	primary: KeyMod.CtrlCmd | KeyCode.Backspace,
 	mac: { primary: KeyMod.Alt | KeyCode.Backspace }
 });
 if (isWindows) {
 	// Delete word left: ctrl+h
 	// Windows cmd.exe requires ^H to delete full word left
-	registerSendSequenceKeybinding(String.fromCharCode('H'.charCodeAt(0) - CTRL_LETTER_OFFSET), {
+	registerSendSequenceKeybinding(String.fromCharCode('H'.charCodeAt(0) - Constants.CtrlLetterOffset), {
 		when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, WindowsShellType.CommandPrompt)),
 		primary: KeyMod.CtrlCmd | KeyCode.Backspace,
 	});
diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.ts b/src/vs/workbench/contrib/terminal/browser/terminal.ts
index 15cc6089671488..5ee8f59aacd4d6 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminal.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminal.ts
@@ -18,6 +18,7 @@ import { EditorInput } from 'vs/workbench/common/editor/editorInput';
 import { IEditableData } from 'vs/workbench/common/views';
 import { TerminalFindWidget } from 'vs/workbench/contrib/terminal/browser/terminalFindWidget';
 import { ITerminalStatusList } from 'vs/workbench/contrib/terminal/browser/terminalStatusList';
+import { ScrollPosition } from 'vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon';
 import { ITerminalQuickFixAddon } from 'vs/workbench/contrib/terminal/browser/xterm/quickFixAddon';
 import { INavigationMode, IRegisterContributedProfileArgs, IRemoteTerminalAttachTarget, IStartExtensionTerminalRequest, ITerminalBackend, ITerminalConfigHelper, ITerminalFont, ITerminalProcessExtHostProxy } from 'vs/workbench/contrib/terminal/common/terminal';
 import { EditorGroupColumn } from 'vs/workbench/services/editor/common/editorGroupColumn';
@@ -53,12 +54,11 @@ export interface ITerminalInstanceService {
 	/**
 	 * Create a new terminal instance.
 	 * @param launchConfig The shell launch config.
-	 * @param target The target of the terminal, when this is undefined the default target will be
-	 * used.
+	 * @param target The target of the terminal.
 	 * @param resource The URI for the terminal. Note that this is the unique identifier for the
 	 * terminal, not the cwd.
 	 */
-	createInstance(launchConfig: IShellLaunchConfig, target?: TerminalLocation, resource?: URI): ITerminalInstance;
+	createInstance(launchConfig: IShellLaunchConfig, target: TerminalLocation, resource?: URI): ITerminalInstance;
 
 	/**
 	 * Gets the registered backend for a remote authority (undefined = local). This is a convenience
@@ -85,7 +85,7 @@ export interface IQuickPickTerminalObject {
 }
 
 export interface IMarkTracker {
-	scrollToPreviousMark(): void;
+	scrollToPreviousMark(scrollPosition?: ScrollPosition, retainSelection?: boolean, skipEmptyCommands?: boolean): void;
 	scrollToNextMark(): void;
 	selectToPreviousMark(): void;
 	selectToNextMark(): void;
@@ -216,6 +216,9 @@ export interface ITerminalService extends ITerminalInstanceHost {
 	setNativeDelegate(nativeCalls: ITerminalServiceNativeDelegate): void;
 	handleNewRegisteredBackend(backend: ITerminalBackend): void;
 	toggleEscapeSequenceLogging(): Promise<void>;
+
+	getEditingTerminal(): ITerminalInstance | undefined;
+	setEditingTerminal(instance: ITerminalInstance | undefined): void;
 }
 export class TerminalLinkQuickPickEvent extends MouseEvent {
 
@@ -414,14 +417,6 @@ export interface ISearchOptions {
 	incremental?: boolean;
 }
 
-export interface ITerminalBeforeHandleLinkEvent {
-	terminal?: ITerminalInstance;
-	/** The text of the link */
-	link: string;
-	/** Call with whether the link was handled by the interceptor */
-	resolve(wasHandled: boolean): void;
-}
-
 export interface ITerminalInstance {
 	/**
 	 * The ID of the terminal instance, this is an arbitrary number only used to uniquely identify
@@ -484,11 +479,6 @@ export interface ITerminalInstance {
 	 */
 	readonly persistentProcessId: number | undefined;
 
-	/**
-	 * The id of a persistent process during the shutdown process
-	 */
-	shutdownPersistentProcessId: number | undefined;
-
 	/**
 	 * Whether the process should be persisted across reloads.
 	 */
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts
index d253aa2d8b54ee..3646720d1f3a28 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts
@@ -116,8 +116,6 @@ export const terminalSendSequenceCommand = (accessor: ServicesAccessor, args: {
 	});
 };
 
-const terminalIndexRe = /^([0-9]+): /;
-
 export class TerminalLaunchHelpAction extends Action {
 
 	constructor(
@@ -589,7 +587,7 @@ export function registerTerminalActions() {
 				const endOfLinePreference = isWindows ? EndOfLinePreference.LF : EndOfLinePreference.CRLF;
 				text = editor.getModel().getValueInRange(selection, endOfLinePreference);
 			}
-			instance.sendText(text, true);
+			instance.sendText(text, true, true);
 			if (instance.target === TerminalLocation.Editor) {
 				await terminalEditorService.revealActiveEditor();
 			} else {
@@ -1053,11 +1051,13 @@ export function registerTerminalActions() {
 				return;
 			}
 
+			terminalService.setEditingTerminal(instance);
 			terminalService.setEditable(instance, {
 				validationMessage: value => validateTerminalName(value),
 				onFinish: async (value, success) => {
 					// Cancel editing first as instance.rename will trigger a rerender automatically
 					terminalService.setEditable(instance, null);
+					terminalService.setEditingTerminal(undefined);
 					if (success) {
 						try {
 							await instance.rename(value);
@@ -1213,7 +1213,7 @@ export function registerTerminalActions() {
 		}
 		run(accessor: ServicesAccessor) {
 			accessor.get(ITerminalService).doWithActiveInstance(t => {
-				t.xterm?.markTracker.scrollToPreviousMark();
+				t.xterm?.markTracker.scrollToPreviousMark(undefined, undefined, t.capabilities.has(TerminalCapability.CommandDetection));
 			});
 		}
 	});
@@ -2204,6 +2204,23 @@ export function registerTerminalActions() {
 			clearShellFileHistory();
 		}
 	});
+	registerAction2(class extends Action2 {
+		constructor() {
+			super({
+				id: TerminalCommandId.ShowQuickFixes,
+				title: { value: localize('workbench.action.terminal.showQuickFixes', "Show Terminal Quick Fixes"), original: 'Show Terminal Quick Fixes' },
+				category,
+				precondition: TerminalContextKeys.focus,
+				keybinding: {
+					primary: KeyMod.CtrlCmd | KeyCode.Period,
+					weight: KeybindingWeight.EditorContrib
+				}
+			});
+		}
+		run(accessor: ServicesAccessor) {
+			accessor.get(ITerminalService).activeInstance?.quickFix?.showMenu();
+		}
+	});
 	registerAction2(class extends Action2 {
 		constructor() {
 			super({
@@ -2296,9 +2313,8 @@ export function registerTerminalActions() {
 					// TODO: Why is copy still showing up when text isn't selected?
 					precondition: ContextKeyExpr.and(ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated), TerminalContextKeys.textSelected),
 					keybinding: [{
-						primary: KeyMod.CtrlCmd | KeyCode.KeyC,
-						win: { primary: KeyMod.CtrlCmd | KeyCode.KeyC, secondary: [KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyC] },
-						linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyC },
+						primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyC,
+						mac: { primary: KeyMod.CtrlCmd | KeyCode.KeyC },
 						weight: KeybindingWeight.WorkbenchContrib,
 						when: ContextKeyExpr.and(TerminalContextKeys.textSelected, TerminalContextKeys.focus)
 					}]
@@ -2308,6 +2324,27 @@ export function registerTerminalActions() {
 				await accessor.get(ITerminalService).activeInstance?.copySelection();
 			}
 		});
+		registerAction2(class extends Action2 {
+			constructor() {
+				super({
+					id: TerminalCommandId.CopyAndClearSelection,
+					title: { value: localize('workbench.action.terminal.copyAndClearSelection', "Copy and Clear Selection"), original: 'Copy and Clear Selection' },
+					f1: true,
+					category,
+					precondition: ContextKeyExpr.and(ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated), TerminalContextKeys.textSelected),
+					keybinding: [{
+						win: { primary: KeyMod.CtrlCmd | KeyCode.KeyC },
+						weight: KeybindingWeight.WorkbenchContrib,
+						when: ContextKeyExpr.and(TerminalContextKeys.textSelected, TerminalContextKeys.focus)
+					}]
+				});
+			}
+			async run(accessor: ServicesAccessor) {
+				const instance = accessor.get(ITerminalService).activeInstance;
+				await instance?.copySelection();
+				instance?.clearSelection();
+			}
+		});
 		registerAction2(class extends Action2 {
 			constructor() {
 				super({
@@ -2396,6 +2433,8 @@ export function registerTerminalActions() {
 				accessor.get(IConfigurationService).updateValue(TerminalSettingId.TabsEnabled, true);
 				return;
 			}
+
+			const terminalIndexRe = /^([0-9]+): /;
 			const indexMatches = terminalIndexRe.exec(item);
 			if (indexMatches) {
 				terminalGroupService.setActiveGroupByIndex(Number(indexMatches[1]) - 1);
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalConfigHelper.ts b/src/vs/workbench/contrib/terminal/browser/terminalConfigHelper.ts
index 2e8d7933b6179c..1837ce21cb4638 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalConfigHelper.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalConfigHelper.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as nls from 'vs/nls';
-import { EditorOptions, EDITOR_FONT_DEFAULTS, IEditorOptions } from 'vs/editor/common/config/editorOptions';
+import { EDITOR_FONT_DEFAULTS, IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ITerminalConfiguration, TERMINAL_CONFIG_SECTION, DEFAULT_LETTER_SPACING, DEFAULT_LINE_HEIGHT, MINIMUM_LETTER_SPACING, MINIMUM_FONT_WEIGHT, MAXIMUM_FONT_WEIGHT, DEFAULT_FONT_WEIGHT, DEFAULT_BOLD_FONT_WEIGHT, FontWeight, ITerminalFont } from 'vs/workbench/contrib/terminal/common/terminal';
 import Severity from 'vs/base/common/severity';
@@ -20,8 +20,10 @@ import { IXtermCore } from 'vs/workbench/contrib/terminal/browser/xterm-private'
 import { IShellLaunchConfig } from 'vs/platform/terminal/common/terminal';
 import { isLinux, isWindows } from 'vs/base/common/platform';
 
-const MINIMUM_FONT_SIZE = 6;
-const MAXIMUM_FONT_SIZE = 100;
+const enum FontConstants {
+	MinimumFontSize = 6,
+	MaximumFontSize = 100,
+}
 
 /**
  * Encapsulates terminal configuration logic, the primary purpose of this file is so that platform
@@ -71,7 +73,7 @@ export class TerminalConfigHelper implements IBrowserTerminalConfigHelper {
 
 	configFontIsMonospace(): boolean {
 		const fontSize = 15;
-		const fontFamily = this.config.fontFamily || EditorOptions.fontFamily.validate(this._configurationService.getValue<IEditorOptions>('editor').fontFamily);
+		const fontFamily = this.config.fontFamily || this._configurationService.getValue<IEditorOptions>('editor').fontFamily || EDITOR_FONT_DEFAULTS.fontFamily;
 		const iRect = this._getBoundingRectFor('i', fontFamily, fontSize);
 		const wRect = this._getBoundingRectFor('w', fontFamily, fontSize);
 
@@ -155,22 +157,25 @@ export class TerminalConfigHelper implements IBrowserTerminalConfigHelper {
 	getFont(xtermCore?: IXtermCore, excludeDimensions?: boolean): ITerminalFont {
 		const editorConfig = this._configurationService.getValue<IEditorOptions>('editor');
 
-		let fontFamily = this.config.fontFamily || EditorOptions.fontFamily.validate(editorConfig.fontFamily);
-		let fontSize = this._clampInt(this.config.fontSize, MINIMUM_FONT_SIZE, MAXIMUM_FONT_SIZE, EDITOR_FONT_DEFAULTS.fontSize);
+		let fontFamily = this.config.fontFamily || editorConfig.fontFamily || EDITOR_FONT_DEFAULTS.fontFamily;
+		let fontSize = this._clampInt(this.config.fontSize, FontConstants.MinimumFontSize, FontConstants.MaximumFontSize, EDITOR_FONT_DEFAULTS.fontSize);
 
 		// Work around bad font on Fedora/Ubuntu
 		if (!this.config.fontFamily) {
 			if (this._linuxDistro === LinuxDistro.Fedora) {
-				fontFamily = '\'DejaVu Sans Mono\', monospace';
+				fontFamily = '\'DejaVu Sans Mono\'';
 			}
 			if (this._linuxDistro === LinuxDistro.Ubuntu) {
-				fontFamily = '\'Ubuntu Mono\', monospace';
+				fontFamily = '\'Ubuntu Mono\'';
 
 				// Ubuntu mono is somehow smaller, so set fontSize a bit larger to get the same perceived size.
-				fontSize = this._clampInt(fontSize + 2, MINIMUM_FONT_SIZE, MAXIMUM_FONT_SIZE, EDITOR_FONT_DEFAULTS.fontSize);
+				fontSize = this._clampInt(fontSize + 2, FontConstants.MinimumFontSize, FontConstants.MaximumFontSize, EDITOR_FONT_DEFAULTS.fontSize);
 			}
 		}
 
+		// Always fallback to monospace, otherwise a proportional font may become the default
+		fontFamily += ', monospace';
+
 		const letterSpacing = this.config.letterSpacing ? Math.max(Math.floor(this.config.letterSpacing), MINIMUM_LETTER_SPACING) : DEFAULT_LETTER_SPACING;
 		const lineHeight = this.config.lineHeight ? Math.max(this.config.lineHeight, 1) : DEFAULT_LINE_HEIGHT;
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.ts b/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.ts
index dd5684d1ad8174..f6c8372f24b71f 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.ts
@@ -15,7 +15,7 @@ import { getColorClass, getUriClasses } from 'vs/workbench/contrib/terminal/brow
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IShellLaunchConfig, TerminalExitReason, TerminalLocation, TerminalSettingId } from 'vs/platform/terminal/common/terminal';
 import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { ILifecycleService, ShutdownReason, WillShutdownEvent } from 'vs/workbench/services/lifecycle/common/lifecycle';
 import { ConfirmOnKill } from 'vs/workbench/contrib/terminal/common/terminal';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -56,7 +56,7 @@ export class TerminalEditorInput extends EditorInput implements IEditorCloseHand
 	}
 
 	override get capabilities(): EditorInputCapabilities {
-		return EditorInputCapabilities.Readonly | EditorInputCapabilities.Singleton;
+		return EditorInputCapabilities.Readonly | EditorInputCapabilities.Singleton | EditorInputCapabilities.CanDropIntoEditor;
 	}
 
 	setTerminalInstance(instance: ITerminalInstance): void {
@@ -162,7 +162,11 @@ export class TerminalEditorInput extends EditorInput implements IEditorCloseHand
 		}));
 
 		const disposeListeners = [
-			instance.onExit(() => this.dispose()),
+			instance.onExit((e) => {
+				if (!instance.waitOnExit) {
+					this.dispose();
+				}
+			}),
 			instance.onDisposed(() => this.dispose()),
 			instance.onTitleChanged(() => this._onDidChangeLabel.fire()),
 			instance.onIconChanged(() => this._onDidChangeLabel.fire()),
@@ -173,9 +177,17 @@ export class TerminalEditorInput extends EditorInput implements IEditorCloseHand
 
 		// Don't dispose editor when instance is torn down on shutdown to avoid extra work and so
 		// the editor/tabs don't disappear
-		this._lifecycleService.onWillShutdown(() => {
+		this._lifecycleService.onWillShutdown((e: WillShutdownEvent) => {
 			this._isShuttingDown = true;
 			dispose(disposeListeners);
+
+			// Don't touch processes if the shutdown was a result of reload as they will be reattached
+			const shouldPersistTerminals = this._configurationService.getValue<boolean>(TerminalSettingId.EnablePersistentSessions) && e.reason === ShutdownReason.RELOAD;
+			if (shouldPersistTerminals) {
+				instance.detachProcessAndDispose(TerminalExitReason.Shutdown);
+			} else {
+				instance.dispose(TerminalExitReason.Shutdown);
+			}
 		});
 	}
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalEditorService.ts b/src/vs/workbench/contrib/terminal/browser/terminalEditorService.ts
index dbd16927109816..9668519355f2f2 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalEditorService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalEditorService.ts
@@ -153,7 +153,7 @@ export class TerminalEditorService extends Disposable implements ITerminalEditor
 						forceReload: true,
 						preserveFocus: editorOptions?.preserveFocus
 					}
-				}, editorOptions?.viewColumn || ACTIVE_GROUP)
+				}, editorOptions?.viewColumn ?? ACTIVE_GROUP)
 			};
 			await this._activeOpenEditorRequest?.promise;
 			this._activeOpenEditorRequest = undefined;
@@ -253,7 +253,6 @@ export class TerminalEditorService extends Disposable implements ITerminalEditor
 		if ('pid' in deserializedInput) {
 			const newDeserializedInput = { ...deserializedInput, findRevivedId: true };
 			const instance = this._terminalInstanceService.createInstance({ attachPersistentProcess: newDeserializedInput }, TerminalLocation.Editor);
-			instance.target = TerminalLocation.Editor;
 			const input = this._instantiationService.createInstance(TerminalEditorInput, resource, instance);
 			this._registerInstance(inputKey, input, instance);
 			return input;
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalEscapeSequences.ts b/src/vs/workbench/contrib/terminal/browser/terminalEscapeSequences.ts
index 7d873ca534f5d3..2d703d86c37bde 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalEscapeSequences.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalEscapeSequences.ts
@@ -89,7 +89,8 @@ export const enum VSCodeOscPt {
 }
 
 export const enum VSCodeOscProperty {
-	Task = 'Task'
+	Task = 'Task',
+	Cwd = 'Cwd'
 }
 
 /**
@@ -103,9 +104,19 @@ export const enum ITermOscPt {
 }
 
 export function VSCodeSequence(osc: VSCodeOscPt, data?: string | VSCodeOscProperty): string {
-	return `\x1b]${ShellIntegrationOscPs.VSCode};${osc};${data}\x07`;
+	return oscSequence(ShellIntegrationOscPs.VSCode, osc, data);
 }
 
 export function ITermSequence(osc: ITermOscPt, data?: string): string {
-	return `\x1b]${ShellIntegrationOscPs.ITerm};${osc};${data}\x07`;
+	return oscSequence(ShellIntegrationOscPs.ITerm, osc, data);
+}
+
+function oscSequence(ps: number, pt: string, data?: string): string {
+	let result = `\x1b]${ps};${pt}`;
+	if (data) {
+		result += `;${data}`;
+	}
+	result += `\x07`;
+	return result;
+
 }
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalGroup.ts b/src/vs/workbench/contrib/terminal/browser/terminalGroup.ts
index 98c5d13d27386c..279dbbccf0fbf4 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalGroup.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalGroup.ts
@@ -11,7 +11,7 @@ import { IWorkbenchLayoutService, Parts, Position } from 'vs/workbench/services/
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ITerminalInstance, Direction, ITerminalGroup, ITerminalService, ITerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminal';
 import { ViewContainerLocation, IViewDescriptorService } from 'vs/workbench/common/views';
-import { IShellLaunchConfig, ITerminalTabLayoutInfoById } from 'vs/platform/terminal/common/terminal';
+import { IShellLaunchConfig, ITerminalTabLayoutInfoById, TerminalLocation } from 'vs/platform/terminal/common/terminal';
 import { TerminalStatus } from 'vs/workbench/contrib/terminal/browser/terminalStatusList';
 import { getPartByLocation } from 'vs/workbench/browser/parts/views/viewsService';
 
@@ -310,7 +310,7 @@ export class TerminalGroup extends Disposable implements ITerminalGroup {
 		if ('instanceId' in shellLaunchConfigOrInstance) {
 			instance = shellLaunchConfigOrInstance;
 		} else {
-			instance = this._terminalInstanceService.createInstance(shellLaunchConfigOrInstance);
+			instance = this._terminalInstanceService.createInstance(shellLaunchConfigOrInstance, TerminalLocation.Panel);
 		}
 		if (this._terminalInstances.length === 0) {
 			this._terminalInstances.push(instance);
@@ -526,7 +526,7 @@ export class TerminalGroup extends Disposable implements ITerminalGroup {
 	}
 
 	split(shellLaunchConfig: IShellLaunchConfig): ITerminalInstance {
-		const instance = this._terminalInstanceService.createInstance(shellLaunchConfig);
+		const instance = this._terminalInstanceService.createInstance(shellLaunchConfig, TerminalLocation.Panel);
 		this.addInstance(instance, shellLaunchConfig.parentTerminalId);
 		this._setActiveInstance(instance);
 		return instance;
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
index 81ade200f4cd07..c59375adb6ed8d 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
@@ -90,6 +90,7 @@ import { IPreferencesService } from 'vs/workbench/services/preferences/common/pr
 import type { IMarker, ITerminalAddon, Terminal as XTermTerminal } from 'xterm';
 import { IAudioCueService, AudioCue } from 'vs/platform/audioCues/browser/audioCueService';
 import { ITerminalQuickFixOptions } from 'vs/platform/terminal/common/xterm/terminalQuickFix';
+import { FileSystemProviderCapabilities, IFileService } from 'vs/platform/files/common/files';
 
 const enum Constants {
 	/**
@@ -130,9 +131,12 @@ interface IGridDimensions {
 	rows: number;
 }
 
-const shellIntegrationSupportedShellTypes = [PosixShellType.Bash, PosixShellType.Zsh, PosixShellType.PowerShell, WindowsShellType.PowerShell];
-
-const scrollbarHeight = 5;
+const shellIntegrationSupportedShellTypes = [
+	PosixShellType.Bash,
+	PosixShellType.Zsh,
+	PosixShellType.PowerShell,
+	WindowsShellType.PowerShell
+];
 
 export class TerminalInstance extends Disposable implements ITerminalInstance {
 	private static _lastKnownCanvasDimensions: ICanvasDimensions | undefined;
@@ -143,7 +147,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 
 	readonly _processManager: ITerminalProcessManager;
 	private readonly _resource: URI;
-	private _shutdownPersistentProcessId: number | undefined;
 	// Enables disposal of the xterm onKey
 	// event when the CwdDetection capability
 	// is added
@@ -210,6 +213,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 	private _usedShellIntegrationInjection: boolean = false;
 	get usedShellIntegrationInjection(): boolean { return this._usedShellIntegrationInjection; }
 	private _quickFixAddon: TerminalQuickFixAddon | undefined;
+	private _lineDataEventAddon: LineDataEventAddon | undefined;
 
 	readonly capabilities = new TerminalCapabilityStoreMultiplexer();
 	readonly statusList: ITerminalStatusList;
@@ -337,7 +341,9 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 	readonly onData = this._onData.event;
 	private readonly _onBinary = this._register(new Emitter<string>());
 	readonly onBinary = this._onBinary.event;
-	private readonly _onLineData = this._register(new Emitter<string>());
+	private readonly _onLineData = this._register(new Emitter<string>({
+		onDidAddFirstListener: () => this._onLineDataSetup()
+	}));
 	readonly onLineData = this._onLineData.event;
 	private readonly _onRequestExtHostProcess = this._register(new Emitter<ITerminalInstance>());
 	readonly onRequestExtHostProcess = this._onRequestExtHostProcess.event;
@@ -366,8 +372,8 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		private readonly _configHelper: TerminalConfigHelper,
 		private _shellLaunchConfig: IShellLaunchConfig,
 		resource: URI | undefined,
-		@IContextKeyService readonly contextKeyService: IContextKeyService,
-		@IInstantiationService readonly instantiationService: IInstantiationService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IInstantiationService instantiationService: IInstantiationService,
 		@ITerminalProfileResolverService private readonly _terminalProfileResolverService: ITerminalProfileResolverService,
 		@IPathService private readonly _pathService: IPathService,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
@@ -438,7 +444,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		}
 
 		const scopedContextKeyService = this._register(contextKeyService.createScoped(this._wrapperElement));
-		this._scopedInstantiationService = this.instantiationService.createChild(new ServiceCollection(
+		this._scopedInstantiationService = instantiationService.createChild(new ServiceCollection(
 			[IContextKeyService, scopedContextKeyService]
 		));
 
@@ -460,6 +466,9 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 			if (this._container) {
 				this._container.appendChild(findWidget.getDomNode());
 			}
+			if (this._lastLayoutDimensions) {
+				findWidget.layout(this._lastLayoutDimensions.width);
+			}
 			return findWidget;
 		});
 
@@ -709,15 +718,12 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		const verticalPadding = parseInt(computedStyle.paddingTop) + parseInt(computedStyle.paddingBottom);
 		TerminalInstance._lastKnownCanvasDimensions = new dom.Dimension(
 			Math.min(Constants.MaxCanvasWidth, width - horizontalPadding),
-			height + (this._hasScrollBar && !this._horizontalScrollbar ? -scrollbarHeight : 0) - 2/* bottom padding */ - verticalPadding);
+			height + (this._hasScrollBar && !this._horizontalScrollbar ? -5/* scroll bar height */ : 0) - 2/* bottom padding */ - verticalPadding);
 		return TerminalInstance._lastKnownCanvasDimensions;
 	}
 
-	set shutdownPersistentProcessId(shutdownPersistentProcessId: number | undefined) {
-		this._shutdownPersistentProcessId = shutdownPersistentProcessId;
-	}
-	get persistentProcessId(): number | undefined { return this._processManager.persistentProcessId ?? this._shutdownPersistentProcessId; }
-	get shouldPersist(): boolean { return (this._processManager.shouldPersist || this._shutdownPersistentProcessId !== undefined) && !this.shellLaunchConfig.isTransient && (!this.reconnectionProperties || this._configurationService.getValue(TaskSettingId.Reconnection) === true); }
+	get persistentProcessId(): number | undefined { return this._processManager.persistentProcessId; }
+	get shouldPersist(): boolean { return this._processManager.shouldPersist && !this.shellLaunchConfig.isTransient && (!this.reconnectionProperties || this._configurationService.getValue(TaskSettingId.Reconnection) === true); }
 
 	/**
 	 * Create xterm.js instance and attach data listeners.
@@ -734,8 +740,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		this.xterm?.raw.loadAddon(this._quickFixAddon);
 		this.registerQuickFixProvider(gitTwoDashes(), freePort(this), gitSimilar(), gitPushSetUpstream(), gitCreatePr());
 		this._register(this._quickFixAddon.onDidRequestRerunCommand(async (e) => await this.runCommand(e.command, e.addNewLine || false)));
-		const lineDataEventAddon = new LineDataEventAddon();
-		this.xterm.raw.loadAddon(lineDataEventAddon);
 		this.updateAccessibilitySupport();
 		this.xterm.onDidRequestRunCommand(e => {
 			if (e.copyAsHtml) {
@@ -746,13 +750,10 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		});
 		// Write initial text, deferring onLineFeed listener when applicable to avoid firing
 		// onLineData events containing initialText
-		if (this._shellLaunchConfig.initialText) {
-			this._writeInitialText(this.xterm, () => {
-				lineDataEventAddon.onLineData(e => this._onLineData.fire(e));
-			});
-		} else {
-			lineDataEventAddon.onLineData(e => this._onLineData.fire(e));
-		}
+		const initialTextWrittenPromise = this._shellLaunchConfig.initialText ? new Promise<void>(r => this._writeInitialText(xterm, r)) : undefined;
+		const lineDataEventAddon = new LineDataEventAddon(initialTextWrittenPromise);
+		lineDataEventAddon.onLineData(e => this._onLineData.fire(e));
+		this._lineDataEventAddon = lineDataEventAddon;
 		// Delay the creation of the bell listener to avoid showing the bell when the terminal
 		// starts up or reconnects
 		setTimeout(() => {
@@ -822,6 +823,11 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		return xterm;
 	}
 
+	private async _onLineDataSetup(): Promise<void> {
+		const xterm = this.xterm || await this._xtermReadyPromise;
+		xterm.raw.loadAddon(this._lineDataEventAddon!);
+	}
+
 	async runCommand(commandLine: string, addNewLine: boolean): Promise<void> {
 		// Determine whether to send ETX (ctrl+c) before running the command. This should always
 		// happen unless command detection can reliably say that a command is being entered and
@@ -1414,7 +1420,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 			// Set the initial name based on the _resolved_ shell launch config, this will also
 			// ensure the resolved icon gets shown
 			if (!this._labelComputer) {
-				this._labelComputer = this._register(new TerminalLabelComputer(this._configHelper, this, this._workspaceContextService));
+				this._labelComputer = this._register(this._scopedInstantiationService.createInstance(TerminalLabelComputer, this._configHelper, this));
 				this._labelComputer.onDidChangeLabel(e => {
 					this._title = e.title;
 					this._description = e.description;
@@ -1843,7 +1849,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 
 	updateAccessibilitySupport(): void {
 		const isEnabled = this._accessibilityService.isScreenReaderOptimized();
-		if (isEnabled) {
+		if (isEnabled && this.xterm?.raw) {
 			this._navigationModeAddon = new NavigationModeAddon(this._terminalA11yTreeFocusContextKey, this._navigationModeActiveContextKey);
 			this.xterm!.raw.loadAddon(this._navigationModeAddon);
 		} else {
@@ -2482,6 +2488,7 @@ export class TerminalLabelComputer extends Disposable {
 	constructor(
 		private readonly _configHelper: TerminalConfigHelper,
 		private readonly _instance: Pick<ITerminalInstance, 'shellLaunchConfig' | 'cwd' | 'fixedCols' | 'fixedRows' | 'initialCwd' | 'processName' | 'sequence' | 'userHome' | 'workspaceFolder' | 'staticTitle' | 'capabilities' | 'title' | 'description'>,
+		@IFileService private readonly _fileService: IFileService,
 		@IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService
 	) {
 		super();
@@ -2530,7 +2537,15 @@ export class TerminalLabelComputer extends Disposable {
 			const cwdUri = URI.from({ scheme: this._instance.workspaceFolder?.uri.scheme || Schemas.file, path: this._instance.cwd });
 			// Multi-root workspaces always show cwdFolder to disambiguate them, otherwise only show
 			// when it differs from the workspace folder in which it was launched from
-			if (multiRootWorkspace || cwdUri.fsPath !== this._instance.workspaceFolder?.uri.fsPath) {
+			let showCwd = false;
+			if (multiRootWorkspace) {
+				showCwd = true;
+			} else if (this._instance.workspaceFolder?.uri) {
+				const caseSensitive = this._fileService.hasCapability(this._instance.workspaceFolder.uri, FileSystemProviderCapabilities.PathCaseSensitive);
+				showCwd = cwdUri.fsPath.localeCompare(this._instance.workspaceFolder.uri.fsPath, undefined, { sensitivity: caseSensitive ? 'case' : 'base' }) !== 0;
+			}
+			if (showCwd) {
+
 				templateProperties.cwdFolder = path.basename(templateProperties.cwd);
 			}
 		}
@@ -2657,7 +2672,7 @@ async function preparePathForShell(originalPath: string, executable: string | un
 					c(originalPath.replace(/\\/g, '/'));
 				}
 				else if (shellType === WindowsShellType.Wsl) {
-					c(backend?.getWslPath(originalPath) || originalPath);
+					c(backend?.getWslPath(originalPath, 'win-to-unix') || originalPath);
 				}
 
 				else if (hasSpace) {
@@ -2668,7 +2683,7 @@ async function preparePathForShell(originalPath: string, executable: string | un
 			} else {
 				const lowerExecutable = executable.toLowerCase();
 				if (lowerExecutable.indexOf('wsl') !== -1 || (lowerExecutable.indexOf('bash.exe') !== -1 && lowerExecutable.toLowerCase().indexOf('git') === -1)) {
-					c(backend?.getWslPath(originalPath) || originalPath);
+					c(backend?.getWslPath(originalPath, 'win-to-unix') || originalPath);
 				} else if (hasSpace) {
 					c('"' + originalPath + '"');
 				} else {
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstanceService.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstanceService.ts
index 98ae6ef9d22189..849d961cd6c463 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalInstanceService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalInstanceService.ts
@@ -38,9 +38,9 @@ export class TerminalInstanceService extends Disposable implements ITerminalInst
 		this._configHelper = _instantiationService.createInstance(TerminalConfigHelper);
 	}
 
-	createInstance(profile: ITerminalProfile, target?: TerminalLocation, resource?: URI): ITerminalInstance;
-	createInstance(shellLaunchConfig: IShellLaunchConfig, target?: TerminalLocation, resource?: URI): ITerminalInstance;
-	createInstance(config: IShellLaunchConfig | ITerminalProfile, target?: TerminalLocation, resource?: URI): ITerminalInstance {
+	createInstance(profile: ITerminalProfile, target: TerminalLocation, resource?: URI): ITerminalInstance;
+	createInstance(shellLaunchConfig: IShellLaunchConfig, target: TerminalLocation, resource?: URI): ITerminalInstance;
+	createInstance(config: IShellLaunchConfig | ITerminalProfile, target: TerminalLocation, resource?: URI): ITerminalInstance {
 		const shellLaunchConfig = this.convertProfileToShellLaunchConfig(config);
 		const instance = this._instantiationService.createInstance(TerminalInstance,
 			this._terminalShellTypeContextKey,
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts b/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
index 3400a438bf7037..1edda948360eeb 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
@@ -39,15 +39,18 @@ import { TaskSettingId } from 'vs/workbench/contrib/tasks/common/tasks';
 import Severity from 'vs/base/common/severity';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 
-/** The amount of time to consider terminal errors to be related to the launch */
-const LAUNCHING_DURATION = 500;
-
-/**
- * The minimum amount of time between latency requests.
- */
-const LATENCY_MEASURING_INTERVAL = 1000;
+const enum ProcessConstants {
+	/**
+	 * The amount of time to consider terminal errors to be related to the launch.
+	 */
+	ErrorLaunchThresholdDuration = 500,
+	/**
+	 * The minimum amount of time between latency requests.
+	 */
+	LatencyMeasuringInterval = 1000,
+}
 
-enum ProcessType {
+const enum ProcessType {
 	Process,
 	PsuedoTerminal
 }
@@ -377,7 +380,7 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 			if (this.processState === ProcessState.Launching) {
 				this._setProcessState(ProcessState.Running);
 			}
-		}, LAUNCHING_DURATION);
+		}, ProcessConstants.ErrorLaunchThresholdDuration);
 
 		const result = await newProcess.start();
 		if (result) {
@@ -597,7 +600,7 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 		if (!this._process) {
 			return Promise.resolve(0);
 		}
-		if (this._latencyLastMeasured === 0 || this._latencyLastMeasured + LATENCY_MEASURING_INTERVAL < Date.now()) {
+		if (this._latencyLastMeasured === 0 || this._latencyLastMeasured + ProcessConstants.LatencyMeasuringInterval < Date.now()) {
 			const latencyRequest = this._process.getLatency();
 			this._latency = await latencyRequest;
 			this._latencyLastMeasured = Date.now();
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalProfileResolverService.ts b/src/vs/workbench/contrib/terminal/browser/terminalProfileResolverService.ts
index bcb761a8f5d066..d20e2da045b54c 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalProfileResolverService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalProfileResolverService.ts
@@ -37,16 +37,16 @@ export interface IProfileContextProvider {
 
 const generatedProfileName = 'Generated';
 
-/*
-* Resolves terminal shell launch config and terminal
-* profiles for the given operating system,
-* environment, and user configuration
-*/
-
-const SHOULD_PROMPT_FOR_PROFILE_MIGRATION_KEY = 'terminals.integrated.profile-migration';
+const enum StorageKeys {
+	ShouldPromptForProfileMigration = 'terminals.integrated.profile-migration'
+}
 
 let migrationMessageShown = false;
 
+/*
+ * Resolves terminal shell launch config and terminal profiles for the given operating system,
+ * environment, and user configuration.
+ */
 export abstract class BaseTerminalProfileResolverService implements ITerminalProfileResolverService {
 	declare _serviceBrand: undefined;
 
@@ -482,7 +482,7 @@ export abstract class BaseTerminalProfileResolverService implements ITerminalPro
 		const shouldMigrateToProfile = (!!this._configurationService.getValue(TerminalSettingPrefix.Shell + this._primaryBackendOs) ||
 			!!this._configurationService.inspect(TerminalSettingPrefix.ShellArgs + this._primaryBackendOs).userValue) &&
 			!!this._configurationService.getValue(TerminalSettingPrefix.DefaultProfile + this._primaryBackendOs);
-		if (shouldMigrateToProfile && this._storageService.getBoolean(SHOULD_PROMPT_FOR_PROFILE_MIGRATION_KEY, StorageScope.WORKSPACE, true) && !migrationMessageShown) {
+		if (shouldMigrateToProfile && this._storageService.getBoolean(StorageKeys.ShouldPromptForProfileMigration, StorageScope.WORKSPACE, true) && !migrationMessageShown) {
 			this._notificationService.prompt(
 				Severity.Info,
 				localize('terminalProfileMigration', "The terminal is using deprecated shell/shellArgs settings, do you want to migrate it to a profile?"),
@@ -513,7 +513,7 @@ export abstract class BaseTerminalProfileResolverService implements ITerminalPro
 					} as IPromptChoice,
 				],
 				{
-					neverShowAgain: { id: SHOULD_PROMPT_FOR_PROFILE_MIGRATION_KEY, scope: NeverShowAgainScope.WORKSPACE }
+					neverShowAgain: { id: StorageKeys.ShouldPromptForProfileMigration, scope: NeverShowAgainScope.WORKSPACE }
 				}
 			);
 			migrationMessageShown = true;
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalQuickFixBuiltinActions.ts b/src/vs/workbench/contrib/terminal/browser/terminalQuickFixBuiltinActions.ts
index ec13924d56aa3c..e28ad32b0688a5 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalQuickFixBuiltinActions.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalQuickFixBuiltinActions.ts
@@ -3,22 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { URI } from 'vs/base/common/uri';
 import { localize } from 'vs/nls';
-import { IInternalOptions, ITerminalCommandMatchResult, TerminalQuickFixActionInternal } from 'vs/platform/terminal/common/xterm/terminalQuickFix';
+import { IInternalOptions, ITerminalCommandMatchResult, TerminalQuickFixActionInternal, TerminalQuickFixType } from 'vs/platform/terminal/common/xterm/terminalQuickFix';
 import { ITerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { TerminalQuickFixType } from 'vs/workbench/contrib/terminal/browser/widgets/terminalQuickFixMenuItems';
 
 export const GitCommandLineRegex = /git/;
 export const GitPushCommandLineRegex = /git\s+push/;
 export const GitTwoDashesRegex = /error: did you mean `--(.+)` \(with two dashes\)\?/;
-export const AnyCommandLineRegex = /.+/;
 export const GitSimilarOutputRegex = /(?:(most similar (command|commands) (is|are)))((\n\s*(?<fixedCommand>[^\s]+))+)/m;
-export const FreePortOutputRegex = /address already in use (0\.0\.0\.0|127\.0\.0\.1|localhost|::):(?<portNumber>\d{4,5})|Unable to bind [^ ]*:(\d{4,5})|can't listen on port (\d{4,5})|listen EADDRINUSE [^ ]*:(\d{4,5})/;
+export const FreePortOutputRegex = /(?:address already in use (?:0\.0\.0\.0|127\.0\.0\.1|localhost|::):|Unable to bind [^ ]*:|can't listen on port |listen EADDRINUSE [^ ]*:)(?<portNumber>\d{4,5})/;
 export const GitPushOutputRegex = /git push --set-upstream origin (?<branchName>[^\s]+)/;
 // The previous line starts with "Create a pull request for \'([^\s]+)\' on GitHub by visiting:\s*"
 // it's safe to assume it's a github pull request if the URL includes `/pull/`
 export const GitCreatePrOutputRegex = /remote:\s*(?<link>https:\/\/github\.com\/.+\/.+\/pull\/new\/.+)/;
 
+export const enum QuickFixSource {
+	Builtin = 'builtin'
+}
+
 export function gitSimilar(): IInternalOptions {
 	return {
 		id: 'Git Similar',
@@ -30,7 +33,7 @@ export function gitSimilar(): IInternalOptions {
 			offset: 0,
 			length: 10
 		},
-		exitStatus: false,
+		commandExitResult: 'error',
 		getQuickFixes: (matchResult: ITerminalCommandMatchResult) => {
 			if (!matchResult?.outputMatch) {
 				return;
@@ -43,9 +46,9 @@ export function gitSimilar(): IInternalOptions {
 					actions.push({
 						id: 'Git Similar',
 						type: TerminalQuickFixType.Command,
-						terminalCommand: matchResult.commandLine.replace(/git\s+[^\s]+/, `git ${fixedCommand}`),
+						terminalCommand: matchResult.commandLine.replace(/git\s+[^\s]+/, () => `git ${fixedCommand}`),
 						addNewLine: true,
-						source: 'builtin'
+						source: QuickFixSource.Builtin
 					});
 				}
 			}
@@ -65,7 +68,7 @@ export function gitTwoDashes(): IInternalOptions {
 			offset: 0,
 			length: 2
 		},
-		exitStatus: false,
+		commandExitResult: 'error',
 		getQuickFixes: (matchResult: ITerminalCommandMatchResult) => {
 			const problemArg = matchResult?.outputMatch?.regexMatch?.[1];
 			if (!problemArg) {
@@ -74,9 +77,9 @@ export function gitTwoDashes(): IInternalOptions {
 			return {
 				type: TerminalQuickFixType.Command,
 				id: 'Git Two Dashes',
-				terminalCommand: matchResult.commandLine.replace(` -${problemArg}`, ` --${problemArg}`),
+				terminalCommand: matchResult.commandLine.replace(` -${problemArg}`, () => ` --${problemArg}`),
 				addNewLine: true,
-				source: 'builtin'
+				source: QuickFixSource.Builtin
 			};
 		}
 	};
@@ -85,14 +88,14 @@ export function freePort(terminalInstance?: Partial<ITerminalInstance>): IIntern
 	return {
 		id: 'Free Port',
 		type: 'internal',
-		commandLineMatcher: AnyCommandLineRegex,
+		commandLineMatcher: /.+/,
 		outputMatcher: {
 			lineMatcher: FreePortOutputRegex,
 			anchor: 'bottom',
 			offset: 0,
 			length: 30
 		},
-		exitStatus: false,
+		commandExitResult: 'error',
 		getQuickFixes: (matchResult: ITerminalCommandMatchResult) => {
 			const port = matchResult?.outputMatch?.regexMatch?.groups?.portNumber;
 			if (!port) {
@@ -100,11 +103,13 @@ export function freePort(terminalInstance?: Partial<ITerminalInstance>): IIntern
 			}
 			const label = localize("terminal.freePort", "Free port {0}", port);
 			return {
-				class: TerminalQuickFixType.Port,
+				type: TerminalQuickFixType.Port,
+				class: undefined,
 				tooltip: label,
-				id: 'terminal.freePort',
+				id: 'Free Port',
 				label,
 				enabled: true,
+				source: QuickFixSource.Builtin,
 				run: async () => {
 					await terminalInstance?.freePortKillProcess?.(port, matchResult.commandLine);
 				}
@@ -124,7 +129,7 @@ export function gitPushSetUpstream(): IInternalOptions {
 			offset: 0,
 			length: 5
 		},
-		exitStatus: false,
+		commandExitResult: 'error',
 		getQuickFixes: (matchResult: ITerminalCommandMatchResult) => {
 			const matches = matchResult.outputMatch;
 			const commandToRun = 'git push --set-upstream origin ${group:branchName}';
@@ -142,15 +147,15 @@ export function gitPushSetUpstream(): IInternalOptions {
 				if (!commandToRun.includes(varToResolve)) {
 					return [];
 				}
-				fixedCommand = fixedCommand.replaceAll(varToResolve, value);
+				fixedCommand = fixedCommand.replaceAll(varToResolve, () => value);
 			}
 			if (fixedCommand) {
 				actions.push({
-					type: 'command',
+					type: TerminalQuickFixType.Command,
 					id: 'Git Push Set Upstream',
 					terminalCommand: fixedCommand,
 					addNewLine: true,
-					source: 'builtin'
+					source: QuickFixSource.Builtin
 				});
 				return actions;
 			}
@@ -170,7 +175,7 @@ export function gitCreatePr(): IInternalOptions {
 			offset: 0,
 			length: 5
 		},
-		exitStatus: true,
+		commandExitResult: 'success',
 		getQuickFixes: (matchResult: ITerminalCommandMatchResult) => {
 			const link = matchResult?.outputMatch?.regexMatch?.groups?.link;
 			if (!link) {
@@ -178,14 +183,12 @@ export function gitCreatePr(): IInternalOptions {
 			}
 			const label = localize("terminal.createPR", "Create PR {0}", link);
 			return {
-				class: undefined,
-				tooltip: label,
 				id: 'Git Create Pr',
 				label,
 				enabled: true,
-				type: 'opener',
-				uri: link,
-				run: () => { }
+				type: TerminalQuickFixType.Opener,
+				uri: URI.parse(link),
+				source: QuickFixSource.Builtin
 			};
 		}
 	};
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalQuickFixService.ts b/src/vs/workbench/contrib/terminal/browser/terminalQuickFixService.ts
index bb614b779ba90c..b2ba25601b6280 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalQuickFixService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalQuickFixService.ts
@@ -7,10 +7,13 @@ import { Emitter } from 'vs/base/common/event';
 import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { ITerminalQuickFixProvider, ITerminalCommandSelector } from 'vs/platform/terminal/common/xterm/terminalQuickFix';
 import { ITerminalQuickFixProviderSelector, ITerminalQuickFixService } from 'vs/workbench/contrib/terminal/common/terminal';
+import { ITerminalContributionService } from 'vs/workbench/contrib/terminal/common/terminalExtensionPoints';
 
 export class TerminalQuickFixService implements ITerminalQuickFixService {
 	private readonly _onDidRegisterProvider = new Emitter<ITerminalQuickFixProviderSelector>();
 	readonly onDidRegisterProvider = this._onDidRegisterProvider.event;
+	private readonly _onDidRegisterCommandSelector = new Emitter<ITerminalCommandSelector>();
+	readonly onDidRegisterCommandSelector = this._onDidRegisterCommandSelector.event;
 	private readonly _onDidUnregisterProvider = new Emitter<string>();
 	readonly onDidUnregisterProvider = this._onDidUnregisterProvider.event;
 	_serviceBrand: undefined;
@@ -18,8 +21,15 @@ export class TerminalQuickFixService implements ITerminalQuickFixService {
 	_selectors: Map<string, ITerminalCommandSelector> = new Map();
 	get providers(): Map<string, ITerminalQuickFixProvider> { return this._providers; }
 
+	constructor(@ITerminalContributionService private readonly _terminalContributionService: ITerminalContributionService) {
+		for (const selector of this._terminalContributionService.quickFixes) {
+			this.registerCommandSelector(selector);
+		}
+	}
+
 	registerCommandSelector(selector: ITerminalCommandSelector): void {
 		this._selectors.set(selector.id, selector);
+		this._onDidRegisterCommandSelector.fire(selector);
 	}
 
 	registerQuickFixProvider(id: string, provider: ITerminalQuickFixProvider): IDisposable {
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalService.ts b/src/vs/workbench/contrib/terminal/browser/terminalService.ts
index c0eb8a64814f54..dd6c255a061ef2 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalService.ts
@@ -103,6 +103,8 @@ export class TerminalService implements ITerminalService {
 		return this._activeInstance;
 	}
 
+	private _editingTerminal: ITerminalInstance | undefined;
+
 	private readonly _onDidChangeActiveGroup = new Emitter<ITerminalGroup | undefined>();
 	get onDidChangeActiveGroup(): Event<ITerminalGroup | undefined> { return this._onDidChangeActiveGroup.event; }
 	private readonly _onDidCreateInstance = new Emitter<ITerminalInstance>();
@@ -629,18 +631,14 @@ export class TerminalService implements ITerminalService {
 		// Don't touch processes if the shutdown was a result of reload as they will be reattached
 		const shouldPersistTerminals = this._configHelper.config.enablePersistentSessions && e.reason === ShutdownReason.RELOAD;
 		if (shouldPersistTerminals) {
-			for (const instance of this.instances) {
+			for (const instance of this._terminalGroupService.instances) {
 				instance.detachProcessAndDispose(TerminalExitReason.Shutdown);
 			}
 			return;
 		}
 
-		// Force dispose of all terminal instances
-		const shouldPersistTerminalsForEvent = this._shouldReviveProcesses(e.reason);
-		for (const instance of this.instances) {
-			if (shouldPersistTerminalsForEvent) {
-				instance.shutdownPersistentProcessId = instance.persistentProcessId;
-			}
+		// Force dispose of all pane terminal instances
+		for (const instance of this._terminalGroupService.instances) {
 			instance.dispose(TerminalExitReason.Shutdown);
 		}
 
@@ -976,7 +974,7 @@ export class TerminalService implements ITerminalService {
 			throw new Error('Could not create terminal when process support is not registered');
 		}
 		if (shellLaunchConfig.hideFromUser) {
-			const instance = this._terminalInstanceService.createInstance(shellLaunchConfig, undefined, options?.resource);
+			const instance = this._terminalInstanceService.createInstance(shellLaunchConfig, TerminalLocation.Panel, options?.resource);
 			this._backgroundedTerminalInstances.push(instance);
 			this._backgroundedTerminalDisposables.set(instance.instanceId, [
 				instance.onDisposed(this._onDidDisposeInstance.fire, this._onDidDisposeInstance)
@@ -1052,8 +1050,7 @@ export class TerminalService implements ITerminalService {
 		let instance;
 		const editorOptions = this._getEditorOptions(options?.location);
 		if (location === TerminalLocation.Editor) {
-			instance = this._terminalInstanceService.createInstance(shellLaunchConfig, undefined, options?.resource);
-			instance.target = TerminalLocation.Editor;
+			instance = this._terminalInstanceService.createInstance(shellLaunchConfig, TerminalLocation.Editor, options?.resource);
 			this._terminalEditorService.openEditor(instance, editorOptions);
 		} else {
 			// TODO: pass resource?
@@ -1133,6 +1130,14 @@ export class TerminalService implements ITerminalService {
 		this._configHelper.panelContainer = panelContainer;
 		this._terminalGroupService.setContainer(terminalContainer);
 	}
+
+	getEditingTerminal(): ITerminalInstance | undefined {
+		return this._editingTerminal;
+	}
+
+	setEditingTerminal(instance: ITerminalInstance | undefined) {
+		this._editingTerminal = instance;
+	}
 }
 
 class TerminalEditorStyle extends Themable {
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts b/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
index a47005a3d7ff2f..69ca27987c6927 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
@@ -138,6 +138,11 @@ export class TerminalTabList extends WorkbenchList<ITerminalInstance> {
 				this._terminalGroupService.setActiveInstance(instance);
 				await instance.focusWhenReady();
 			}
+
+			if (this._terminalService.getEditingTerminal()?.instanceId === e.element?.instanceId) {
+				return;
+			}
+
 			if (this._getFocusMode() === 'doubleClick' && this.getFocus().length === 1) {
 				e.element?.focus(true);
 			}
@@ -146,6 +151,10 @@ export class TerminalTabList extends WorkbenchList<ITerminalInstance> {
 		// on left click, if focus mode = single click, focus the element
 		// unless multi-selection is in progress
 		this.onMouseClick(async e => {
+			if (this._terminalService.getEditingTerminal()?.instanceId === e.element?.instanceId) {
+				return;
+			}
+
 			if (e.browserEvent.altKey && e.element) {
 				await this._terminalService.createTerminal({ location: { parentTerminal: e.element } });
 			} else if (this._getFocusMode() === 'singleClick') {
@@ -556,6 +565,10 @@ class TerminalTabsDragAndDrop implements IListDragAndDrop<ITerminalInstance> {
 	}
 
 	getDragURI(instance: ITerminalInstance): string | null {
+		if (this._terminalService.getEditingTerminal()?.instanceId === instance.instanceId) {
+			return null;
+		}
+
 		return instance.resource.toString();
 	}
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTypeAheadAddon.ts b/src/vs/workbench/contrib/terminal/browser/terminalTypeAheadAddon.ts
index 9c53e0d00f6da5..44eda2422c1122 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTypeAheadAddon.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTypeAheadAddon.ts
@@ -15,21 +15,26 @@ import { XtermAttributes, IXtermCore } from 'vs/workbench/contrib/terminal/brows
 import { DEFAULT_LOCAL_ECHO_EXCLUDE, IBeforeProcessDataEvent, ITerminalConfiguration, ITerminalProcessManager } from 'vs/workbench/contrib/terminal/common/terminal';
 import type { IBuffer, IBufferCell, IDisposable, ITerminalAddon, Terminal } from 'xterm';
 
-const ESC = '\x1b';
-const CSI = `${ESC}[`;
-const SHOW_CURSOR = `${CSI}?25h`;
-const HIDE_CURSOR = `${CSI}?25l`;
-const DELETE_CHAR = `${CSI}X`;
-const DELETE_REST_OF_LINE = `${CSI}K`;
+const enum VT {
+	Esc = '\x1b',
+	Csi = `\x1b[`,
+	ShowCursor = `\x1b[?25h`,
+	HideCursor = `\x1b[?25l`,
+	DeleteChar = `\x1b[X`,
+	DeleteRestOfLine = `\x1b[K`,
+}
+
 const CSI_STYLE_RE = /^\x1b\[[0-9;]*m/;
 const CSI_MOVE_RE = /^\x1b\[?([0-9]*)(;[35])?O?([DC])/;
 const NOT_WORD_RE = /[^a-z0-9]/i;
 
-const statsBufferSize = 24;
-const statsSendTelemetryEvery = 1000 * 60 * 5; // how often to collect stats
-const statsMinSamplesToTurnOn = 5;
-const statsMinAccuracyToTurnOn = 0.3;
-const statsToggleOffThreshold = 0.5; // if latency is less than `threshold * this`, turn off
+const enum StatsConstants {
+	StatsBufferSize = 24,
+	StatsSendTelemetryEvery = 1000 * 60 * 5, // how often to collect stats
+	StatsMinSamplesToTurnOn = 5,
+	StatsMinAccuracyToTurnOn = 0.3,
+	StatsToggleOffThreshold = 0.5, // if latency is less than `threshold * this`, turn off
+}
 
 /**
  * Codes that should be omitted from sending to the prediction engine and instead omitted directly:
@@ -132,7 +137,7 @@ class Cursor implements ICoordinate {
 			this._y = 0;
 		}
 
-		return `${CSI}${this._y + 1};${this._x + 1}H`;
+		return `${VT.Csi}${this._y + 1};${this._x + 1}H`;
 	}
 }
 
@@ -400,7 +405,7 @@ class CharacterPrediction implements IPrediction {
 		}
 
 		const { oldAttributes, oldChar, pos } = this.appliedAt;
-		const r = cursor.moveTo(pos) + (oldChar ? `${oldAttributes}${oldChar}${cursor.moveTo(pos)}` : DELETE_CHAR);
+		const r = cursor.moveTo(pos) + (oldChar ? `${oldAttributes}${oldChar}${cursor.moveTo(pos)}` : VT.DeleteChar);
 		return r;
 	}
 
@@ -460,7 +465,7 @@ class BackspacePrediction implements IPrediction {
 			? { isLastChar, pos, oldAttributes: attributesToSeq(cell), oldChar: cell.getChars() }
 			: { isLastChar, pos, oldAttributes: '', oldChar: '' };
 
-		return move + DELETE_CHAR;
+		return move + VT.DeleteChar;
 	}
 
 	rollback(cursor: Cursor) {
@@ -470,7 +475,7 @@ class BackspacePrediction implements IPrediction {
 
 		const { oldAttributes, oldChar, pos } = this._appliedAt;
 		if (!oldChar) {
-			return cursor.moveTo(pos) + DELETE_CHAR;
+			return cursor.moveTo(pos) + VT.DeleteChar;
 		}
 
 		return oldAttributes + oldChar + cursor.moveTo(pos) + attributesToSeq(core(this._terminal)._inputHandler._curAttrData);
@@ -482,7 +487,7 @@ class BackspacePrediction implements IPrediction {
 
 	matches(input: StringReader) {
 		if (this._appliedAt?.isLastChar) {
-			const r1 = input.eatGradually(`\b${CSI}K`);
+			const r1 = input.eatGradually(`\b${VT.Csi}K`);
 			if (r1 !== MatchResult.Failure) {
 				return r1;
 			}
@@ -535,7 +540,7 @@ class LinewrapPrediction extends NewlinePrediction implements IPrediction {
 		const r = input.eatGradually(' \r');
 		if (r !== MatchResult.Failure) {
 			// zshell additionally adds a clear line after wrapping to be safe -- eat it
-			const r2 = input.eatGradually(DELETE_REST_OF_LINE);
+			const r2 = input.eatGradually(VT.DeleteRestOfLine);
 			return r2 === MatchResult.Buffer ? MatchResult.Buffer : r;
 		}
 
@@ -608,7 +613,7 @@ class CursorMovePrediction implements IPrediction {
 		// arg can be omitted to move one character. We don't eatGradually() here
 		// or below moves that don't go as far as the cursor would be buffered
 		// indefinitely
-		if (input.eatStr(`${CSI}${direction}`.repeat(amount))) {
+		if (input.eatStr(`${VT.Csi}${direction}`.repeat(amount))) {
 			return MatchResult.Success;
 		}
 
@@ -628,7 +633,7 @@ class CursorMovePrediction implements IPrediction {
 		}
 
 		// check for a relative move in the direction
-		return input.eatGradually(`${CSI}${amount}${direction}`);
+		return input.eatGradually(`${VT.Csi}${amount}${direction}`);
 	}
 }
 
@@ -698,7 +703,7 @@ export class PredictionStats extends Disposable {
 	private _pushStat(correct: boolean, prediction: IPrediction) {
 		const started = this._addedAtTime.get(prediction)!;
 		this._stats[this._index] = [Date.now() - started, correct];
-		this._index = (this._index + 1) % statsBufferSize;
+		this._index = (this._index + 1) % StatsConstants.StatsBufferSize;
 		this._changeEmitter.fire();
 	}
 }
@@ -919,7 +924,7 @@ export class PredictionTimeline {
 		}
 
 		// prevent cursor flickering while typing
-		output = HIDE_CURSOR + output + SHOW_CURSOR;
+		output = VT.HideCursor + output + VT.ShowCursor;
 
 		return output;
 	}
@@ -1060,7 +1065,7 @@ const attributesToArgs = (cell: XtermAttributes) => {
 /**
  * Gets the escape sequence to restore state/appearance in the cell.
  */
-const attributesToSeq = (cell: XtermAttributes) => `${CSI}${attributesToArgs(cell).join(';')}m`;
+const attributesToSeq = (cell: XtermAttributes) => `${VT.Csi}${attributesToArgs(cell).join(';')}m`;
 
 const arrayHasPrefixAt = <T>(a: ReadonlyArray<T>, ai: number, b: ReadonlyArray<T>) => {
 	if (a.length - ai > b.length) {
@@ -1113,7 +1118,7 @@ const getColorWidth = (params: (number | number[])[], pos: number) => {
 
 class TypeAheadStyle implements IDisposable {
 	private static _compileArgs(args: ReadonlyArray<number>) {
-		return `${CSI}${args.join(';')}m`;
+		return `${VT.Csi}${args.join(';')}m`;
 	}
 
 	/**
@@ -1342,7 +1347,7 @@ export class TypeAheadAddon extends Disposable implements ITerminalAddon {
 				nextStatsSend = setTimeout(() => {
 					this._sendLatencyStats(stats);
 					nextStatsSend = undefined;
-				}, statsSendTelemetryEvery);
+				}, StatsConstants.StatsSendTelemetryEvery);
 			}
 
 			if (timeline.length === 0) {
@@ -1398,11 +1403,11 @@ export class TypeAheadAddon extends Disposable implements ITerminalAddon {
 			timeline.setShowPredictions(false);
 		} else if (this._typeaheadThreshold === 0) {
 			timeline.setShowPredictions(true);
-		} else if (stats.sampleSize > statsMinSamplesToTurnOn && stats.accuracy > statsMinAccuracyToTurnOn) {
+		} else if (stats.sampleSize > StatsConstants.StatsMinSamplesToTurnOn && stats.accuracy > StatsConstants.StatsMinAccuracyToTurnOn) {
 			const latency = stats.latency.median;
 			if (latency >= this._typeaheadThreshold) {
 				timeline.setShowPredictions(true);
-			} else if (latency < this._typeaheadThreshold / statsToggleOffThreshold) {
+			} else if (latency < this._typeaheadThreshold / StatsConstants.StatsToggleOffThreshold) {
 				timeline.setShowPredictions(false);
 			}
 		}
@@ -1518,12 +1523,12 @@ export class TypeAheadAddon extends Disposable implements ITerminalAddon {
 				continue;
 			}
 
-			if (reader.eatStr(`${ESC}f`)) {
+			if (reader.eatStr(`${VT.Esc}f`)) {
 				addRightNavigating(new CursorMovePrediction(CursorMoveDirection.Forwards, true, 1));
 				continue;
 			}
 
-			if (reader.eatStr(`${ESC}b`)) {
+			if (reader.eatStr(`${VT.Esc}b`)) {
 				addLeftNavigating(new CursorMovePrediction(CursorMoveDirection.Back, true, 1));
 				continue;
 			}
diff --git a/src/vs/workbench/contrib/terminal/browser/widgets/terminalQuickFixMenuItems.ts b/src/vs/workbench/contrib/terminal/browser/widgets/terminalQuickFixMenuItems.ts
index 90b0c39b2e76dd..f3b21ffe2067a2 100644
--- a/src/vs/workbench/contrib/terminal/browser/widgets/terminalQuickFixMenuItems.ts
+++ b/src/vs/workbench/contrib/terminal/browser/widgets/terminalQuickFixMenuItems.ts
@@ -3,26 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAction } from 'vs/base/common/actions';
 import { Codicon } from 'vs/base/common/codicons';
+import { Schemas } from 'vs/base/common/network';
 import { CodeActionKind } from 'vs/editor/contrib/codeAction/common/types';
 import { localize } from 'vs/nls';
 import { ActionListItemKind, IListMenuItem } from 'vs/platform/actionWidget/browser/actionList';
 import { IActionItem } from 'vs/platform/actionWidget/common/actionWidget';
-
-export const enum TerminalQuickFixType {
-	Command = 'command',
-	Opener = 'opener',
-	Port = 'port'
-}
+import { TerminalQuickFixType } from 'vs/platform/terminal/common/xterm/terminalQuickFix';
+import { ITerminalAction } from 'vs/workbench/contrib/terminal/browser/xterm/quickFixAddon';
 
 export class TerminalQuickFix implements IActionItem {
-	action: IAction;
-	type: string;
+	action: ITerminalAction;
+	type: TerminalQuickFixType;
 	disabled?: boolean;
 	title?: string;
 	source: string;
-	constructor(action: IAction, type: string, source: string, title?: string, disabled?: boolean) {
+	constructor(action: ITerminalAction, type: TerminalQuickFixType, source: string, title?: string, disabled?: boolean) {
 		this.action = action;
 		this.disabled = disabled;
 		this.title = title;
@@ -62,12 +58,13 @@ export function toMenuItems(inputQuickFixes: readonly TerminalQuickFix[], showHe
 function getQuickFixIcon(quickFix: TerminalQuickFix): { codicon: Codicon } {
 	switch (quickFix.type) {
 		case TerminalQuickFixType.Opener:
-			// TODO: if it's a file link, use the open file icon
-			return { codicon: Codicon.link };
+			if ('uri' in quickFix.action && quickFix.action.uri) {
+				const isUrl = (quickFix.action.uri.scheme === Schemas.http || quickFix.action.uri.scheme === Schemas.https);
+				return { codicon: isUrl ? Codicon.linkExternal : Codicon.goToFile };
+			}
 		case TerminalQuickFixType.Command:
 			return { codicon: Codicon.run };
 		case TerminalQuickFixType.Port:
 			return { codicon: Codicon.debugDisconnect };
 	}
-	return { codicon: Codicon.lightBulb };
 }
diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/lineDataEventAddon.ts b/src/vs/workbench/contrib/terminal/browser/xterm/lineDataEventAddon.ts
index 9d16ca4f973780..01966b54a012bb 100644
--- a/src/vs/workbench/contrib/terminal/browser/xterm/lineDataEventAddon.ts
+++ b/src/vs/workbench/contrib/terminal/browser/xterm/lineDataEventAddon.ts
@@ -19,8 +19,16 @@ export class LineDataEventAddon extends Disposable implements ITerminalAddon {
 	private readonly _onLineData = this._register(new Emitter<string>());
 	readonly onLineData = this._onLineData.event;
 
-	activate(xterm: XTermTerminal) {
+	constructor(private readonly _initializationPromise?: Promise<void>) {
+		super();
+	}
+
+	async activate(xterm: XTermTerminal) {
 		this._xterm = xterm;
+
+		// If there is an initialization promise, wait for it before registering the event
+		await this._initializationPromise;
+
 		// Fire onLineData when a line feed occurs, taking into account wrapped lines
 		this._register(xterm.onLineFeed(() => {
 			const buffer = xterm.buffer;
diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.ts b/src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.ts
index fa5547da7863b7..8a3bdaeaa86ab5 100644
--- a/src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.ts
+++ b/src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.ts
@@ -93,7 +93,7 @@ export class MarkNavigationAddon extends Disposable implements IMarkTracker, ITe
 		return this._getMarkers(true).indexOf(marker) === -1;
 	}
 
-	scrollToPreviousMark(scrollPosition: ScrollPosition = ScrollPosition.Middle, retainSelection: boolean = false, skipEmptyCommands?: boolean): void {
+	scrollToPreviousMark(scrollPosition: ScrollPosition = ScrollPosition.Middle, retainSelection: boolean = false, skipEmptyCommands: boolean = false): void {
 		if (!this._terminal) {
 			return;
 		}
diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/quickFixAddon.ts b/src/vs/workbench/contrib/terminal/browser/xterm/quickFixAddon.ts
index f6f5bacc64a2c2..be352aaeef9a9c 100644
--- a/src/vs/workbench/contrib/terminal/browser/xterm/quickFixAddon.ts
+++ b/src/vs/workbench/contrib/terminal/browser/xterm/quickFixAddon.ts
@@ -17,39 +17,36 @@ import { IDecoration, Terminal } from 'xterm';
 // eslint-disable-next-line local/code-import-patterns
 import type { ITerminalAddon } from 'xterm-headless';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { ILogService } from 'vs/platform/log/common/log';
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { ITerminalContributionService } from 'vs/workbench/contrib/terminal/common/terminalExtensionPoints';
 import { AudioCue, IAudioCueService } from 'vs/platform/audioCues/browser/audioCueService';
 import { IActionWidgetService } from 'vs/platform/actionWidget/browser/actionWidget';
 import { ActionSet } from 'vs/platform/actionWidget/common/actionWidget';
-import { TerminalQuickFix, TerminalQuickFixType, toMenuItems } from 'vs/workbench/contrib/terminal/browser/widgets/terminalQuickFixMenuItems';
+import { TerminalQuickFix, toMenuItems } from 'vs/workbench/contrib/terminal/browser/widgets/terminalQuickFixMenuItems';
 import { ITerminalQuickFixProviderSelector, ITerminalQuickFixService } from 'vs/workbench/contrib/terminal/common/terminal';
-import { ITerminalQuickFixOptions, IResolvedExtensionOptions, IUnresolvedExtensionOptions, ITerminalCommandSelector, ITerminalQuickFix, IInternalOptions, ITerminalQuickFixCommandAction, ITerminalQuickFixOpenerAction } from 'vs/platform/terminal/common/xterm/terminalQuickFix';
+import { ITerminalQuickFixOptions, IResolvedExtensionOptions, IUnresolvedExtensionOptions, ITerminalCommandSelector, ITerminalQuickFix, IInternalOptions, ITerminalQuickFixCommandAction, ITerminalQuickFixOpenerAction, TerminalQuickFixType } from 'vs/platform/terminal/common/xterm/terminalQuickFix';
 import { getLinesForCommand } from 'vs/platform/terminal/common/capabilities/commandDetectionCapability';
+import { IAnchor } from 'vs/base/browser/ui/contextview/contextview';
+import { ILabelService } from 'vs/platform/label/common/label';
+import { Schemas } from 'vs/base/common/network';
+import { URI } from 'vs/base/common/uri';
+import { ITerminalContributionService } from 'vs/workbench/contrib/terminal/common/terminalExtensionPoints';
 
-const quickFixTelemetryTitle = 'terminal/quick-fix';
-type QuickFixResultTelemetryEvent = {
-	quickFixId: string;
-	fixesShown: boolean;
-	ranQuickFixCommand?: boolean;
-};
-type QuickFixClassification = {
-	owner: 'meganrogge';
-	quickFixId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The quick fix ID' };
-	fixesShown: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the fixes were shown by the user' };
-	ranQuickFixCommand?: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'If the command that was executed matched a quick fix suggested one. Undefined if no command is expected.' };
-	comment: 'Terminal quick fixes';
-};
-const quickFixSelectors = [DecorationSelector.QuickFix, DecorationSelector.LightBulb, DecorationSelector.Codicon, DecorationSelector.CommandDecoration, DecorationSelector.XtermDecoration];
+const quickFixSelectors = [
+	DecorationSelector.QuickFix,
+	DecorationSelector.LightBulb,
+	DecorationSelector.Codicon,
+	DecorationSelector.CommandDecoration,
+	DecorationSelector.XtermDecoration
+];
 
 export interface ITerminalQuickFixAddon {
+	showMenu(): void;
 	onDidRequestRerunCommand: Event<{ command: string; addNewLine?: boolean }>;
 	/**
- * Registers a listener on onCommandFinished scoped to a particular command or regular
- * expression and provides a callback to be executed for commands that match.
- */
+	 * Registers a listener on onCommandFinished scoped to a particular command or regular
+	 * expression and provides a callback to be executed for commands that match.
+	 */
 	registerCommandFinishedListener(options: ITerminalQuickFixOptions): void;
 }
 
@@ -65,9 +62,11 @@ export class TerminalQuickFixAddon extends Disposable implements ITerminalAddon,
 
 	private _decoration: IDecoration | undefined;
 
-	private _fixesShown: boolean = false;
-	private _expectedCommands: string[] | undefined;
-	private _fixId: string | undefined;
+	private _currentRenderContext: { quickFixes: ITerminalAction[]; anchor: IAnchor; parentElement: HTMLElement } | undefined;
+
+	private _lastQuickFixId: string | undefined;
+
+	private _registeredSelectors: Set<string> = new Set();
 
 	constructor(
 		private readonly _aliases: string[][] | undefined,
@@ -77,10 +76,10 @@ export class TerminalQuickFixAddon extends Disposable implements ITerminalAddon,
 		@IAudioCueService private readonly _audioCueService: IAudioCueService,
 		@IOpenerService private readonly _openerService: IOpenerService,
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
-		@ILogService private readonly _logService: ILogService,
 		@IExtensionService private readonly _extensionService: IExtensionService,
-		@ITerminalContributionService private readonly _terminalContributionService: ITerminalContributionService,
-		@IActionWidgetService private readonly _actionWidgetService: IActionWidgetService
+		@IActionWidgetService private readonly _actionWidgetService: IActionWidgetService,
+		@ILabelService private readonly _labelService: ILabelService,
+		@ITerminalContributionService terminalContributionService: ITerminalContributionService
 	) {
 		super();
 		const commandDetectionCapability = this._capabilities.get(TerminalCapability.CommandDetection);
@@ -93,10 +92,11 @@ export class TerminalQuickFixAddon extends Disposable implements ITerminalAddon,
 				}
 			});
 		}
-		for (const commandSelector of this._terminalContributionService.quickFixes) {
-			this.registerCommandSelector(commandSelector);
-		}
 		this._quickFixService.onDidRegisterProvider(result => this.registerCommandFinishedListener(convertToQuickFixOptions(result)));
+		for (const selector of terminalContributionService.quickFixes) {
+			this.registerCommandSelector(selector);
+		}
+		this._quickFixService.onDidRegisterCommandSelector(selector => this.registerCommandSelector(selector));
 		this._quickFixService.onDidUnregisterProvider(id => this._commandListeners.delete(id));
 	}
 
@@ -105,12 +105,38 @@ export class TerminalQuickFixAddon extends Disposable implements ITerminalAddon,
 	}
 
 	showMenu(): void {
-		this._fixesShown = true;
-		this._decoration?.element?.click();
+		if (!this._currentRenderContext) {
+			return;
+		}
+
+		// TODO: What's documentation do? Need a vscode command?
+		const actions = this._currentRenderContext.quickFixes.map(f => new TerminalQuickFix(f, f.type, f.source, f.label));
+		const documentation = this._currentRenderContext.quickFixes.map(f => { return { id: f.source, title: f.label, tooltip: f.source }; });
+		const actionSet = {
+			// TODO: Documentation and actions are separate?
+			documentation,
+			allActions: actions,
+			hasAutoFix: false,
+			validActions: actions,
+			dispose: () => { }
+		} as ActionSet<TerminalQuickFix>;
+		const delegate = {
+			onSelect: async (fix: TerminalQuickFix) => {
+				fix.action?.run();
+				this._actionWidgetService.hide();
+				this._disposeQuickFix(fix.action.id, true);
+			},
+			onHide: () => {
+				this._terminal?.focus();
+			},
+		};
+		this._actionWidgetService.show('quickFixWidget', false, toMenuItems(actionSet.validActions, true), delegate, this._currentRenderContext.anchor, this._currentRenderContext.parentElement);
 	}
 
 	registerCommandSelector(selector: ITerminalCommandSelector): void {
-		this._quickFixService.registerCommandSelector(selector);
+		if (this._registeredSelectors.has(selector.id)) {
+			return;
+		}
 		const matcherKey = selector.commandLineMatcher.toString();
 		const currentOptions = this._commandListeners.get(matcherKey) || [];
 		currentOptions.push({
@@ -118,8 +144,9 @@ export class TerminalQuickFixAddon extends Disposable implements ITerminalAddon,
 			type: 'unresolved',
 			commandLineMatcher: selector.commandLineMatcher,
 			outputMatcher: selector.outputMatcher,
-			exitStatus: selector.exitStatus
+			commandExitResult: selector.commandExitResult
 		});
+		this._registeredSelectors.add(selector.id);
 		this._commandListeners.set(matcherKey, currentOptions);
 	}
 
@@ -138,26 +165,7 @@ export class TerminalQuickFixAddon extends Disposable implements ITerminalAddon,
 		if (!terminal || !commandDetection) {
 			return;
 		}
-		this._register(commandDetection.onCommandFinished(async command => {
-			if (this._expectedCommands) {
-				const quickFixId = this._fixId || '';
-				const ranQuickFixCommand = this._expectedCommands.includes(command.command);
-				this._logService.debug(quickFixTelemetryTitle, {
-					quickFixId,
-					fixesShown: this._fixesShown,
-					ranQuickFixCommand
-				});
-				this._telemetryService?.publicLog2<QuickFixResultTelemetryEvent, QuickFixClassification>(quickFixTelemetryTitle, {
-					quickFixId,
-					fixesShown: this._fixesShown,
-					ranQuickFixCommand
-				});
-				this._expectedCommands = undefined;
-				this._fixId = undefined;
-			}
-			await this._resolveQuickFixes(command, this._aliases);
-			this._fixesShown = false;
-		}));
+		this._register(commandDetection.onCommandFinished(async command => await this._resolveQuickFixes(command, this._aliases)));
 
 		// The buffer is not ready by the time command finish
 		// is called. Add the decoration on command start if there are corresponding quick fixes
@@ -176,48 +184,42 @@ export class TerminalQuickFixAddon extends Disposable implements ITerminalAddon,
 		if (!terminal) {
 			return;
 		}
-		if (command.command !== '') {
-			this._disposeQuickFix();
+		if (command.command !== '' && this._lastQuickFixId) {
+			this._disposeQuickFix(this._lastQuickFixId, false);
 		}
 		const resolver = async (selector: ITerminalQuickFixOptions, lines?: string[]) => {
 			const id = selector.id;
 			await this._extensionService.activateByEvent(`onTerminalQuickFixRequest:${id}`);
-			const provider = this._quickFixService.providers.get(id);
-			if (!provider) {
-				this._logService.warn('No provider when trying to resolve terminal quick fix for provider: ', id);
-				return;
-			}
-			return provider.provideTerminalQuickFixes(command, lines, { type: 'resolved', commandLineMatcher: selector.commandLineMatcher, outputMatcher: selector.outputMatcher, exitStatus: selector.exitStatus, id: selector.id }, new CancellationTokenSource().token);
+			return this._quickFixService.providers.get(id)?.provideTerminalQuickFixes(command, lines, { type: 'resolved', commandLineMatcher: selector.commandLineMatcher, outputMatcher: selector.outputMatcher, commandExitResult: selector.commandExitResult, id: selector.id }, new CancellationTokenSource().token);
 		};
-		const result = await getQuickFixesForCommand(aliases, terminal, command, this._commandListeners, this._openerService, this._onDidRequestRerunCommand, resolver);
+		const result = await getQuickFixesForCommand(aliases, terminal, command, this._commandListeners, this._openerService, this._labelService, this._onDidRequestRerunCommand, resolver);
 		if (!result) {
 			return;
 		}
-		const { fixes, onDidRunQuickFix, expectedCommands } = result;
-		this._expectedCommands = expectedCommands;
-		this._fixId = fixes.map(f => f.id).join('');
-		this._quickFixes = fixes;
-		this._register(onDidRunQuickFix((quickFixId) => {
-			const ranQuickFixCommand = (this._expectedCommands?.includes(command.command) || false);
-			this._logService.debug(quickFixTelemetryTitle, {
-				quickFixId,
-				fixesShown: this._fixesShown,
-				ranQuickFixCommand
-			});
-			this._telemetryService?.publicLog2<QuickFixResultTelemetryEvent, QuickFixClassification>(quickFixTelemetryTitle, {
-				quickFixId,
-				fixesShown: this._fixesShown,
-				ranQuickFixCommand
-			});
-			this._disposeQuickFix();
-			this._fixesShown = false;
-		}));
+
+		this._quickFixes = result;
+		this._lastQuickFixId = this._quickFixes[0].id;
 	}
 
-	private _disposeQuickFix(): void {
+	private _disposeQuickFix(id: string, ranQuickFix: boolean): void {
+		type QuickFixResultTelemetryEvent = {
+			quickFixId: string;
+			ranQuickFix: boolean;
+		};
+		type QuickFixClassification = {
+			owner: 'meganrogge';
+			quickFixId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The quick fix ID' };
+			ranQuickFix: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the quick fix was run' };
+			comment: 'Terminal quick fixes';
+		};
+		this._telemetryService?.publicLog2<QuickFixResultTelemetryEvent, QuickFixClassification>('terminal/quick-fix', {
+			quickFixId: id,
+			ranQuickFix
+		});
 		this._decoration?.dispose();
 		this._decoration = undefined;
 		this._quickFixes = undefined;
+		this._lastQuickFixId = undefined;
 	}
 
 	/**
@@ -251,47 +253,31 @@ export class TerminalQuickFixAddon extends Disposable implements ITerminalAddon,
 			e.classList.add(...quickFixSelectors);
 			updateLayout(this._configurationService, e);
 			this._audioCueService.playAudioCue(AudioCue.terminalQuickFix);
-			this._register(dom.addDisposableListener(e, dom.EventType.CLICK, () => {
-				const rect = e.getBoundingClientRect();
-				const anchor = {
-					x: rect.x,
-					y: rect.y,
-					width: rect.width,
-					height: rect.height
-				};
-				// TODO: What's documentation do? Need a vscode command?
-				const actions = fixes.map(f => new TerminalQuickFix(f, f.class || TerminalQuickFixType.Command, f.source, f.label));
-				const documentation = fixes.map(f => { return { id: f.source, title: f.label, tooltip: f.source }; });
-				const actionSet = {
-					// TODO: Documentation and actions are separate?
-					documentation,
-					allActions: actions,
-					hasAutoFix: false,
-					validActions: actions,
-					dispose: () => { }
-				} as ActionSet<TerminalQuickFix>;
+			const rect = e.getBoundingClientRect();
+			const anchor = {
+				x: rect.x,
+				y: rect.y,
+				width: rect.width,
+				height: rect.height
+			};
 
-				const parentElement = e.parentElement?.parentElement?.parentElement?.parentElement;
-				if (!parentElement) {
-					return;
-				}
-				const delegate = {
-					onSelect: async (fix: TerminalQuickFix) => {
-						fix.action?.run();
-						this._actionWidgetService.hide();
-					},
-					onHide: () => {
-						this._terminal?.focus();
-					},
-				};
-				this._actionWidgetService.show('quickFixWidget', toMenuItems(actionSet.validActions, true), delegate, anchor, parentElement);
-			}));
+			const parentElement = e.parentElement?.parentElement?.parentElement?.parentElement;
+			if (!parentElement) {
+				return;
+			}
+
+			this._currentRenderContext = { quickFixes: fixes, anchor, parentElement };
+			this._register(dom.addDisposableListener(e, dom.EventType.CLICK, () => this.showMenu()));
 		});
+		decoration.onDispose(() => this._currentRenderContext = undefined);
 	}
 }
 
 export interface ITerminalAction extends IAction {
+	type: TerminalQuickFixType;
 	source: string;
+	uri?: URI;
+	command?: string;
 }
 
 export async function getQuickFixesForCommand(
@@ -300,20 +286,17 @@ export async function getQuickFixesForCommand(
 	terminalCommand: ITerminalCommand,
 	quickFixOptions: Map<string, ITerminalQuickFixOptions[]>,
 	openerService: IOpenerService,
+	labelService: ILabelService,
 	onDidRequestRerunCommand?: Emitter<{ command: string; addNewLine?: boolean }>,
 	getResolvedFixes?: (selector: ITerminalQuickFixOptions, lines?: string[]) => Promise<ITerminalQuickFix | ITerminalQuickFix[] | undefined>
-): Promise<{ fixes: ITerminalAction[]; onDidRunQuickFix: Event<string>; expectedCommands?: string[] } | undefined> {
-	const onDidRunQuickFixEmitter = new Emitter<string>();
-	const onDidRunQuickFix = onDidRunQuickFixEmitter.event;
+): Promise<ITerminalAction[] | undefined> {
 	const fixes: ITerminalAction[] = [];
 	const newCommand = terminalCommand.command;
-	const expectedCommands = [];
 	for (const options of quickFixOptions.values()) {
 		for (const option of options) {
-			if (option.exitStatus === (terminalCommand.exitCode !== 0)) {
+			if ((option.commandExitResult === 'success' && terminalCommand.exitCode !== 0) || (option.commandExitResult === 'error' && terminalCommand.exitCode === 0)) {
 				continue;
 			}
-			const id = option.id;
 			let quickFixes;
 			if (option.type === 'resolved') {
 				quickFixes = await (option as IResolvedExtensionOptions).getQuickFixes(terminalCommand, getLinesForCommand(terminal.buffer.active, terminalCommand, terminal.cols, option.outputMatcher), option, new CancellationTokenSource().token);
@@ -348,67 +331,70 @@ export async function getQuickFixesForCommand(
 								const fix = quickFix as ITerminalQuickFixCommandAction;
 								const label = localize('quickFix.command', 'Run: {0}', fix.terminalCommand);
 								action = {
+									type: TerminalQuickFixType.Command,
+									class: undefined,
 									source: quickFix.source,
 									id: quickFix.id,
 									label,
-									class: quickFix.type,
 									enabled: true,
 									run: () => {
 										onDidRequestRerunCommand?.fire({
 											command: fix.terminalCommand,
-											addNewLine: fix.addNewLine
+											addNewLine: fix.addNewLine ?? true
 										});
 									},
 									tooltip: label,
 									command: fix.terminalCommand
-								} as ITerminalAction;
-								expectedCommands.push(fix.terminalCommand);
+								};
 								break;
 							}
 							case TerminalQuickFixType.Opener: {
 								const fix = quickFix as ITerminalQuickFixOpenerAction;
-								const label = localize('quickFix.opener', 'Open: {0}', fix.uri.toString());
+								if (!fix.uri) {
+									return;
+								}
+								const isUrl = (fix.uri.scheme === Schemas.http || fix.uri.scheme === Schemas.https);
+								const uriLabel = isUrl ? encodeURI(fix.uri.toString(true)) : labelService.getUriLabel(fix.uri);
+								const label = localize('quickFix.opener', 'Open: {0}', uriLabel);
 								action = {
 									source: quickFix.source,
 									id: quickFix.id,
 									label,
-									class: quickFix.type,
+									type: TerminalQuickFixType.Opener,
+									class: undefined,
 									enabled: true,
-									run: () => {
-										openerService.open(fix.uri.path);
-										// since no command gets run here, need to
-										// clear the decoration and quick fix
-										onDidRunQuickFixEmitter.fire(id);
-									},
+									run: () => openerService.open(fix.uri),
 									tooltip: label,
 									uri: fix.uri
-								} as ITerminalAction;
+								};
+								break;
+							}
+							case TerminalQuickFixType.Port: {
+								const fix = quickFix as ITerminalAction;
+								action = {
+									source: 'builtin',
+									type: fix.type,
+									id: fix.id,
+									label: fix.label,
+									class: fix.class,
+									enabled: fix.enabled,
+									run: () => {
+										fix.run();
+									},
+									tooltip: fix.tooltip
+								};
 								break;
 							}
 						}
-					} else {
-						const fix = quickFix as ITerminalAction;
-						action = {
-							source: 'builtin',
-							id: fix.id,
-							label: fix.label,
-							class: fix.class,
-							enabled: fix.enabled,
-							run: () => {
-								fix.run();
-								onDidRunQuickFixEmitter.fire(id);
-							},
-							tooltip: fix.tooltip
-						};
-					}
-					if (action) {
-						fixes.push(action);
+						if (action) {
+							fixes.push(action);
+						}
 					}
 				}
 			}
 		}
 	}
-	return fixes.length > 0 ? { fixes, onDidRunQuickFix, expectedCommands } : undefined;
+	return fixes.length > 0 ? fixes : undefined;
 }
 
 function convertToQuickFixOptions(selectorProvider: ITerminalQuickFixProviderSelector): IResolvedExtensionOptions {
@@ -417,7 +403,7 @@ function convertToQuickFixOptions(selectorProvider: ITerminalQuickFixProviderSel
 		type: 'resolved',
 		commandLineMatcher: selectorProvider.selector.commandLineMatcher,
 		outputMatcher: selectorProvider.selector.outputMatcher,
-		exitStatus: selectorProvider.selector.exitStatus,
+		commandExitResult: selectorProvider.selector.commandExitResult,
 		getQuickFixes: selectorProvider.provider.provideTerminalQuickFixes
 	};
 }
diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts b/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts
index 4a9c3d0836a356..cd43e69acdf046 100644
--- a/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts
+++ b/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts
@@ -37,12 +37,15 @@ import { ITerminalCapabilityStore, ITerminalCommand, TerminalCapability } from '
 import { Emitter } from 'vs/base/common/event';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 
-
-// How long in milliseconds should an average frame take to render for a notification to appear
-// which suggests the fallback DOM-based renderer
-const SLOW_CANVAS_RENDER_THRESHOLD = 50;
-const NUMBER_OF_FRAMES_TO_MEASURE = 20;
-const SMOOTH_SCROLL_DURATION = 125;
+const enum RenderConstants {
+	/**
+	 * How long in milliseconds should an average frame take to render for a notification to appear
+	 * which suggests the fallback DOM-based renderer.
+	 */
+	SlowCanvasRenderThreshold = 50,
+	NumberOfFramestoMeasure = 20,
+	SmoothScrollDuration = 125
+}
 
 let CanvasAddon: typeof CanvasAddonType;
 let SearchAddon: typeof SearchAddonType;
@@ -216,7 +219,7 @@ export class XtermTerminal extends DisposableStore implements IXtermTerminal, II
 			scrollSensitivity: config.mouseWheelScrollSensitivity,
 			wordSeparator: config.wordSeparators,
 			overviewRulerWidth: 10,
-			smoothScrollDuration: config.smoothScrolling ? SMOOTH_SCROLL_DURATION : 0
+			smoothScrollDuration: config.smoothScrolling ? RenderConstants.SmoothScrollDuration : 0
 		}));
 		this._core = (this.raw as any)._core as IXtermCore;
 
@@ -310,7 +313,7 @@ export class XtermTerminal extends DisposableStore implements IXtermTerminal, II
 		this.raw.options.rightClickSelectsWord = config.rightClickBehavior === 'selectWord';
 		this.raw.options.wordSeparator = config.wordSeparators;
 		this.raw.options.customGlyphs = config.customGlyphs;
-		this.raw.options.smoothScrollDuration = config.smoothScrolling ? SMOOTH_SCROLL_DURATION : 0;
+		this.raw.options.smoothScrollDuration = config.smoothScrolling ? RenderConstants.SmoothScrollDuration : 0;
 		if (this._shouldLoadWebgl()) {
 			this._enableWebglRenderer();
 		} else {
@@ -620,7 +623,7 @@ export class XtermTerminal extends DisposableStore implements IXtermTerminal, II
 			frameTimes.shift();
 
 			const medianTime = frameTimes.sort((a, b) => a - b)[Math.floor(frameTimes.length / 2)];
-			if (medianTime > SLOW_CANVAS_RENDER_THRESHOLD) {
+			if (medianTime > RenderConstants.SlowCanvasRenderThreshold) {
 				if (this._configHelper.config.gpuAcceleration === 'auto') {
 					XtermTerminal._suggestedRendererType = 'dom';
 					this.updateConfig();
@@ -653,7 +656,7 @@ export class XtermTerminal extends DisposableStore implements IXtermTerminal, II
 			const startTime = performance.now();
 			originalOnGridChanged.call(textRenderLayer, terminal, firstRow, lastRow);
 			frameTimes.push(performance.now() - startTime);
-			if (frameTimes.length === NUMBER_OF_FRAMES_TO_MEASURE) {
+			if (frameTimes.length === RenderConstants.NumberOfFramestoMeasure) {
 				evaluateCanvasRenderer();
 				// Restore original function
 				textRenderLayer.onGridChanged = originalOnGridChanged;
diff --git a/src/vs/workbench/contrib/terminal/common/remoteTerminalChannel.ts b/src/vs/workbench/contrib/terminal/common/remoteTerminalChannel.ts
index 9efd1de958c6b6..9223124be8f3ad 100644
--- a/src/vs/workbench/contrib/terminal/common/remoteTerminalChannel.ts
+++ b/src/vs/workbench/contrib/terminal/common/remoteTerminalChannel.ts
@@ -260,8 +260,8 @@ export class RemoteTerminalChannelClient implements IPtyHostController {
 		return this._channel.call('$getEnvironment');
 	}
 
-	getWslPath(original: string): Promise<string> {
-		return this._channel.call('$getWslPath', [original]);
+	getWslPath(original: string, direction: 'unix-to-win' | 'win-to-unix'): Promise<string> {
+		return this._channel.call('$getWslPath', [original, direction]);
 	}
 
 	setTerminalLayoutInfo(layout?: ITerminalsLayoutInfoById): Promise<void> {
diff --git a/src/vs/workbench/contrib/terminal/common/terminal.ts b/src/vs/workbench/contrib/terminal/common/terminal.ts
index e2c0043c1a302b..7a63014a646349 100644
--- a/src/vs/workbench/contrib/terminal/common/terminal.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminal.ts
@@ -90,6 +90,7 @@ export interface ITerminalProfileService {
 export const ITerminalQuickFixService = createDecorator<ITerminalQuickFixService>('terminalQuickFixService');
 export interface ITerminalQuickFixService {
 	onDidRegisterProvider: Event<ITerminalQuickFixProviderSelector>;
+	onDidRegisterCommandSelector: Event<ITerminalCommandSelector>;
 	onDidUnregisterProvider: Event<string>;
 	readonly _serviceBrand: undefined;
 	providers: Map<string, ITerminalQuickFixProvider>;
@@ -137,7 +138,7 @@ export interface ITerminalBackend {
 	listProcesses(): Promise<IProcessDetails[]>;
 	getDefaultSystemShell(osOverride?: OperatingSystem): Promise<string>;
 	getProfiles(profiles: unknown, defaultProfile: unknown, includeDetectedProfiles?: boolean): Promise<ITerminalProfile[]>;
-	getWslPath(original: string): Promise<string>;
+	getWslPath(original: string, direction: 'unix-to-win' | 'win-to-unix'): Promise<string>;
 	getEnvironment(): Promise<IProcessEnvironment>;
 	getShellEnvironment(): Promise<IProcessEnvironment | undefined>;
 	setTerminalLayoutInfo(layoutInfo?: ITerminalsLayoutInfoById): Promise<void>;
@@ -290,7 +291,7 @@ export interface ITerminalConfiguration {
 	splitCwd: 'workspaceRoot' | 'initial' | 'inherited';
 	windowsEnableConpty: boolean;
 	wordSeparators: string;
-	enableFileLinks: boolean;
+	enableFileLinks: 'off' | 'on' | 'notRemote';
 	unicodeVersion: '6' | '11';
 	localEchoLatencyThreshold: number;
 	localEchoExcludePrograms: ReadonlyArray<string>;
@@ -497,6 +498,7 @@ export const enum TerminalCommandId {
 	RunRecentCommand = 'workbench.action.terminal.runRecentCommand',
 	CopyLastCommand = 'workbench.action.terminal.copyLastCommand',
 	GoToRecentDirectory = 'workbench.action.terminal.goToRecentDirectory',
+	CopyAndClearSelection = 'workbench.action.terminal.copyAndClearSelection',
 	CopySelection = 'workbench.action.terminal.copySelection',
 	CopySelectionAsHtml = 'workbench.action.terminal.copySelectionAsHtml',
 	SelectAll = 'workbench.action.terminal.selectAll',
@@ -513,6 +515,7 @@ export const enum TerminalCommandId {
 	Split = 'workbench.action.terminal.split',
 	SplitInstance = 'workbench.action.terminal.splitInstance',
 	SplitInActiveWorkspace = 'workbench.action.terminal.splitInActiveWorkspace',
+	ShowQuickFixes = 'workbench.action.terminal.showQuickFixes',
 	Unsplit = 'workbench.action.terminal.unsplit',
 	UnsplitInstance = 'workbench.action.terminal.unsplitInstance',
 	JoinInstance = 'workbench.action.terminal.joinInstance',
@@ -594,6 +597,7 @@ export const enum TerminalCommandId {
 export const DEFAULT_COMMANDS_TO_SKIP_SHELL: string[] = [
 	TerminalCommandId.ClearSelection,
 	TerminalCommandId.Clear,
+	TerminalCommandId.CopyAndClearSelection,
 	TerminalCommandId.CopySelection,
 	TerminalCommandId.CopySelectionAsHtml,
 	TerminalCommandId.CopyLastCommand,
@@ -737,7 +741,8 @@ export const terminalContributionsDescriptor: IExtensionPointDescriptor<ITermina
 				description: nls.localize('vscode.extension.contributes.terminal.quickFixes', "Defines quick fixes for terminals with shell integration enabled."),
 				items: {
 					type: 'object',
-					required: ['id', 'commandLineMatcher', 'outputMatcher', 'exitStatus'],
+					additionalProperties: false,
+					required: ['id', 'commandLineMatcher', 'outputMatcher', 'commandExitResult'],
 					defaultSnippets: [{
 						body: {
 							id: '$1',
@@ -748,15 +753,15 @@ export const terminalContributionsDescriptor: IExtensionPointDescriptor<ITermina
 					}],
 					properties: {
 						id: {
-							description: nls.localize('vscode.extension.contributes.terminal.quickFixes.id', "The ID of the quick fix."),
+							description: nls.localize('vscode.extension.contributes.terminal.quickFixes.id', "The ID of the quick fix provider."),
 							type: 'string',
 						},
 						commandLineMatcher: {
-							description: nls.localize('vscode.extension.contributes.terminal.quickFixes.commandLineMatcher', "The command line to match."),
+							description: nls.localize('vscode.extension.contributes.terminal.quickFixes.commandLineMatcher', "The regular expression to test the command line against."),
 							type: 'string',
 						},
 						outputMatcher: {
-							description: nls.localize('vscode.extension.contributes.terminal.quickFixes.outputMatcher', "The output to match, which provides groups of the form <group_name> to be referenced via ${group:group_name} in commandToRun and linkToOpen."),
+							markdownDescription: nls.localize('vscode.extension.contributes.terminal.quickFixes.outputMatcher', "The regular expression to test the output against, which provides groups to be referenced in terminalCommand and uri.\n\nFor example:\n\n `lineMatcher: /git push --set-upstream origin (?<branchName>[^\s]+)/;`\n\n`terminalCommand: 'git push --set-upstream origin ${group:branchName}';`\n"),
 							type: 'object',
 							required: ['lineMatcher', 'anchor', 'offset', 'length'],
 							properties: {
@@ -765,11 +770,11 @@ export const terminalContributionsDescriptor: IExtensionPointDescriptor<ITermina
 									type: 'string'
 								},
 								anchor: {
-									description: 'Which side of the output to anchor the offset and length against',
+									description: 'Where the search should begin in the buffer',
 									enum: ['top', 'bottom']
 								},
 								offset: {
-									description: 'How far from either the top or the bottom of the butter to start matching against.',
+									description: 'The number of lines vertically from the anchor in the buffer to start matching against',
 									type: 'number'
 								},
 								length: {
@@ -778,9 +783,13 @@ export const terminalContributionsDescriptor: IExtensionPointDescriptor<ITermina
 								}
 							}
 						},
-						exitStatus: {
-							description: nls.localize('vscode.extension.contributes.terminal.quickFixes.exitStatus', "True if the exit code is non-zero"),
-							type: 'boolean',
+						commandExitResult: {
+							description: nls.localize('vscode.extension.contributes.terminal.quickFixes.commandExitResult', "The command exit result to match on"),
+							enum: ['success', 'error'],
+							enumDescriptions: [
+								'The command exited with an exit code of zero.',
+								'The command exited with a non-zero exit code.'
+							]
 						}
 					},
 				}
diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
index adfc5269b62da6..db86fb96e17fd2 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
@@ -121,7 +121,7 @@ const terminalConfiguration: IConfigurationNode = {
 			enum: ['singleClick', 'doubleClick'],
 			enumDescriptions: [
 				localize('terminal.integrated.tabs.focusMode.singleClick', "Focus the terminal when clicking a terminal tab"),
-				localize('terminal.integrated.tabs.focusMode.doubleClick', "Focus the terminal when double clicking a terminal tab")
+				localize('terminal.integrated.tabs.focusMode.doubleClick', "Focus the terminal when double-clicking a terminal tab")
 			],
 			default: 'doubleClick',
 			description: localize('terminal.integrated.tabs.focusMode', "Controls whether focusing the terminal of a tab happens on double or single click.")
@@ -437,15 +437,21 @@ const terminalConfiguration: IConfigurationNode = {
 			default: true
 		},
 		[TerminalSettingId.WordSeparators]: {
-			description: localize('terminal.integrated.wordSeparators', "A string containing all characters to be considered word separators by the double click to select word feature."),
+			description: localize('terminal.integrated.wordSeparators', "A string containing all characters to be considered word separators by the double-click to select word feature."),
 			type: 'string',
 			// allow-any-unicode-next-line
 			default: ' ()[]{}\',"`─‘’'
 		},
 		[TerminalSettingId.EnableFileLinks]: {
-			description: localize('terminal.integrated.enableFileLinks', "Whether to enable file links in the terminal. Links can be slow when working on a network drive in particular because each file link is verified against the file system. Changing this will take effect only in new terminals."),
-			type: 'boolean',
-			default: true
+			description: localize('terminal.integrated.enableFileLinks', "Whether to enable file links in terminals. Links can be slow when working on a network drive in particular because each file link is verified against the file system. Changing this will take effect only in new terminals."),
+			type: 'string',
+			enum: ['off', 'on', 'notRemote'],
+			enumDescriptions: [
+				localize('enableFileLinks.off', "Always off."),
+				localize('enableFileLinks.notRemote', "Enable only when not in a remote workspace."),
+				localize('enableFileLinks.on', "Always on.")
+			],
+			default: 'on'
 		},
 		[TerminalSettingId.UnicodeVersion]: {
 			type: 'string',
@@ -534,7 +540,7 @@ const terminalConfiguration: IConfigurationNode = {
 		},
 		[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, pwsh, zsh\n - Windows: pwsh\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, 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.shellIntegrations.decorationsEnabled#`'),
+			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\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.shellIntegrations.decorationsEnabled#`', '`#editor.accessibilitySupport#`'),
 			type: 'boolean',
 			default: true
 		},
diff --git a/src/vs/workbench/contrib/terminal/electron-sandbox/localTerminalBackend.ts b/src/vs/workbench/contrib/terminal/electron-sandbox/localTerminalBackend.ts
index 42fe6ff3212d8d..7d2c657924b319 100644
--- a/src/vs/workbench/contrib/terminal/electron-sandbox/localTerminalBackend.ts
+++ b/src/vs/workbench/contrib/terminal/electron-sandbox/localTerminalBackend.ts
@@ -202,8 +202,8 @@ class LocalTerminalBackend extends BaseTerminalBackend implements ITerminalBacke
 		return this._shellEnvironmentService.getShellEnv();
 	}
 
-	async getWslPath(original: string): Promise<string> {
-		return this._localPtyService.getWslPath(original);
+	async getWslPath(original: string, direction: 'unix-to-win' | 'win-to-unix'): Promise<string> {
+		return this._localPtyService.getWslPath(original, direction);
 	}
 
 	async setTerminalLayoutInfo(layoutInfo?: ITerminalsLayoutInfoById): Promise<void> {
diff --git a/src/vs/workbench/contrib/terminal/electron-sandbox/terminalNativeContribution.ts b/src/vs/workbench/contrib/terminal/electron-sandbox/terminalNativeContribution.ts
index b1c88750736598..b08edc2ee90ce6 100644
--- a/src/vs/workbench/contrib/terminal/electron-sandbox/terminalNativeContribution.ts
+++ b/src/vs/workbench/contrib/terminal/electron-sandbox/terminalNativeContribution.ts
@@ -7,7 +7,6 @@ import { ipcRenderer } from 'vs/base/parts/sandbox/electron-sandbox/globals';
 import { INativeOpenFileRequest } from 'vs/platform/window/common/window';
 import { URI } from 'vs/base/common/uri';
 import { IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { registerRemoteContributions } from 'vs/workbench/contrib/terminal/electron-sandbox/terminalRemote';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
 import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
@@ -21,9 +20,8 @@ export class TerminalNativeContribution extends Disposable implements IWorkbench
 	constructor(
 		@IFileService private readonly _fileService: IFileService,
 		@ITerminalService private readonly _terminalService: ITerminalService,
-		@IInstantiationService readonly instantiationService: IInstantiationService,
-		@IRemoteAgentService readonly remoteAgentService: IRemoteAgentService,
-		@INativeHostService readonly nativeHostService: INativeHostService
+		@IRemoteAgentService remoteAgentService: IRemoteAgentService,
+		@INativeHostService nativeHostService: INativeHostService
 	) {
 		super();
 
diff --git a/src/vs/workbench/contrib/terminal/test/browser/links/linkTestUtils.ts b/src/vs/workbench/contrib/terminal/test/browser/links/linkTestUtils.ts
index 79623f65e5700b..540074c1337d6a 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/links/linkTestUtils.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/links/linkTestUtils.ts
@@ -46,7 +46,22 @@ export async function assertLinkHelper(
 	deepStrictEqual(actualLinks, expectedLinks);
 }
 
+function countOccurrences(source: string, pattern: string): number {
+	return source.length - (source.replaceAll(pattern, '').length / pattern.length);
+}
+
 export async function resolveLinkForTest(link: string, uri?: URI): Promise<ResolvedLink> {
+	// A set of conditions to help with square brackets in testing, this is only needed because the
+	// resolve path function must be injected
+	if (link.startsWith('[')) {
+		return null;
+	}
+	if (countOccurrences(link, '[') !== countOccurrences(link, ']')) {
+		return null;
+	}
+	if (link.includes('[') !== link.includes(']')) {
+		return null;
+	}
 	return {
 		link,
 		uri: URI.from({ scheme: Schemas.file, path: link }),
diff --git a/src/vs/workbench/contrib/terminal/test/browser/links/terminalLinkHelpers.test.ts b/src/vs/workbench/contrib/terminal/test/browser/links/terminalLinkHelpers.test.ts
index 400cfc3f5fa68a..0700b7149834d7 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/links/terminalLinkHelpers.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/links/terminalLinkHelpers.test.ts
@@ -31,6 +31,16 @@ suite('Workbench - Terminal Link Helpers', () => {
 				end: { x: 7 + 1, y: 2 }
 			});
 		});
+		test('should give correct range for links containing multi-character emoji', () => {
+			const lines = createBufferLineArray([
+				{ text: 'A🙂 http://', width: 11 }
+			]);
+			const bufferRange = convertLinkRangeToBuffer(lines, 11, { startColumn: 0 + 1, startLineNumber: 1, endColumn: 2 + 1, endLineNumber: 1 }, 0);
+			assert.deepStrictEqual(bufferRange, {
+				start: { x: 1, y: 1 },
+				end: { x: 2, y: 1 }
+			});
+		});
 		test('should convert ranges for combining characters before the link', () => {
 			const lines = createBufferLineArray([
 				{ text: 'A🙂 http://', width: 11 },
@@ -38,8 +48,8 @@ suite('Workbench - Terminal Link Helpers', () => {
 			]);
 			const bufferRange = convertLinkRangeToBuffer(lines, 11, { startColumn: 4 + 1, startLineNumber: 1, endColumn: 19 + 1, endLineNumber: 1 }, 0);
 			assert.deepStrictEqual(bufferRange, {
-				start: { x: 4, y: 1 },
-				end: { x: 7, y: 2 }
+				start: { x: 6, y: 1 },
+				end: { x: 9, y: 2 }
 			});
 		});
 		test('should convert ranges for wide characters inside the link', () => {
@@ -64,15 +74,15 @@ suite('Workbench - Terminal Link Helpers', () => {
 				end: { x: 7 + 2, y: 2 }
 			});
 		});
-		test('should convert ranges for emoji before before and wide inside the link', () => {
+		test('should convert ranges for emoji before and wide inside the link', () => {
 			const lines = createBufferLineArray([
 				{ text: 'A🙂 http://', width: 11 },
 				{ text: 't.com/文/', width: 9 }
 			]);
 			const bufferRange = convertLinkRangeToBuffer(lines, 11, { startColumn: 4 + 1, startLineNumber: 1, endColumn: 19 + 1, endLineNumber: 1 }, 0);
 			assert.deepStrictEqual(bufferRange, {
-				start: { x: 4, y: 1 },
-				end: { x: 7 + 1, y: 2 }
+				start: { x: 6, y: 1 },
+				end: { x: 10 + 1, y: 2 }
 			});
 		});
 		test('should convert ranges for ascii characters (link starts on wrapped)', () => {
@@ -99,6 +109,38 @@ suite('Workbench - Terminal Link Helpers', () => {
 				end: { x: 7 + 1, y: 3 }
 			});
 		});
+		test('regression test #147619: 获取模板 25235168 的预览图失败', () => {
+			const lines = createBufferLineArray([
+				{ text: '获取模板 25235168 的预览图失败', width: 30 }
+			]);
+			assert.deepStrictEqual(convertLinkRangeToBuffer(lines, 30, {
+				startColumn: 1,
+				startLineNumber: 1,
+				endColumn: 5,
+				endLineNumber: 1
+			}, 0), {
+				start: { x: 1, y: 1 },
+				end: { x: 8, y: 1 }
+			});
+			assert.deepStrictEqual(convertLinkRangeToBuffer(lines, 30, {
+				startColumn: 6,
+				startLineNumber: 1,
+				endColumn: 14,
+				endLineNumber: 1
+			}, 0), {
+				start: { x: 10, y: 1 },
+				end: { x: 17, y: 1 }
+			});
+			assert.deepStrictEqual(convertLinkRangeToBuffer(lines, 30, {
+				startColumn: 15,
+				startLineNumber: 1,
+				endColumn: 21,
+				endLineNumber: 1
+			}, 0), {
+				start: { x: 19, y: 1 },
+				end: { x: 30, y: 1 }
+			});
+		});
 		test('should convert ranges for wide characters inside the link (link starts on wrapped)', () => {
 			const lines = createBufferLineArray([
 				{ text: 'AAAAAAAAAAA', width: 11 },
@@ -111,7 +153,7 @@ suite('Workbench - Terminal Link Helpers', () => {
 				end: { x: 7 + 1, y: 3 }
 			});
 		});
-		test('should convert ranges for wide characters before and inside the link', () => {
+		test('should convert ranges for wide characters before and inside the link #2', () => {
 			const lines = createBufferLineArray([
 				{ text: 'AAAAAAAAAAA', width: 11 },
 				{ text: 'A文 http://', width: 11 },
@@ -130,10 +172,10 @@ suite('Workbench - Terminal Link Helpers', () => {
 				{ text: '://t.com/f/', width: 11 }
 			]);
 			const bufferRange = convertLinkRangeToBuffer(lines, 11, { startColumn: 15, startLineNumber: 1, endColumn: 30, endLineNumber: 1 }, 0);
-			// This test ensures that the start offset is applies to the end before it's counted
+			// This test ensures that the start offset is applied to the end before it's counted
 			assert.deepStrictEqual(bufferRange, {
-				start: { x: 4 + 4, y: 2 },
-				end: { x: 7 + 4, y: 3 }
+				start: { x: 3 + 4, y: 2 },
+				end: { x: 6 + 4, y: 3 }
 			});
 		});
 		test('should convert ranges for several wide characters before and inside the link', () => {
@@ -143,11 +185,11 @@ suite('Workbench - Terminal Link Helpers', () => {
 				{ text: '://t.com/文', width: 11 },
 				{ text: '文/', width: 3 }
 			]);
-			const bufferRange = convertLinkRangeToBuffer(lines, 11, { startColumn: 15, startLineNumber: 1, endColumn: 31, endLineNumber: 1 }, 0);
+			const bufferRange = convertLinkRangeToBuffer(lines, 11, { startColumn: 14, startLineNumber: 1, endColumn: 31, endLineNumber: 1 }, 0);
 			// This test ensures that the start offset is applies to the end before it's counted
 			assert.deepStrictEqual(bufferRange, {
-				start: { x: 4 + 4, y: 2 },
-				end: { x: 2, y: 4 }
+				start: { x: 5, y: 2 },
+				end: { x: 1, y: 4 }
 			});
 		});
 	});
@@ -188,7 +230,7 @@ class TestBufferLine implements IBufferLine {
 				char += '\ude42';
 			}
 			cells.push(char);
-			if (this._text.charAt(i) === TEST_WIDE_CHAR) {
+			if (this._text.charAt(i) === TEST_WIDE_CHAR || char.charCodeAt(0) > 255) {
 				// Skip the next character as it's width is 0
 				cells.push(TEST_NULL_CHAR);
 				wideNullCellOffset++;
@@ -202,7 +244,13 @@ class TestBufferLine implements IBufferLine {
 				switch (cells[x]) {
 					case TEST_WIDE_CHAR: return 2;
 					case TEST_NULL_CHAR: return 0;
-					default: return 1;
+					default: {
+						// Naive measurement, assume anything our of ascii in tests are wide
+						if (cells[x].charCodeAt(0) > 255) {
+							return 2;
+						}
+						return 1;
+					}
 				}
 			}
 		} as any;
diff --git a/src/vs/workbench/contrib/terminal/test/browser/links/terminalLinkOpeners.test.ts b/src/vs/workbench/contrib/terminal/test/browser/links/terminalLinkOpeners.test.ts
index 09eaacad96fefe..625d358d601395 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/links/terminalLinkOpeners.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/links/terminalLinkOpeners.test.ts
@@ -27,7 +27,7 @@ import { IFileQuery, ISearchComplete, ISearchService } from 'vs/workbench/servic
 import { SearchService } from 'vs/workbench/services/search/common/searchService';
 import { ITerminalOutputMatcher } from 'vs/platform/terminal/common/xterm/terminalQuickFix';
 
-export interface ITerminalLinkActivationResult {
+interface ITerminalLinkActivationResult {
 	source: 'editor' | 'search';
 	link: string;
 	selection?: ITextEditorSelection;
@@ -123,7 +123,7 @@ suite('Workbench - TerminalLinkOpeners', () => {
 		});
 
 		test('should open single exact match against cwd when searching if it exists when command detection cwd is available', async () => {
-			localFileOpener = instantiationService.createInstance(TerminalLocalFileLinkOpener, OperatingSystem.Linux);
+			localFileOpener = instantiationService.createInstance(TerminalLocalFileLinkOpener);
 			const localFolderOpener = instantiationService.createInstance(TerminalLocalFolderInWorkspaceLinkOpener);
 			opener = instantiationService.createInstance(TestTerminalSearchLinkOpener, capabilities, Promise.resolve('/initial/cwd'), localFileOpener, localFolderOpener, OperatingSystem.Linux);
 			// Set a fake detected command starting as line 0 to establish the cwd
@@ -154,7 +154,7 @@ suite('Workbench - TerminalLinkOpeners', () => {
 		});
 
 		test('should open single exact match against cwd for paths containing a separator when searching if it exists, even when command detection isn\'t available', async () => {
-			localFileOpener = instantiationService.createInstance(TerminalLocalFileLinkOpener, OperatingSystem.Linux);
+			localFileOpener = instantiationService.createInstance(TerminalLocalFileLinkOpener);
 			const localFolderOpener = instantiationService.createInstance(TerminalLocalFolderInWorkspaceLinkOpener);
 			opener = instantiationService.createInstance(TestTerminalSearchLinkOpener, capabilities, Promise.resolve('/initial/cwd'), localFileOpener, localFolderOpener, OperatingSystem.Linux);
 			fileService.setFiles([
@@ -173,7 +173,7 @@ suite('Workbench - TerminalLinkOpeners', () => {
 		});
 
 		test('should open single exact match against any folder for paths not containing a separator when there is a single search result, even when command detection isn\'t available', async () => {
-			localFileOpener = instantiationService.createInstance(TerminalLocalFileLinkOpener, OperatingSystem.Linux);
+			localFileOpener = instantiationService.createInstance(TerminalLocalFileLinkOpener);
 			const localFolderOpener = instantiationService.createInstance(TerminalLocalFolderInWorkspaceLinkOpener);
 			opener = instantiationService.createInstance(TestTerminalSearchLinkOpener, capabilities, Promise.resolve('/initial/cwd'), localFileOpener, localFolderOpener, OperatingSystem.Linux);
 			capabilities.remove(TerminalCapability.CommandDetection);
@@ -200,7 +200,7 @@ suite('Workbench - TerminalLinkOpeners', () => {
 		});
 
 		test('should open single exact match against any folder for paths not containing a separator when there are multiple search results, even when command detection isn\'t available', async () => {
-			localFileOpener = instantiationService.createInstance(TerminalLocalFileLinkOpener, OperatingSystem.Linux);
+			localFileOpener = instantiationService.createInstance(TerminalLocalFileLinkOpener);
 			const localFolderOpener = instantiationService.createInstance(TerminalLocalFolderInWorkspaceLinkOpener);
 			opener = instantiationService.createInstance(TestTerminalSearchLinkOpener, capabilities, Promise.resolve('/initial/cwd'), localFileOpener, localFolderOpener, OperatingSystem.Linux);
 			capabilities.remove(TerminalCapability.CommandDetection);
@@ -230,7 +230,7 @@ suite('Workbench - TerminalLinkOpeners', () => {
 		});
 
 		test('should not open single exact match for paths not containing a when command detection isn\'t available', async () => {
-			localFileOpener = instantiationService.createInstance(TerminalLocalFileLinkOpener, OperatingSystem.Linux);
+			localFileOpener = instantiationService.createInstance(TerminalLocalFileLinkOpener);
 			const localFolderOpener = instantiationService.createInstance(TerminalLocalFolderInWorkspaceLinkOpener);
 			opener = instantiationService.createInstance(TestTerminalSearchLinkOpener, capabilities, Promise.resolve('/initial/cwd'), localFileOpener, localFolderOpener, OperatingSystem.Linux);
 			fileService.setFiles([
@@ -250,7 +250,7 @@ suite('Workbench - TerminalLinkOpeners', () => {
 
 		suite('macOS/Linux', () => {
 			setup(() => {
-				localFileOpener = instantiationService.createInstance(TerminalLocalFileLinkOpener, OperatingSystem.Linux);
+				localFileOpener = instantiationService.createInstance(TerminalLocalFileLinkOpener);
 				const localFolderOpener = instantiationService.createInstance(TerminalLocalFolderInWorkspaceLinkOpener);
 				opener = instantiationService.createInstance(TestTerminalSearchLinkOpener, capabilities, Promise.resolve(''), localFileOpener, localFolderOpener, OperatingSystem.Linux);
 			});
@@ -307,7 +307,7 @@ suite('Workbench - TerminalLinkOpeners', () => {
 			});
 
 			test('should extract line and column from links in a workspace containing spaces', async () => {
-				localFileOpener = instantiationService.createInstance(TerminalLocalFileLinkOpener, OperatingSystem.Linux);
+				localFileOpener = instantiationService.createInstance(TerminalLocalFileLinkOpener);
 				const localFolderOpener = instantiationService.createInstance(TerminalLocalFolderInWorkspaceLinkOpener);
 				opener = instantiationService.createInstance(TestTerminalSearchLinkOpener, capabilities, Promise.resolve('/space folder'), localFileOpener, localFolderOpener, OperatingSystem.Linux);
 				fileService.setFiles([
@@ -331,13 +331,13 @@ suite('Workbench - TerminalLinkOpeners', () => {
 
 		suite('Windows', () => {
 			setup(() => {
-				localFileOpener = instantiationService.createInstance(TerminalLocalFileLinkOpener, OperatingSystem.Windows);
+				localFileOpener = instantiationService.createInstance(TerminalLocalFileLinkOpener);
 				const localFolderOpener = instantiationService.createInstance(TerminalLocalFolderInWorkspaceLinkOpener);
 				opener = instantiationService.createInstance(TestTerminalSearchLinkOpener, capabilities, Promise.resolve(''), localFileOpener, localFolderOpener, OperatingSystem.Windows);
 			});
 
 			test('should apply the cwd to the link only when the file exists and cwdDetection is enabled', async () => {
-				localFileOpener = instantiationService.createInstance(TerminalLocalFileLinkOpener, OperatingSystem.Windows);
+				localFileOpener = instantiationService.createInstance(TerminalLocalFileLinkOpener);
 				const localFolderOpener = instantiationService.createInstance(TerminalLocalFolderInWorkspaceLinkOpener);
 				opener = instantiationService.createInstance(TestTerminalSearchLinkOpener, capabilities, Promise.resolve('c:\\Users'), localFileOpener, localFolderOpener, OperatingSystem.Windows);
 
@@ -392,7 +392,7 @@ suite('Workbench - TerminalLinkOpeners', () => {
 			});
 
 			test('should extract line and column from links in a workspace containing spaces', async () => {
-				localFileOpener = instantiationService.createInstance(TerminalLocalFileLinkOpener, OperatingSystem.Windows);
+				localFileOpener = instantiationService.createInstance(TerminalLocalFileLinkOpener);
 				const localFolderOpener = instantiationService.createInstance(TerminalLocalFolderInWorkspaceLinkOpener);
 				opener = instantiationService.createInstance(TestTerminalSearchLinkOpener, capabilities, Promise.resolve('c:/space folder'), localFileOpener, localFolderOpener, OperatingSystem.Windows);
 				fileService.setFiles([
diff --git a/src/vs/workbench/contrib/terminal/test/browser/links/terminalLinkParsing.test.ts b/src/vs/workbench/contrib/terminal/test/browser/links/terminalLinkParsing.test.ts
new file mode 100644
index 00000000000000..9316c6d49f7084
--- /dev/null
+++ b/src/vs/workbench/contrib/terminal/test/browser/links/terminalLinkParsing.test.ts
@@ -0,0 +1,74 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { getLinkSuffix, removeLinkSuffix } from 'vs/workbench/contrib/terminal/browser/links/terminalLinkParsing';
+
+interface ITestLink {
+	link: string;
+	suffix: string | undefined;
+	hasRow: boolean;
+	hasCol: boolean;
+}
+
+const testRow = 339;
+const testCol = 12;
+const testLinks: ITestLink[] = [
+	{ link: 'foo', suffix: undefined, hasRow: false, hasCol: false },
+	{ link: 'foo:339', suffix: ':339', hasRow: true, hasCol: false },
+	{ link: 'foo:339:12', suffix: ':339:12', hasRow: true, hasCol: true },
+	{ link: 'foo 339', suffix: ' 339', hasRow: true, hasCol: false },
+	{ link: 'foo 339:12', suffix: ' 339:12', hasRow: true, hasCol: true },
+	{ link: '"foo",339', suffix: '",339', hasRow: true, hasCol: false },
+	{ link: '"foo",339:12', suffix: '",339:12', hasRow: true, hasCol: true },
+	{ link: '"foo", line 339', suffix: '", line 339', hasRow: true, hasCol: false },
+	{ link: '"foo", line 339, col 12', suffix: '", line 339, col 12', hasRow: true, hasCol: true },
+	{ link: '"foo", line 339, column 12', suffix: '", line 339, column 12', hasRow: true, hasCol: true },
+	{ link: '"foo":line 339', suffix: '":line 339', hasRow: true, hasCol: false },
+	{ link: '"foo":line 339, col 12', suffix: '":line 339, col 12', hasRow: true, hasCol: true },
+	{ link: '"foo":line 339, column 12', suffix: '":line 339, column 12', hasRow: true, hasCol: true },
+	{ link: '"foo": line 339', suffix: '": line 339', hasRow: true, hasCol: false },
+	{ link: '"foo": line 339, col 12', suffix: '": line 339, col 12', hasRow: true, hasCol: true },
+	{ link: '"foo": line 339, column 12', suffix: '": line 339, column 12', hasRow: true, hasCol: true },
+	{ link: '"foo" on line 339', suffix: '" on line 339', hasRow: true, hasCol: false },
+	{ link: '"foo" on line 339, col 12', suffix: '" on line 339, col 12', hasRow: true, hasCol: true },
+	{ link: '"foo" on line 339, column 12', suffix: '" on line 339, column 12', hasRow: true, hasCol: true },
+	{ link: 'foo(339)', suffix: '(339)', hasRow: true, hasCol: false },
+	{ link: 'foo(339,12)', suffix: '(339,12)', hasRow: true, hasCol: true },
+	{ link: 'foo(339, 12)', suffix: '(339, 12)', hasRow: true, hasCol: true },
+	{ link: 'foo (339)', suffix: ' (339)', hasRow: true, hasCol: false },
+	{ link: 'foo (339,12)', suffix: ' (339,12)', hasRow: true, hasCol: true },
+	{ link: 'foo (339, 12)', suffix: ' (339, 12)', hasRow: true, hasCol: true },
+];
+
+suite('TerminalLinkParsing', () => {
+	suite('removeLinkSuffix', () => {
+		for (const testLink of testLinks) {
+			test('`' + testLink.link + '`', () => {
+				deepStrictEqual(
+					removeLinkSuffix(testLink.link),
+					testLink.suffix === undefined ? testLink.link : testLink.link.replace(testLink.suffix, '')
+				);
+			});
+		}
+	});
+	suite('getLinkSuffix', () => {
+		for (const testLink of testLinks) {
+			test('`' + testLink.link + '`', () => {
+				deepStrictEqual(
+					getLinkSuffix(testLink.link),
+					testLink.suffix === undefined ? null : {
+						row: testLink.hasRow ? testRow : undefined,
+						col: testLink.hasCol ? testCol : undefined,
+						suffix: {
+							index: testLink.link.length - testLink.suffix.length,
+							text: testLink.suffix
+						}
+					} as ReturnType<typeof getLinkSuffix>
+				);
+			});
+		}
+	});
+});
diff --git a/src/vs/workbench/contrib/terminal/test/browser/links/terminalLocalLinkDetector.test.ts b/src/vs/workbench/contrib/terminal/test/browser/links/terminalLocalLinkDetector.test.ts
index 203ae923f2f5b7..f146805e908ef6 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/links/terminalLocalLinkDetector.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/links/terminalLocalLinkDetector.test.ts
@@ -13,6 +13,8 @@ import { TerminalLocalLinkDetector } from 'vs/workbench/contrib/terminal/browser
 import { TerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/terminalCapabilityStore';
 import { assertLinkHelper, resolveLinkForTest } from 'vs/workbench/contrib/terminal/test/browser/links/linkTestUtils';
 import { Terminal } from 'xterm';
+import { timeout } from 'vs/base/common/async';
+import { strictEqual } from 'assert';
 
 const unixLinks = [
 	'/foo',
@@ -21,6 +23,9 @@ const unixLinks = [
 	'./$foo',
 	'../foo',
 	'/foo/bar',
+	'/foo/[bar]',
+	'/foo/[bar].baz',
+	'/foo/[bar]/baz',
 	'/foo/bar+more',
 	'foo/bar',
 	'foo/bar+more',
@@ -42,7 +47,12 @@ const windowsLinks = [
 	'c:\\foo/bar\\baz',
 	'foo/bar',
 	'foo/bar',
+	'foo/[bar]',
+	'foo/[bar].baz',
+	'foo/[bar]/baz',
 	'foo\\bar',
+	'foo\\[bar].baz',
+	'foo\\[bar]\\baz',
 	'foo\\bar+more',
 ];
 
@@ -90,7 +100,11 @@ suite('Workbench - TerminalLocalLinkDetector', () => {
 		text: string,
 		expected: (Pick<ITerminalSimpleLink, 'text'> & { range: [number, number][] })[]
 	) {
-		await assertLinkHelper(text, expected, detector, type);
+		const race = await Promise.race([
+			assertLinkHelper(text, expected, detector, type).then(() => 'success'),
+			timeout(2).then(() => 'timeout')
+		]);
+		strictEqual(race, 'success', `Awaiting link assertion for "${text}" timed out`);
 	}
 
 	setup(() => {
@@ -123,8 +137,8 @@ suite('Workbench - TerminalLocalLinkDetector', () => {
 			suite(`Link: ${baseLink}`, () => {
 				for (let i = 0; i < supportedLinkFormats.length; i++) {
 					const linkFormat = supportedLinkFormats[i];
-					test(`Format: ${linkFormat.urlFormat}`, async () => {
-						const formattedLink = format(linkFormat.urlFormat, baseLink, linkFormat.line, linkFormat.column);
+					const formattedLink = format(linkFormat.urlFormat, baseLink, linkFormat.line, linkFormat.column);
+					test(`should detect in "${formattedLink}"`, async () => {
 						await assertLink(TerminalBuiltinLinkType.LocalFile, formattedLink, [{ text: formattedLink, range: [[1, 1], [formattedLink.length, 1]] }]);
 						await assertLink(TerminalBuiltinLinkType.LocalFile, ` ${formattedLink} `, [{ text: formattedLink, range: [[2, 1], [formattedLink.length + 1, 1]] }]);
 						await assertLink(TerminalBuiltinLinkType.LocalFile, `(${formattedLink})`, [{ text: formattedLink, range: [[2, 1], [formattedLink.length + 1, 1]] }]);
@@ -153,8 +167,8 @@ suite('Workbench - TerminalLocalLinkDetector', () => {
 			suite(`Link "${baseLink}"`, () => {
 				for (let i = 0; i < supportedLinkFormats.length; i++) {
 					const linkFormat = supportedLinkFormats[i];
-					test(`Format: ${linkFormat.urlFormat}`, async () => {
-						const formattedLink = format(linkFormat.urlFormat, baseLink, linkFormat.line, linkFormat.column);
+					const formattedLink = format(linkFormat.urlFormat, baseLink, linkFormat.line, linkFormat.column);
+					test(`should detect in "${formattedLink}"`, async () => {
 						await assertLink(TerminalBuiltinLinkType.LocalFile, formattedLink, [{ text: formattedLink, range: [[1, 1], [formattedLink.length, 1]] }]);
 						await assertLink(TerminalBuiltinLinkType.LocalFile, ` ${formattedLink} `, [{ text: formattedLink, range: [[2, 1], [formattedLink.length + 1, 1]] }]);
 						await assertLink(TerminalBuiltinLinkType.LocalFile, `(${formattedLink})`, [{ text: formattedLink, range: [[2, 1], [formattedLink.length + 1, 1]] }]);
diff --git a/src/vs/workbench/contrib/terminal/test/browser/links/terminalWordLinkDetector.test.ts b/src/vs/workbench/contrib/terminal/test/browser/links/terminalWordLinkDetector.test.ts
index 0a7dd0d1364e6b..92aba1648e029e 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/links/terminalWordLinkDetector.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/links/terminalWordLinkDetector.test.ts
@@ -6,9 +6,11 @@
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
+import { IProductService } from 'vs/platform/product/common/productService';
 import { ITerminalSimpleLink, TerminalBuiltinLinkType } from 'vs/workbench/contrib/terminal/browser/links/links';
 import { TerminalWordLinkDetector } from 'vs/workbench/contrib/terminal/browser/links/terminalWordLinkDetector';
 import { assertLinkHelper } from 'vs/workbench/contrib/terminal/test/browser/links/linkTestUtils';
+import { TestProductService } from 'vs/workbench/test/common/workbenchTestServices';
 import { Terminal } from 'xterm';
 
 suite('Workbench - TerminalWordLinkDetector', () => {
@@ -21,6 +23,7 @@ suite('Workbench - TerminalWordLinkDetector', () => {
 		configurationService = new TestConfigurationService();
 
 		instantiationService.stub(IConfigurationService, configurationService);
+		instantiationService.set(IProductService, TestProductService);
 
 		xterm = new Terminal({ allowProposedApi: true, cols: 80, rows: 30 });
 		detector = instantiationService.createInstance(TerminalWordLinkDetector, xterm);
diff --git a/src/vs/workbench/contrib/terminal/test/browser/quickFixAddon.test.ts b/src/vs/workbench/contrib/terminal/test/browser/quickFixAddon.test.ts
index c7890721857ffe..93c3cce4446a2a 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/quickFixAddon.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/quickFixAddon.test.ts
@@ -6,14 +6,12 @@
 import { strictEqual } from 'assert';
 import { IAction } from 'vs/base/common/actions';
 import { isWindows } from 'vs/base/common/platform';
-import { OpenerService } from 'vs/editor/browser/services/openerService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { ContextMenuService } from 'vs/platform/contextview/browser/contextMenuService';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { ITerminalCommand, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
 import { CommandDetectionCapability } from 'vs/platform/terminal/common/capabilities/commandDetectionCapability';
 import { TerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/terminalCapabilityStore';
@@ -26,12 +24,19 @@ import { ITerminalContributionService } from 'vs/workbench/contrib/terminal/comm
 import { ITerminalQuickFixService } from 'vs/workbench/contrib/terminal/common/terminal';
 import { Emitter } from 'vs/base/common/event';
 import { ITerminalOutputMatcher } from 'vs/platform/terminal/common/xterm/terminalQuickFix';
+import { LabelService } from 'vs/workbench/services/label/common/labelService';
+import { ILabelService } from 'vs/platform/label/common/label';
+import { OpenerService } from 'vs/editor/browser/services/openerService';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { IStorageService } from 'vs/platform/storage/common/storage';
+import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
 
 suite('QuickFixAddon', () => {
 	let quickFixAddon: TerminalQuickFixAddon;
 	let terminalInstance: Pick<ITerminalInstance, 'freePortKillProcess'>;
 	let commandDetection: CommandDetectionCapability;
 	let openerService: OpenerService;
+	let labelService: LabelService;
 	let terminal: Terminal;
 	setup(() => {
 		const instantiationService = new TestInstantiationService();
@@ -40,19 +45,21 @@ suite('QuickFixAddon', () => {
 			cols: 80,
 			rows: 30
 		});
+		instantiationService.stub(IStorageService, new TestStorageService());
 		instantiationService.stub(ITerminalContributionService, { quickFixes: [] } as Partial<ITerminalContributionService>);
-		instantiationService.stub(ITerminalQuickFixService, { onDidRegisterProvider: new Emitter().event, onDidUnregisterProvider: new Emitter().event } as Partial<ITerminalQuickFixService>);
+		instantiationService.stub(ITerminalQuickFixService, { onDidRegisterProvider: new Emitter().event, onDidUnregisterProvider: new Emitter().event, onDidRegisterCommandSelector: new Emitter().event } as Partial<ITerminalQuickFixService>);
 		instantiationService.stub(IConfigurationService, new TestConfigurationService());
+		instantiationService.stub(ILabelService, {} as Partial<ILabelService>);
 		const capabilities = new TerminalCapabilityStore();
 		instantiationService.stub(ILogService, new NullLogService());
 		commandDetection = instantiationService.createInstance(CommandDetectionCapability, terminal);
 		capabilities.add(TerminalCapability.CommandDetection, commandDetection);
 		instantiationService.stub(IContextMenuService, instantiationService.createInstance(ContextMenuService));
-		openerService = instantiationService.createInstance(OpenerService);
-		instantiationService.stub(IOpenerService, openerService);
+		instantiationService.stub(IOpenerService, {} as Partial<IOpenerService>);
 		terminalInstance = {
 			async freePortKillProcess(port: string): Promise<void> { }
 		} as Pick<ITerminalInstance, 'freePortKillProcess'>;
+
 		quickFixAddon = instantiationService.createInstance(TerminalQuickFixAddon, [], capabilities);
 		terminal.loadAddon(quickFixAddon);
 	});
@@ -79,23 +86,23 @@ suite('QuickFixAddon', () => {
 			});
 			suite('returns undefined when', () => {
 				test('output does not match', async () => {
-					strictEqual(await (getQuickFixesForCommand([], terminal, createCommand(command, `invalid output`, GitSimilarOutputRegex, exitCode), expectedMap, openerService)), undefined);
+					strictEqual(await (getQuickFixesForCommand([], terminal, createCommand(command, `invalid output`, GitSimilarOutputRegex, exitCode), expectedMap, openerService, labelService)), undefined);
 				});
 				test('command does not match', async () => {
-					strictEqual(await (getQuickFixesForCommand([], terminal, createCommand(`gt sttatus`, output, GitSimilarOutputRegex, exitCode), expectedMap, openerService)), undefined);
+					strictEqual(await (getQuickFixesForCommand([], terminal, createCommand(`gt sttatus`, output, GitSimilarOutputRegex, exitCode), expectedMap, openerService, labelService)), undefined);
 				});
 			});
 			suite('returns undefined when', () => {
 				test('expected unix exit code', async () => {
-					assertMatchOptions((await getQuickFixesForCommand([], terminal, createCommand(command, output, GitSimilarOutputRegex, exitCode), expectedMap, openerService))?.fixes, actions);
+					assertMatchOptions((await getQuickFixesForCommand([], terminal, createCommand(command, output, GitSimilarOutputRegex, exitCode), expectedMap, openerService, labelService)), actions);
 				});
 				test('matching exit status', async () => {
-					assertMatchOptions((await getQuickFixesForCommand([], terminal, createCommand(command, output, GitSimilarOutputRegex, 2), expectedMap, openerService))?.fixes, actions);
+					assertMatchOptions((await getQuickFixesForCommand([], terminal, createCommand(command, output, GitSimilarOutputRegex, 2), expectedMap, openerService, labelService)), actions);
 				});
 			});
 			suite('returns match', () => {
 				test('returns match', async () => {
-					assertMatchOptions((await getQuickFixesForCommand([], terminal, createCommand(command, output, GitSimilarOutputRegex), expectedMap, openerService))?.fixes, actions);
+					assertMatchOptions((await getQuickFixesForCommand([], terminal, createCommand(command, output, GitSimilarOutputRegex), expectedMap, openerService, labelService)), actions);
 				});
 
 				test('returns multiple match', async () => {
@@ -117,14 +124,14 @@ suite('QuickFixAddon', () => {
 						tooltip: 'Run: git push',
 						command: 'git push'
 					}];
-					assertMatchOptions((await getQuickFixesForCommand([], terminal, createCommand('git pu', output, GitSimilarOutputRegex), expectedMap, openerService))?.fixes, actions);
+					assertMatchOptions((await getQuickFixesForCommand([], terminal, createCommand('git pu', output, GitSimilarOutputRegex), expectedMap, openerService, labelService)), actions);
 				});
 				test('passes any arguments through', async () => {
 					output = `git: 'checkoutt' is not a git command. See 'git --help'.
 
 				The most similar commands are
 						checkout`;
-					assertMatchOptions((await getQuickFixesForCommand([], terminal, createCommand('git checkoutt .', output, GitSimilarOutputRegex), expectedMap, openerService))?.fixes, [{
+					assertMatchOptions((await getQuickFixesForCommand([], terminal, createCommand('git checkoutt .', output, GitSimilarOutputRegex), expectedMap, openerService, labelService)), [{
 						id: 'Git Similar',
 						enabled: true,
 						label: 'Run: git checkout .',
@@ -153,18 +160,18 @@ suite('QuickFixAddon', () => {
 			});
 			suite('returns undefined when', () => {
 				test('output does not match', async () => {
-					strictEqual((await getQuickFixesForCommand([], terminal, createCommand(command, `invalid output`, GitTwoDashesRegex, exitCode), expectedMap, openerService)), undefined);
+					strictEqual((await getQuickFixesForCommand([], terminal, createCommand(command, `invalid output`, GitTwoDashesRegex, exitCode), expectedMap, openerService, labelService)), undefined);
 				});
 				test('command does not match', async () => {
-					strictEqual((await getQuickFixesForCommand([], terminal, createCommand(`gt sttatus`, output, GitTwoDashesRegex, exitCode), expectedMap, openerService)), undefined);
+					strictEqual((await getQuickFixesForCommand([], terminal, createCommand(`gt sttatus`, output, GitTwoDashesRegex, exitCode), expectedMap, openerService, labelService)), undefined);
 				});
 			});
 			suite('returns undefined when', () => {
 				test('expected unix exit code', async () => {
-					assertMatchOptions((await getQuickFixesForCommand([], terminal, createCommand(command, output, GitTwoDashesRegex, exitCode), expectedMap, openerService))?.fixes, actions);
+					assertMatchOptions((await getQuickFixesForCommand([], terminal, createCommand(command, output, GitTwoDashesRegex, exitCode), expectedMap, openerService, labelService)), actions);
 				});
 				test('matching exit status', async () => {
-					assertMatchOptions((await getQuickFixesForCommand([], terminal, createCommand(command, output, GitTwoDashesRegex, 2), expectedMap, openerService))?.fixes, actions);
+					assertMatchOptions((await getQuickFixesForCommand([], terminal, createCommand(command, output, GitTwoDashesRegex, 2), expectedMap, openerService, labelService)), actions);
 				});
 			});
 		});
@@ -187,7 +194,7 @@ suite('QuickFixAddon', () => {
 			error Command failed with exit code 1.
 			info Visit https://yarnpkg.com/en/docs/cli/run for documentation about this command.`;
 				const actionOptions = [{
-					id: 'terminal.freePort',
+					id: 'Free Port',
 					label: 'Free port 3000',
 					run: true,
 					tooltip: 'Free port 3000',
@@ -200,11 +207,11 @@ suite('QuickFixAddon', () => {
 				});
 				suite('returns undefined when', () => {
 					test('output does not match', async () => {
-						strictEqual((await getQuickFixesForCommand([], terminal, createCommand(portCommand, `invalid output`, FreePortOutputRegex), expectedMap, openerService))?.fixes, undefined);
+						strictEqual((await getQuickFixesForCommand([], terminal, createCommand(portCommand, `invalid output`, FreePortOutputRegex), expectedMap, openerService, labelService)), undefined);
 					});
 				});
 				test('returns actions', async () => {
-					assertMatchOptions((await getQuickFixesForCommand([], terminal, createCommand(portCommand, output, FreePortOutputRegex), expectedMap, openerService))?.fixes, actionOptions);
+					assertMatchOptions((await getQuickFixesForCommand([], terminal, createCommand(portCommand, output, FreePortOutputRegex), expectedMap, openerService, labelService)), actionOptions);
 				});
 			});
 		}
@@ -231,18 +238,18 @@ suite('QuickFixAddon', () => {
 			});
 			suite('returns undefined when', () => {
 				test('output does not match', async () => {
-					strictEqual((await getQuickFixesForCommand([], terminal, createCommand(command, `invalid output`, GitPushOutputRegex, exitCode), expectedMap, openerService)), undefined);
+					strictEqual((await getQuickFixesForCommand([], terminal, createCommand(command, `invalid output`, GitPushOutputRegex, exitCode), expectedMap, openerService, labelService)), undefined);
 				});
 				test('command does not match', async () => {
-					strictEqual((await getQuickFixesForCommand([], terminal, createCommand(`git status`, output, GitPushOutputRegex, exitCode), expectedMap, openerService)), undefined);
+					strictEqual((await getQuickFixesForCommand([], terminal, createCommand(`git status`, output, GitPushOutputRegex, exitCode), expectedMap, openerService, labelService)), undefined);
 				});
 			});
 			suite('returns actions when', () => {
 				test('expected unix exit code', async () => {
-					assertMatchOptions((await getQuickFixesForCommand([], terminal, createCommand(command, output, GitPushOutputRegex, exitCode), expectedMap, openerService))?.fixes, actions);
+					assertMatchOptions((await getQuickFixesForCommand([], terminal, createCommand(command, output, GitPushOutputRegex, exitCode), expectedMap, openerService, labelService)), actions);
 				});
 				test('matching exit status', async () => {
-					assertMatchOptions((await getQuickFixesForCommand([], terminal, createCommand(command, output, GitPushOutputRegex, 2), expectedMap, openerService))?.fixes, actions);
+					assertMatchOptions((await getQuickFixesForCommand([], terminal, createCommand(command, output, GitPushOutputRegex, 2), expectedMap, openerService, labelService)), actions);
 				});
 			});
 		});
@@ -272,18 +279,18 @@ suite('QuickFixAddon', () => {
 			});
 			suite('returns undefined when', () => {
 				test('output does not match', async () => {
-					strictEqual((await getQuickFixesForCommand([], terminal, createCommand(command, `invalid output`, GitCreatePrOutputRegex, exitCode), expectedMap, openerService)), undefined);
+					strictEqual((await getQuickFixesForCommand([], terminal, createCommand(command, `invalid output`, GitCreatePrOutputRegex, exitCode), expectedMap, openerService, labelService)), undefined);
 				});
 				test('command does not match', async () => {
-					strictEqual((await getQuickFixesForCommand([], terminal, createCommand(`git status`, output, GitCreatePrOutputRegex, exitCode), expectedMap, openerService)), undefined);
+					strictEqual((await getQuickFixesForCommand([], terminal, createCommand(`git status`, output, GitCreatePrOutputRegex, exitCode), expectedMap, openerService, labelService)), undefined);
 				});
 				test('failure exit status', async () => {
-					strictEqual((await getQuickFixesForCommand([], terminal, createCommand(command, output, GitCreatePrOutputRegex, 2), expectedMap, openerService)), undefined);
+					strictEqual((await getQuickFixesForCommand([], terminal, createCommand(command, output, GitCreatePrOutputRegex, 2), expectedMap, openerService, labelService)), undefined);
 				});
 			});
 			suite('returns actions when', () => {
 				test('expected unix exit code', async () => {
-					assertMatchOptions((await getQuickFixesForCommand([], terminal, createCommand(command, output, GitCreatePrOutputRegex, exitCode), expectedMap, openerService))?.fixes, actions);
+					assertMatchOptions((await getQuickFixesForCommand([], terminal, createCommand(command, output, GitCreatePrOutputRegex, exitCode), expectedMap, openerService, labelService)), actions);
 				});
 			});
 		});
@@ -311,18 +318,18 @@ suite('QuickFixAddon', () => {
 		});
 		suite('returns undefined when', () => {
 			test('output does not match', async () => {
-				strictEqual((await getQuickFixesForCommand([], terminal, createCommand(command, `invalid output`, GitPushOutputRegex, exitCode), expectedMap, openerService)), undefined);
+				strictEqual((await getQuickFixesForCommand([], terminal, createCommand(command, `invalid output`, GitPushOutputRegex, exitCode), expectedMap, openerService, labelService)), undefined);
 			});
 			test('command does not match', async () => {
-				strictEqual((await getQuickFixesForCommand([], terminal, createCommand(`git status`, output, GitPushOutputRegex, exitCode), expectedMap, openerService)), undefined);
+				strictEqual((await getQuickFixesForCommand([], terminal, createCommand(`git status`, output, GitPushOutputRegex, exitCode), expectedMap, openerService, labelService)), undefined);
 			});
 		});
 		suite('returns actions when', () => {
 			test('expected unix exit code', async () => {
-				assertMatchOptions((await getQuickFixesForCommand([], terminal, createCommand(command, output, GitPushOutputRegex, exitCode), expectedMap, openerService))?.fixes, actions);
+				assertMatchOptions((await getQuickFixesForCommand([], terminal, createCommand(command, output, GitPushOutputRegex, exitCode), expectedMap, openerService, labelService)), actions);
 			});
 			test('matching exit status', async () => {
-				assertMatchOptions((await getQuickFixesForCommand([], terminal, createCommand(command, output, GitPushOutputRegex, 2), expectedMap, openerService))?.fixes, actions);
+				assertMatchOptions((await getQuickFixesForCommand([], terminal, createCommand(command, output, GitPushOutputRegex, 2), expectedMap, openerService, labelService)), actions);
 			});
 		});
 	});
diff --git a/src/vs/workbench/contrib/terminal/test/browser/terminalConfigHelper.test.ts b/src/vs/workbench/contrib/terminal/test/browser/terminalConfigHelper.test.ts
index 6295ccb292293c..799c2c74ba807c 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/terminalConfigHelper.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/terminalConfigHelper.test.ts
@@ -34,7 +34,7 @@ suite('Workbench - TerminalConfigHelper', function () {
 		});
 		const configHelper = new TestTerminalConfigHelper(configurationService, null!, null!, null!, null!);
 		configHelper.panelContainer = fixture;
-		assert.strictEqual(configHelper.getFont().fontFamily, 'bar', 'terminal.integrated.fontFamily should be selected over editor.fontFamily');
+		assert.strictEqual(configHelper.getFont().fontFamily, 'bar, monospace', 'terminal.integrated.fontFamily should be selected over editor.fontFamily');
 	});
 
 	test('TerminalConfigHelper - getFont fontFamily (Linux Fedora)', () => {
@@ -66,7 +66,7 @@ suite('Workbench - TerminalConfigHelper', function () {
 		});
 		const configHelper = new TestTerminalConfigHelper(configurationService, null!, null!, null!, null!);
 		configHelper.panelContainer = fixture;
-		assert.strictEqual(configHelper.getFont().fontFamily, 'foo', 'editor.fontFamily should be the fallback when terminal.integrated.fontFamily not set');
+		assert.strictEqual(configHelper.getFont().fontFamily, 'foo, monospace', 'editor.fontFamily should be the fallback when terminal.integrated.fontFamily not set');
 	});
 
 	test('TerminalConfigHelper - getFont fontSize 10', () => {
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 1169424ac82f1c..6bff48ba6fb037 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/terminalInstance.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/terminalInstance.test.ts
@@ -15,11 +15,11 @@ import { TestConfigurationService } from 'vs/platform/configuration/test/common/
 import { TerminalConfigHelper } from 'vs/workbench/contrib/terminal/browser/terminalConfigHelper';
 import { ITerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminal';
 import { ProcessState } from 'vs/workbench/contrib/terminal/common/terminal';
-import { basename } from 'vs/base/common/path';
 import { URI } from 'vs/base/common/uri';
 import { TerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/terminalCapabilityStore';
 import { TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
 import { Schemas } from 'vs/base/common/network';
+import { TestFileService } from 'vs/workbench/test/browser/workbenchTestServices';
 
 export function createInstance(partial?: Partial<ITerminalInstance>): Pick<ITerminalInstance, 'shellLaunchConfig' | 'userHome' | 'cwd' | 'initialCwd' | 'processName' | 'sequence' | 'workspaceFolder' | 'staticTitle' | 'capabilities' | 'title' | 'description'> {
 	const capabilities = new TerminalCapabilityStore();
@@ -193,7 +193,7 @@ suite('Workbench - TerminalInstance', () => {
 		test('should resolve to "" when the template variables are empty', () => {
 			configurationService = new TestConfigurationService({ terminal: { integrated: { tabs: { separator: ' - ', title: '', description: '' } } } });
 			configHelper = new TerminalConfigHelper(configurationService, null!, null!, null!, null!);
-			terminalLabelComputer = new TerminalLabelComputer(configHelper, createInstance({ capabilities, processName: '' }), mockContextService);
+			terminalLabelComputer = new TerminalLabelComputer(configHelper, createInstance({ capabilities, processName: '' }), new TestFileService(), mockContextService);
 			terminalLabelComputer.refreshLabel();
 			// TODO:
 			// terminalLabelComputer.onLabelChanged(e => {
@@ -206,28 +206,15 @@ suite('Workbench - TerminalInstance', () => {
 		test('should resolve cwd', () => {
 			configurationService = new TestConfigurationService({ terminal: { integrated: { tabs: { separator: ' - ', title: '${cwd}', description: '${cwd}' } } } });
 			configHelper = new TerminalConfigHelper(configurationService, null!, null!, null!, null!);
-			terminalLabelComputer = new TerminalLabelComputer(configHelper, createInstance({ capabilities, cwd: ROOT_1 }), mockContextService);
+			terminalLabelComputer = new TerminalLabelComputer(configHelper, createInstance({ capabilities, cwd: ROOT_1 }), new TestFileService(), mockContextService);
 			terminalLabelComputer.refreshLabel();
 			strictEqual(terminalLabelComputer.title, ROOT_1);
 			strictEqual(terminalLabelComputer.description, ROOT_1);
 		});
-		test('should resolve cwdFolder in a single root workspace if cwd differs from root', () => {
-			configurationService = new TestConfigurationService({ terminal: { integrated: { tabs: { separator: ' - ', title: '${process}', description: '${cwdFolder}' } } } });
-			configHelper = new TerminalConfigHelper(configurationService, null!, null!, null!, null!);
-			terminalLabelComputer = new TerminalLabelComputer(configHelper, createInstance({ capabilities, cwd: ROOT_2, processName: 'zsh' }), mockContextService);
-			terminalLabelComputer.refreshLabel();
-			if (isWindows) {
-				strictEqual(terminalLabelComputer.title, 'zsh');
-				strictEqual(terminalLabelComputer.description, '');
-			} else {
-				strictEqual(terminalLabelComputer.title, 'zsh');
-				strictEqual(terminalLabelComputer.description, basename(ROOT_2));
-			}
-		});
 		test('should resolve workspaceFolder', () => {
 			configurationService = new TestConfigurationService({ terminal: { integrated: { tabs: { separator: ' - ', title: '${workspaceFolder}', description: '${workspaceFolder}' } } } });
 			configHelper = new TerminalConfigHelper(configurationService, null!, null!, null!, null!);
-			terminalLabelComputer = new TerminalLabelComputer(configHelper, createInstance({ capabilities, processName: 'zsh', workspaceFolder: { uri: URI.from({ scheme: Schemas.file, path: 'folder' }) } as IWorkspaceFolder }), mockContextService);
+			terminalLabelComputer = new TerminalLabelComputer(configHelper, createInstance({ capabilities, processName: 'zsh', workspaceFolder: { uri: URI.from({ scheme: Schemas.file, path: 'folder' }) } as IWorkspaceFolder }), new TestFileService(), mockContextService);
 			terminalLabelComputer.refreshLabel();
 			strictEqual(terminalLabelComputer.title, 'folder');
 			strictEqual(terminalLabelComputer.description, 'folder');
@@ -235,7 +222,7 @@ suite('Workbench - TerminalInstance', () => {
 		test('should resolve local', () => {
 			configurationService = new TestConfigurationService({ terminal: { integrated: { tabs: { separator: ' - ', title: '${local}', description: '${local}' } } } });
 			configHelper = new TerminalConfigHelper(configurationService, null!, null!, null!, null!);
-			terminalLabelComputer = new TerminalLabelComputer(configHelper, createInstance({ capabilities, processName: 'zsh', shellLaunchConfig: { type: 'Local' } }), mockContextService);
+			terminalLabelComputer = new TerminalLabelComputer(configHelper, createInstance({ capabilities, processName: 'zsh', shellLaunchConfig: { type: 'Local' } }), new TestFileService(), mockContextService);
 			terminalLabelComputer.refreshLabel();
 			strictEqual(terminalLabelComputer.title, 'Local');
 			strictEqual(terminalLabelComputer.description, 'Local');
@@ -243,7 +230,7 @@ suite('Workbench - TerminalInstance', () => {
 		test('should resolve process', () => {
 			configurationService = new TestConfigurationService({ terminal: { integrated: { tabs: { separator: ' - ', title: '${process}', description: '${process}' } } } });
 			configHelper = new TerminalConfigHelper(configurationService, null!, null!, null!, null!);
-			terminalLabelComputer = new TerminalLabelComputer(configHelper, createInstance({ capabilities, processName: 'zsh' }), mockContextService);
+			terminalLabelComputer = new TerminalLabelComputer(configHelper, createInstance({ capabilities, processName: 'zsh' }), new TestFileService(), mockContextService);
 			terminalLabelComputer.refreshLabel();
 			strictEqual(terminalLabelComputer.title, 'zsh');
 			strictEqual(terminalLabelComputer.description, 'zsh');
@@ -251,7 +238,7 @@ suite('Workbench - TerminalInstance', () => {
 		test('should resolve sequence', () => {
 			configurationService = new TestConfigurationService({ terminal: { integrated: { tabs: { separator: ' - ', title: '${sequence}', description: '${sequence}' } } } });
 			configHelper = new TerminalConfigHelper(configurationService, null!, null!, null!, null!);
-			terminalLabelComputer = new TerminalLabelComputer(configHelper, createInstance({ capabilities, sequence: 'sequence' }), mockContextService);
+			terminalLabelComputer = new TerminalLabelComputer(configHelper, createInstance({ capabilities, sequence: 'sequence' }), new TestFileService(), mockContextService);
 			terminalLabelComputer.refreshLabel();
 			strictEqual(terminalLabelComputer.title, 'sequence');
 			strictEqual(terminalLabelComputer.description, 'sequence');
@@ -259,7 +246,7 @@ suite('Workbench - TerminalInstance', () => {
 		test('should resolve task', () => {
 			configurationService = new TestConfigurationService({ terminal: { integrated: { tabs: { separator: ' ~ ', title: '${process}${separator}${task}', description: '${task}' } } } });
 			configHelper = new TerminalConfigHelper(configurationService, null!, null!, null!, null!);
-			terminalLabelComputer = new TerminalLabelComputer(configHelper, createInstance({ capabilities, processName: 'zsh', shellLaunchConfig: { type: 'Task' } }), mockContextService);
+			terminalLabelComputer = new TerminalLabelComputer(configHelper, createInstance({ capabilities, processName: 'zsh', shellLaunchConfig: { type: 'Task' } }), new TestFileService(), mockContextService);
 			terminalLabelComputer.refreshLabel();
 			strictEqual(terminalLabelComputer.title, 'zsh ~ Task');
 			strictEqual(terminalLabelComputer.description, 'Task');
@@ -267,7 +254,7 @@ suite('Workbench - TerminalInstance', () => {
 		test('should resolve separator', () => {
 			configurationService = new TestConfigurationService({ terminal: { integrated: { tabs: { separator: ' ~ ', title: '${separator}', description: '${separator}' } } } });
 			configHelper = new TerminalConfigHelper(configurationService, null!, null!, null!, null!);
-			terminalLabelComputer = new TerminalLabelComputer(configHelper, createInstance({ capabilities, processName: 'zsh', shellLaunchConfig: { type: 'Task' } }), mockContextService);
+			terminalLabelComputer = new TerminalLabelComputer(configHelper, createInstance({ capabilities, processName: 'zsh', shellLaunchConfig: { type: 'Task' } }), new TestFileService(), mockContextService);
 			terminalLabelComputer.refreshLabel();
 			strictEqual(terminalLabelComputer.title, 'zsh');
 			strictEqual(terminalLabelComputer.description, '');
@@ -275,7 +262,7 @@ suite('Workbench - TerminalInstance', () => {
 		test('should always return static title when specified', () => {
 			configurationService = new TestConfigurationService({ terminal: { integrated: { tabs: { separator: ' ~ ', title: '${process}', description: '${workspaceFolder}' } } } });
 			configHelper = new TerminalConfigHelper(configurationService, null!, null!, null!, null!);
-			terminalLabelComputer = new TerminalLabelComputer(configHelper, createInstance({ capabilities, processName: 'process', workspaceFolder: { uri: URI.from({ scheme: Schemas.file, path: 'folder' }) } as IWorkspaceFolder, staticTitle: 'my-title' }), mockContextService);
+			terminalLabelComputer = new TerminalLabelComputer(configHelper, createInstance({ capabilities, processName: 'process', workspaceFolder: { uri: URI.from({ scheme: Schemas.file, path: 'folder' }) } as IWorkspaceFolder, staticTitle: 'my-title' }), new TestFileService(), mockContextService);
 			terminalLabelComputer.refreshLabel();
 			strictEqual(terminalLabelComputer.title, 'my-title');
 			strictEqual(terminalLabelComputer.description, 'folder');
@@ -283,7 +270,7 @@ suite('Workbench - TerminalInstance', () => {
 		test('should provide cwdFolder for all cwds only when in multi-root', () => {
 			configurationService = new TestConfigurationService({ terminal: { integrated: { tabs: { separator: ' ~ ', title: '${process}${separator}${cwdFolder}', description: '${cwdFolder}' } } } });
 			configHelper = new TerminalConfigHelper(configurationService, null!, null!, null!, null!);
-			terminalLabelComputer = new TerminalLabelComputer(configHelper, createInstance({ capabilities, processName: 'process', workspaceFolder: { uri: URI.from({ scheme: Schemas.file, path: ROOT_1 }) } as IWorkspaceFolder, cwd: ROOT_1 }), mockContextService);
+			terminalLabelComputer = new TerminalLabelComputer(configHelper, createInstance({ capabilities, processName: 'process', workspaceFolder: { uri: URI.from({ scheme: Schemas.file, path: ROOT_1 }) } as IWorkspaceFolder, cwd: ROOT_1 }), new TestFileService(), mockContextService);
 			terminalLabelComputer.refreshLabel();
 			// single-root, cwd is same as root
 			strictEqual(terminalLabelComputer.title, 'process');
@@ -291,7 +278,7 @@ suite('Workbench - TerminalInstance', () => {
 			// multi-root
 			configurationService = new TestConfigurationService({ terminal: { integrated: { tabs: { separator: ' ~ ', title: '${process}${separator}${cwdFolder}', description: '${cwdFolder}' } } } });
 			configHelper = new TerminalConfigHelper(configurationService, null!, null!, null!, null!);
-			terminalLabelComputer = new TerminalLabelComputer(configHelper, createInstance({ capabilities, processName: 'process', workspaceFolder: { uri: URI.from({ scheme: Schemas.file, path: ROOT_1 }) } as IWorkspaceFolder, cwd: ROOT_2 }), mockMultiRootContextService);
+			terminalLabelComputer = new TerminalLabelComputer(configHelper, createInstance({ capabilities, processName: 'process', workspaceFolder: { uri: URI.from({ scheme: Schemas.file, path: ROOT_1 }) } as IWorkspaceFolder, cwd: ROOT_2 }), new TestFileService(), mockMultiRootContextService);
 			terminalLabelComputer.refreshLabel();
 			if (isWindows) {
 				strictEqual(terminalLabelComputer.title, 'process');
@@ -304,12 +291,12 @@ suite('Workbench - TerminalInstance', () => {
 		test('should hide cwdFolder in single folder workspaces when cwd matches the workspace\'s default cwd even when slashes differ', async () => {
 			configurationService = new TestConfigurationService({ terminal: { integrated: { tabs: { separator: ' ~ ', title: '${process}${separator}${cwdFolder}', description: '${cwdFolder}' } } } });
 			configHelper = new TerminalConfigHelper(configurationService, null!, null!, null!, null!);
-			terminalLabelComputer = new TerminalLabelComputer(configHelper, createInstance({ capabilities, processName: 'process', workspaceFolder: { uri: URI.from({ scheme: Schemas.file, path: ROOT_1 }) } as IWorkspaceFolder, cwd: ROOT_1 }), mockContextService);
+			terminalLabelComputer = new TerminalLabelComputer(configHelper, createInstance({ capabilities, processName: 'process', workspaceFolder: { uri: URI.from({ scheme: Schemas.file, path: ROOT_1 }) } as IWorkspaceFolder, cwd: ROOT_1 }), new TestFileService(), mockContextService);
 			terminalLabelComputer.refreshLabel();
 			strictEqual(terminalLabelComputer.title, 'process');
 			strictEqual(terminalLabelComputer.description, '');
 			if (!isWindows) {
-				terminalLabelComputer = new TerminalLabelComputer(configHelper, createInstance({ capabilities, processName: 'process', workspaceFolder: { uri: URI.from({ scheme: Schemas.file, path: ROOT_1 }) } as IWorkspaceFolder, cwd: ROOT_2 }), mockContextService);
+				terminalLabelComputer = new TerminalLabelComputer(configHelper, createInstance({ capabilities, processName: 'process', workspaceFolder: { uri: URI.from({ scheme: Schemas.file, path: ROOT_1 }) } as IWorkspaceFolder, cwd: ROOT_2 }), new TestFileService(), mockContextService);
 				terminalLabelComputer.refreshLabel();
 				strictEqual(terminalLabelComputer.title, 'process ~ root2');
 				strictEqual(terminalLabelComputer.description, 'root2');
diff --git a/src/vs/workbench/contrib/terminal/test/browser/xterm/shellIntegrationAddon.test.ts b/src/vs/workbench/contrib/terminal/test/browser/xterm/shellIntegrationAddon.test.ts
index 905b968d753dd5..e09ba4568215ae 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/xterm/shellIntegrationAddon.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/xterm/shellIntegrationAddon.test.ts
@@ -7,7 +7,7 @@ import { Terminal } from 'xterm';
 import { strictEqual, deepStrictEqual, deepEqual } from 'assert';
 import { timeout } from 'vs/base/common/async';
 import * as sinon from 'sinon';
-import { parseKeyValueAssignment, parseMarkSequence, ShellIntegrationAddon } from 'vs/platform/terminal/common/xterm/shellIntegrationAddon';
+import { parseKeyValueAssignment, parseMarkSequence, deserializeMessage, ShellIntegrationAddon } from 'vs/platform/terminal/common/xterm/shellIntegrationAddon';
 import { ITerminalCapabilityStore, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { ILogService, NullLogService } from 'vs/platform/log/common/log';
@@ -257,6 +257,41 @@ suite('ShellIntegrationAddon', () => {
 	});
 });
 
+suite('deserializeMessage', () => {
+	// A single literal backslash, in order to avoid confusion about whether we are escaping test data or testing escapes.
+	const Backslash = '\\' as const;
+	const Newline = '\n' as const;
+	const Semicolon = ';' as const;
+
+	type TestCase = [title: string, input: string, expected: string];
+	const cases: TestCase[] = [
+		['empty', '', ''],
+		['basic', 'value', 'value'],
+		['space', 'some thing', 'some thing'],
+		['escaped backslash', `${Backslash}${Backslash}`, Backslash],
+		['non-initial escaped backslash', `foo${Backslash}${Backslash}`, `foo${Backslash}`],
+		['two escaped backslashes', `${Backslash}${Backslash}${Backslash}${Backslash}`, `${Backslash}${Backslash}`],
+		['escaped backslash amidst text', `Hello${Backslash}${Backslash}there`, `Hello${Backslash}there`],
+		['backslash escaped literally and as hex', `${Backslash}${Backslash} is same as ${Backslash}x5c`, `${Backslash} is same as ${Backslash}`],
+		['escaped semicolon', `${Backslash}x3b`, Semicolon],
+		['non-initial escaped semicolon', `foo${Backslash}x3b`, `foo${Semicolon}`],
+		['escaped semicolon (upper hex)', `${Backslash}x3B`, Semicolon],
+		['escaped backslash followed by literal "x3b" is not a semicolon', `${Backslash}${Backslash}x3b`, `${Backslash}x3b`],
+		['non-initial escaped backslash followed by literal "x3b" is not a semicolon', `foo${Backslash}${Backslash}x3b`, `foo${Backslash}x3b`],
+		['escaped backslash followed by escaped semicolon', `${Backslash}${Backslash}${Backslash}x3b`, `${Backslash}${Semicolon}`],
+		['escaped semicolon amidst text', `some${Backslash}x3bthing`, `some${Semicolon}thing`],
+		['escaped newline', `${Backslash}x0a`, Newline],
+		['non-initial escaped newline', `foo${Backslash}x0a`, `foo${Newline}`],
+		['escaped newline (upper hex)', `${Backslash}x0A`, Newline],
+		['escaped backslash followed by literal "x0a" is not a newline', `${Backslash}${Backslash}x0a`, `${Backslash}x0a`],
+		['non-initial escaped backslash followed by literal "x0a" is not a newline', `foo${Backslash}${Backslash}x0a`, `foo${Backslash}x0a`],
+	];
+
+	cases.forEach(([title, input, expected]) => {
+		test(title, () => strictEqual(deserializeMessage(input), expected));
+	});
+});
+
 test('parseKeyValueAssignment', () => {
 	type TestCase = [title: string, input: string, expected: [key: string, value: string | undefined]];
 	const cases: TestCase[] = [
diff --git a/src/vs/workbench/contrib/testing/browser/media/testing.css b/src/vs/workbench/contrib/testing/browser/media/testing.css
index 2b6cbe6dbb2199..8dbee6df13edc3 100644
--- a/src/vs/workbench/contrib/testing/browser/media/testing.css
+++ b/src/vs/workbench/contrib/testing/browser/media/testing.css
@@ -3,6 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+/** -- icons */
+
+.monaco-workbench .codicon-testing-error-icon {
+	color: var(--vscode-testing-iconErrored);
+}
+
+.monaco-workbench .codicon-testing-failed-icon {
+	color: var(--vscode-testing-iconFailed);
+}
+
+.monaco-workbench .codicon-testing-passed-icon {
+	color: var(--vscode-testing-iconPassed);
+}
+
+.monaco-workbench .codicon-testing-queued-icon {
+	color: var(--vscode-testing-iconQueued);
+}
+
+.monaco-workbench .codicon-testing-skipped-icon {
+	color: var(--vscode-testing-iconSkipped);
+}
+
+.monaco-workbench .codicon-testing-unset-icon {
+	color: var(--vscode-testing-iconUnset);
+}
+
 /** -- explorer */
 .test-explorer {
 	display: flex;
@@ -176,6 +202,12 @@
 	align-items: center;
 }
 
+.testing-filter-action-item > .monaco-action-bar .testing-filter-button.checked {
+	border-color: var(--vscode-inputOption-activeBorder);
+	color: var(--vscode-inputOption-activeForeground);
+	background-color: var(--vscode-inputOption-activeBackground);
+}
+
 .testing-filter-action-bar .testing-filter-action-item {
 	max-width: none;
 }
@@ -205,6 +237,7 @@
 
 .monaco-editor .testing-run-glyph {
 	cursor: pointer;
+	color: var(--vscode-testingColorRunAction);
 }
 
 .testing-diff-title-widget {
@@ -233,3 +266,22 @@
 	font-size: .9em;
 	white-space: pre;
 }
+
+.testing-diff-lens-widget {
+	color: var(--vscode-editorCodeLens-foreground);
+}
+
+.test-message-inline-content-s0 {
+	color: var(--vscode-testing-message-error-decorationForeground) !important;
+}
+
+.test-message-inline-content-s1 {
+	color: var(--vscode-testing-message-info-decorationForeground) !important;
+}
+
+.monaco-editor .testing-inline-message-severity-0 {
+	color: var(--vscode-testing-message-error-decorationForeground) !important;
+}
+.monaco-editor .testing-inline-message-severity-1 {
+	color: var(--vscode-testing-message-info-decorationForeground) !important;
+}
diff --git a/src/vs/workbench/contrib/testing/browser/testingDecorations.ts b/src/vs/workbench/contrib/testing/browser/testingDecorations.ts
index 6135cccdb5f5ec..a82977091e7c43 100644
--- a/src/vs/workbench/contrib/testing/browser/testingDecorations.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingDecorations.ts
@@ -20,7 +20,7 @@ import { generateUuid } from 'vs/base/common/uuid';
 import { ContentWidgetPositionPreference, ICodeEditor, IContentWidgetPosition, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { editorCodeLensForeground, overviewRulerError, overviewRulerInfo } from 'vs/editor/common/core/editorColorRegistry';
+import { overviewRulerError, overviewRulerInfo } from 'vs/editor/common/core/editorColorRegistry';
 import { IRange, Range } from 'vs/editor/common/core/range';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
 import { IModelDeltaDecoration, ITextModel, OverviewRulerLane, TrackedRangeStickiness } from 'vs/editor/common/model';
@@ -33,12 +33,11 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { registerThemingParticipant, themeColorFromId, ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { themeColorFromId, ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 import { BREAKPOINT_EDITOR_CONTRIBUTION_ID, IBreakpointEditorContribution } from 'vs/workbench/contrib/debug/common/debug';
 import { getTestItemContextOverlay } from 'vs/workbench/contrib/testing/browser/explorerProjections/testItemContextOverlay';
 import { testingRunAllIcon, testingRunIcon, testingStatesToIcons } from 'vs/workbench/contrib/testing/browser/icons';
-import { testMessageSeverityColors } from 'vs/workbench/contrib/testing/browser/theme';
 import { DefaultGutterClickAction, getTestingConfiguration, TestingConfigKeys } from 'vs/workbench/contrib/testing/common/configuration';
 import { labelForTestInState, Testing } from 'vs/workbench/contrib/testing/common/constants';
 import { TestId } from 'vs/workbench/contrib/testing/common/testId';
@@ -997,14 +996,3 @@ class TestMessageDecoration implements ITestDecoration {
 		return false;
 	}
 }
-
-registerThemingParticipant((theme, collector) => {
-	const codeLensForeground = theme.getColor(editorCodeLensForeground);
-	if (codeLensForeground) {
-		collector.addRule(`.testing-diff-lens-widget { color: ${codeLensForeground}; }`);
-	}
-
-	for (const [severity, { decorationForeground }] of Object.entries(testMessageSeverityColors)) {
-		collector.addRule(`.test-message-inline-content-s${severity} { color: ${theme.getColor(decorationForeground)} !important }`);
-	}
-});
diff --git a/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts b/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
index d8b979e968e9fb..b7a1afd59e64e4 100644
--- a/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
@@ -1027,7 +1027,7 @@ class TestExplorerActionRunner extends ActionRunner {
 }
 
 const getLabelForTestTreeElement = (element: TestItemTreeElement) => {
-	let label = labelForTestInState(element.label, element.state);
+	let label = labelForTestInState(element.description || element.label, element.state);
 
 	if (element instanceof TestItemTreeElement) {
 		if (element.duration !== undefined) {
diff --git a/src/vs/workbench/contrib/testing/browser/testingProgressUiService.ts b/src/vs/workbench/contrib/testing/browser/testingProgressUiService.ts
index e8f1733a68f5b3..a0c83db68c6a0a 100644
--- a/src/vs/workbench/contrib/testing/browser/testingProgressUiService.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingProgressUiService.ts
@@ -94,7 +94,7 @@ export class TestingProgressUiService extends Disposable implements ITestingProg
 	private readonly testViewProg = this._register(new MutableDisposable<UnmanagedProgress>());
 	private readonly updateCountsEmitter = new Emitter<CountSummary>();
 	private readonly updateTextEmitter = new Emitter<string>();
-	private lastRunSoFar = 0;
+	private lastProgress = 0;
 
 	public readonly onCountChange = this.updateCountsEmitter.event;
 	public readonly onTextChange = this.updateTextEmitter.event;
@@ -122,7 +122,7 @@ export class TestingProgressUiService extends Disposable implements ITestingProg
 
 			this.windowProg.clear();
 			this.testViewProg.clear();
-			this.lastRunSoFar = 0;
+			this.lastProgress = 0;
 			return;
 		}
 
@@ -133,7 +133,7 @@ export class TestingProgressUiService extends Disposable implements ITestingProg
 			});
 			this.testViewProg.value = this.instantiaionService.createInstance(UnmanagedProgress, {
 				location: Testing.ViewletId,
-				total: 100,
+				total: 1000,
 			});
 		}
 
@@ -143,8 +143,10 @@ export class TestingProgressUiService extends Disposable implements ITestingProg
 		const message = getTestProgressText(true, collected);
 		this.updateTextEmitter.fire(message);
 		this.windowProg.value.report({ message });
-		this.testViewProg.value!.report({ increment: collected.runSoFar - this.lastRunSoFar, total: collected.totalWillBeRun });
-		this.lastRunSoFar = collected.runSoFar;
+		const nextProgress = collected.runSoFar / collected.totalWillBeRun;
+		console.log({ increment: nextProgress - this.lastProgress, total: 1 });
+		this.testViewProg.value!.report({ increment: (nextProgress - this.lastProgress) * 1000, total: 1 });
+		this.lastProgress = nextProgress;
 	}
 }
 
diff --git a/src/vs/workbench/contrib/testing/browser/theme.ts b/src/vs/workbench/contrib/testing/browser/theme.ts
index 2a8d95b8665e1a..1233144d7fa0f0 100644
--- a/src/vs/workbench/contrib/testing/browser/theme.ts
+++ b/src/vs/workbench/contrib/testing/browser/theme.ts
@@ -5,9 +5,7 @@
 
 import { Color, RGBA } from 'vs/base/common/color';
 import { localize } from 'vs/nls';
-import { contrastBorder, editorErrorForeground, editorForeground, inputActiveOptionBackground, inputActiveOptionBorder, inputActiveOptionForeground, registerColor, transparent } from 'vs/platform/theme/common/colorRegistry';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { ACTIVITY_BAR_BADGE_BACKGROUND } from 'vs/workbench/common/theme';
+import { contrastBorder, editorErrorForeground, editorForeground, registerColor, transparent } from 'vs/platform/theme/common/colorRegistry';
 import { TestMessageType, TestResultState } from 'vs/workbench/contrib/testing/common/testTypes';
 
 export const testingColorIconFailed = registerColor('testing.iconFailed', {
@@ -113,31 +111,3 @@ export const testStatesToIconColors: { [K in TestResultState]?: string } = {
 	[TestResultState.Unset]: testingColorIconUnset,
 	[TestResultState.Skipped]: testingColorIconSkipped,
 };
-
-
-registerThemingParticipant((theme, collector) => {
-	//#region test states
-	for (const [state, { marginBackground }] of Object.entries(testMessageSeverityColors)) {
-		collector.addRule(`.monaco-editor .testing-inline-message-severity-${state} {
-			background: ${theme.getColor(marginBackground)};
-		}`);
-	}
-	//#endregion test states
-
-	//#region active buttons
-	const inputActiveOptionBorderColor = theme.getColor(inputActiveOptionBorder);
-	if (inputActiveOptionBorderColor) {
-		collector.addRule(`.testing-filter-action-item > .monaco-action-bar .testing-filter-button.checked { border-color: ${inputActiveOptionBorderColor}; }`);
-	}
-	const inputActiveOptionForegroundColor = theme.getColor(inputActiveOptionForeground);
-	if (inputActiveOptionForegroundColor) {
-		collector.addRule(`.testing-filter-action-item > .monaco-action-bar .testing-filter-button.checked { color: ${inputActiveOptionForegroundColor}; }`);
-	}
-	const inputActiveOptionBackgroundColor = theme.getColor(inputActiveOptionBackground);
-	if (inputActiveOptionBackgroundColor) {
-		collector.addRule(`.testing-filter-action-item > .monaco-action-bar .testing-filter-button.checked { background-color: ${inputActiveOptionBackgroundColor}; }`);
-	}
-	const badgeColor = theme.getColor(ACTIVITY_BAR_BADGE_BACKGROUND);
-	collector.addRule(`.monaco-workbench .part > .title > .title-actions .action-label.codicon-testing-autorun::after { background-color: ${badgeColor}; }`);
-	//#endregion
-});
diff --git a/src/vs/workbench/contrib/testing/common/testItemCollection.ts b/src/vs/workbench/contrib/testing/common/testItemCollection.ts
index 244f4d42fd4b71..b33d27342ec78d 100644
--- a/src/vs/workbench/contrib/testing/common/testItemCollection.ts
+++ b/src/vs/workbench/contrib/testing/common/testItemCollection.ts
@@ -673,7 +673,7 @@ export const createTestItemChildren = <T extends ITestItemLike>(api: ITestItemAp
 
 			for (const item of items) {
 				if (!(item instanceof checkCtor)) {
-					throw new InvalidTestItemError(item.id);
+					throw new InvalidTestItemError((item as ITestItemLike).id);
 				}
 
 				const itemController = getApi(item).controllerId;
@@ -705,7 +705,7 @@ export const createTestItemChildren = <T extends ITestItemLike>(api: ITestItemAp
 		/** @inheritdoc */
 		add(item: T) {
 			if (!(item instanceof checkCtor)) {
-				throw new InvalidTestItemError(item.id);
+				throw new InvalidTestItemError((item as ITestItemLike).id);
 			}
 
 			mapped.set(item.id, item);
diff --git a/src/vs/workbench/contrib/themes/browser/themes.contribution.ts b/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
index 0cf8cd7b52fba5..096813400a88bd 100644
--- a/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
+++ b/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
@@ -47,6 +47,7 @@ class MarketplaceThemesPicker {
 	private readonly _marketplaceThemes: ThemeItem[] = [];
 
 	private _searchOngoing: boolean = false;
+	private _searchError: string | undefined = undefined;
 	private readonly _onDidChange = new Emitter<void>();
 
 	private _tokenSource: CancellationTokenSource | undefined;
@@ -76,10 +77,6 @@ class MarketplaceThemesPicker {
 		return this._marketplaceThemes;
 	}
 
-	public get isSearching(): boolean {
-		return this._searchOngoing;
-	}
-
 	public get onDidChange() {
 		return this._onDidChange.event;
 	}
@@ -140,6 +137,7 @@ class MarketplaceThemesPicker {
 		} catch (e) {
 			if (!isCancellationError(e)) {
 				this.logService.error(`Error while searching for themes:`, e);
+				this._searchError = 'message' in e ? e.message : String(e);
 			}
 		} finally {
 			this._searchOngoing = false;
@@ -168,6 +166,8 @@ class MarketplaceThemesPicker {
 					const success = await this.installExtension(themeItem.galleryExtension);
 					if (success) {
 						selectTheme(themeItem.theme, true);
+					} else {
+						selectTheme(currentTheme, true);
 					}
 				}
 			});
@@ -182,7 +182,11 @@ class MarketplaceThemesPicker {
 					}
 				}
 			});
-			quickpick.onDidChangeActive(themes => selectTheme(themes[0]?.theme, false));
+			quickpick.onDidChangeActive(themes => {
+				if (result === undefined) {
+					selectTheme(themes[0]?.theme, false);
+				}
+			});
 
 			quickpick.onDidHide(() => {
 				if (result === undefined) {
@@ -203,8 +207,10 @@ class MarketplaceThemesPicker {
 
 			this.onDidChange(() => {
 				let items = this.themes;
-				if (this.isSearching) {
+				if (this._searchOngoing) {
 					items = items.concat({ label: '$(sync~spin) Searching for themes...', id: undefined, alwaysShow: true });
+				} else if (items.length === 0 && this._searchError) {
+					items = [{ label: `$(error) ${localize('search.error', 'Error while searching for themes: {0}', this._searchError)}`, id: undefined, alwaysShow: true }];
 				}
 				const activeItemId = quickpick.activeItems[0]?.id;
 				const newActiveItem = activeItemId ? items.find(i => isItem(i) && i.id === activeItemId) : undefined;
diff --git a/src/vs/workbench/contrib/themes/browser/themes.test.contribution.ts b/src/vs/workbench/contrib/themes/browser/themes.test.contribution.ts
index 8560807503eb7e..e79f9d92b6946d 100644
--- a/src/vs/workbench/contrib/themes/browser/themes.test.contribution.ts
+++ b/src/vs/workbench/contrib/themes/browser/themes.test.contribution.ts
@@ -11,7 +11,7 @@ import { IWorkbenchThemeService, IWorkbenchColorTheme } from 'vs/workbench/servi
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { EditorResourceAccessor } from 'vs/workbench/common/editor';
 import { ITextMateService } from 'vs/workbench/services/textMate/browser/textMate';
-import type { IGrammar, StackElement } from 'vscode-textmate';
+import type { IGrammar, StateStack } from 'vscode-textmate';
 import { TokenizationRegistry } from 'vs/editor/common/languages';
 import { TokenMetadata } from 'vs/editor/common/encodedTokenAttributes';
 import { ThemeRule, findMatchingThemeRule } from 'vs/workbench/services/textMate/common/TMHelper';
@@ -98,7 +98,7 @@ class Snapper {
 
 	private _themedTokenize(grammar: IGrammar, lines: string[]): IThemedToken[] {
 		const colorMap = TokenizationRegistry.getColorMap();
-		let state: StackElement | null = null;
+		let state: StateStack | null = null;
 		const result: IThemedToken[] = [];
 		let resultLen = 0;
 		for (let i = 0, len = lines.length; i < len; i++) {
@@ -127,7 +127,7 @@ class Snapper {
 	}
 
 	private _tokenize(grammar: IGrammar, lines: string[]): IToken[] {
-		let state: StackElement | null = null;
+		let state: StateStack | null = null;
 		const result: IToken[] = [];
 		let resultLen = 0;
 		for (let i = 0, len = lines.length; i < len; i++) {
diff --git a/src/vs/workbench/contrib/themes/test/electron-browser/colorRegistry.releaseTest.ts b/src/vs/workbench/contrib/themes/test/electron-browser/colorRegistry.releaseTest.ts
index 2c9535a63f835c..4b2a57e960e6cf 100644
--- a/src/vs/workbench/contrib/themes/test/electron-browser/colorRegistry.releaseTest.ts
+++ b/src/vs/workbench/contrib/themes/test/electron-browser/colorRegistry.releaseTest.ts
@@ -38,7 +38,9 @@ suite('Color Registry', function () {
 		// avoid importing the TestEnvironmentService as it brings in a duplicate registration of the file editor input factory.
 		const environmentService = new class extends mock<INativeEnvironmentService>() { override args = { _: [] }; };
 
-		const reqContext = await new RequestService(new TestConfigurationService(), environmentService, new NullLogService()).request({ url: 'https://raw.githubusercontent.com/microsoft/vscode-docs/vnext/api/references/theme-color.md' }, CancellationToken.None);
+		const docUrl = 'https://raw.githubusercontent.com/microsoft/vscode-docs/main/api/references/theme-color.md';
+
+		const reqContext = await new RequestService(new TestConfigurationService(), environmentService, new NullLogService()).request({ url: docUrl }, CancellationToken.None);
 		const content = (await asTextOrError(reqContext))!;
 
 		const expression = /-\s*\`([\w\.]+)\`: (.*)/g;
@@ -86,13 +88,21 @@ suite('Color Registry', function () {
 				assert.fail(`Color ${colorId} found in doc but marked experimental. Please remove from experimental list.`);
 			}
 		}
-
+		const superfluousKeys = Object.keys(colorsInDoc);
 		const undocumentedKeys = Object.keys(missing).map(k => `\`${k}\`: ${missing[k]}`);
-		assert.deepStrictEqual(undocumentedKeys, [], 'Undocumented colors ids');
 
-		const superfluousKeys = Object.keys(colorsInDoc);
-		assert.deepStrictEqual(superfluousKeys, [], 'Colors ids in doc that do not exist');
 
+		let errorText = '';
+		if (undocumentedKeys.length > 0) {
+			errorText += `\n\nAdd the following colors:\n\n${undocumentedKeys.join('\n')}\n`;
+		}
+		if (superfluousKeys.length > 0) {
+			errorText += `\n\Remove the following colors:\n\n${superfluousKeys.join('\n')}\n`;
+		}
+
+		if (errorText.length > 0) {
+			assert.fail(`\n\nOpen https://github.dev/microsoft/vscode-docs/blob/vnext/api/references/theme-color.md#50${errorText}`);
+		}
 	});
 });
 
diff --git a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
index bd10681e6422e1..76e64f11d93751 100644
--- a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
+++ b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
@@ -53,6 +53,7 @@ import { IHoverDelegate, IHoverDelegateOptions } from 'vs/base/browser/ui/iconLa
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { IStorageService, IStorageValueChangeEvent, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
+import { AriaRole } from 'vs/base/browser/ui/aria/aria';
 
 const ItemHeight = 22;
 
@@ -914,7 +915,7 @@ export class TimelinePane extends ViewPane {
 					}
 					return element.accessibilityInformation ? element.accessibilityInformation.label : localize('timeline.aria.item', "{0}: {1}", element.relativeTimeFullWord ?? '', element.label);
 				},
-				getRole(element: TreeElement): string {
+				getRole(element: TreeElement): AriaRole {
 					if (isLoadMoreCommand(element)) {
 						return 'treeitem';
 					}
@@ -1179,6 +1180,8 @@ class TimelineTreeRenderer implements ITreeRenderer<TreeElement, FuzzyScore, Tim
 			template.icon.className = `custom-view-tree-node-item-icon ${ThemeIcon.asClassName(item.themeIcon)}`;
 			if (item.themeIcon.color) {
 				template.icon.style.color = theme.getColor(item.themeIcon.color.id)?.toString() ?? '';
+			} else {
+				template.icon.style.color = '';
 			}
 			template.icon.style.backgroundImage = '';
 		} else {
diff --git a/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts b/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts
index 8abc69ac80e508..7f32d5fe36d684 100644
--- a/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts
+++ b/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts
@@ -28,8 +28,9 @@ import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editor
 import { ACTIVE_GROUP, IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { getTelemetryLevel, supportsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IConfigurationChangeEvent, IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 
 export class ReleaseNotesManager {
 
@@ -37,6 +38,7 @@ export class ReleaseNotesManager {
 
 	private _currentReleaseNotes: WebviewInput | undefined = undefined;
 	private _lastText: string | undefined;
+	private disposables = new DisposableStore();
 
 	public constructor(
 		@IEnvironmentService private readonly _environmentService: IEnvironmentService,
@@ -60,6 +62,9 @@ export class ReleaseNotesManager {
 				this._currentReleaseNotes.webview.html = html;
 			}
 		});
+
+		_configurationService.onDidChangeConfiguration(this.onDidChangeConfiguration, this, this.disposables);
+		_webviewWorkbenchService.onDidChangeActiveWebviewEditor(this.onDidChangeActiveWebviewEditor, this, this.disposables);
 	}
 
 	public async show(version: string): Promise<boolean> {
@@ -81,7 +86,8 @@ export class ReleaseNotesManager {
 						enableFindWidget: true,
 					},
 					contentOptions: {
-						localResourceRoots: []
+						localResourceRoots: [],
+						allowScripts: true
 					},
 					extension: undefined
 				},
@@ -90,7 +96,18 @@ export class ReleaseNotesManager {
 				{ group: ACTIVE_GROUP, preserveFocus: false });
 
 			this._currentReleaseNotes.webview.onDidClickLink(uri => this.onDidClickLink(URI.parse(uri)));
-			this._currentReleaseNotes.onWillDispose(() => { this._currentReleaseNotes = undefined; });
+
+			const disposables = new DisposableStore();
+			disposables.add(this._currentReleaseNotes.webview.onMessage(e => {
+				if (e.message.type === 'showReleaseNotes') {
+					this._configurationService.updateValue('update.showReleaseNotes', e.message.value);
+				}
+			}));
+
+			disposables.add(this._currentReleaseNotes.onWillDispose(() => {
+				disposables.dispose();
+				this._currentReleaseNotes = undefined;
+			}));
 
 			this._currentReleaseNotes.webview.html = html;
 		}
@@ -206,18 +223,80 @@ export class ReleaseNotesManager {
 		const content = await renderMarkdownDocument(text, this._extensionService, this._languageService, false);
 		const colorMap = TokenizationRegistry.getColorMap();
 		const css = colorMap ? generateTokensCSSForColorMap(colorMap) : '';
+		const showReleaseNotes = Boolean(this._configurationService.getValue<boolean>('update.showReleaseNotes'));
+
 		return `<!DOCTYPE html>
 		<html>
 			<head>
 				<base href="https://code.visualstudio.com/raw/">
 				<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
-				<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src https: data:; media-src https:; style-src 'nonce-${nonce}' https://code.visualstudio.com;">
+				<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src https: data:; media-src https:; style-src 'nonce-${nonce}' https://code.visualstudio.com; script-src 'nonce-${nonce}';">
 				<style nonce="${nonce}">
 					${DEFAULT_MARKDOWN_STYLES}
 					${css}
+					header { display: flex; align-items: center; padding-top: 1em; }
 				</style>
 			</head>
-			<body>${content}</body>
+			<body>
+				${content}
+				<script nonce="${nonce}">
+					const vscode = acquireVsCodeApi();
+					const container = document.createElement('p');
+					container.style.display = 'flex';
+					container.style.alignItems = 'center';
+
+					const input = document.createElement('input');
+					input.type = 'checkbox';
+					input.id = 'showReleaseNotes';
+					input.checked = ${showReleaseNotes};
+					container.appendChild(input);
+
+					const label = document.createElement('label');
+					label.htmlFor = 'showReleaseNotes';
+					label.textContent = '${nls.localize('showOnUpdate', "Show release notes after an update")}';
+					container.appendChild(label);
+
+					const beforeElement = document.querySelector("body > h1")?.nextElementSibling;
+					console.log(beforeElement);
+
+					if (beforeElement) {
+						document.body.insertBefore(container, beforeElement);
+					} else {
+						document.body.appendChild(container);
+					}
+
+					window.addEventListener('message', event => {
+						if (event.data.type === 'showReleaseNotes') {
+							input.checked = event.data.value;
+						}
+					});
+
+					input.addEventListener('change', event => {
+						vscode.postMessage({ type: 'showReleaseNotes', value: input.checked }, '*');
+					});
+				</script>
+			</body>
 		</html>`;
 	}
+
+	private onDidChangeConfiguration(e: IConfigurationChangeEvent): void {
+		if (e.affectsConfiguration('update.showReleaseNotes')) {
+			this.updateWebview();
+		}
+	}
+
+	private onDidChangeActiveWebviewEditor(input: WebviewInput | undefined): void {
+		if (input && input === this._currentReleaseNotes) {
+			this.updateWebview();
+		}
+	}
+
+	private updateWebview() {
+		if (this._currentReleaseNotes) {
+			this._currentReleaseNotes.webview.postMessage({
+				type: 'showReleaseNotes',
+				value: this._configurationService.getValue<boolean>('update.showReleaseNotes')
+			});
+		}
+	}
 }
diff --git a/src/vs/workbench/contrib/update/browser/update.contribution.ts b/src/vs/workbench/contrib/update/browser/update.contribution.ts
index b978dce39af31d..1f131713ae4174 100644
--- a/src/vs/workbench/contrib/update/browser/update.contribution.ts
+++ b/src/vs/workbench/contrib/update/browser/update.contribution.ts
@@ -9,7 +9,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { Categories } from 'vs/platform/action/common/actionCommonCategories';
 import { MenuId, registerAction2, Action2 } from 'vs/platform/actions/common/actions';
-import { ProductContribution, UpdateContribution, CONTEXT_UPDATE_STATE, SwitchProductQualityContribution, RELEASE_NOTES_URL, showReleaseNotesInEditor } from 'vs/workbench/contrib/update/browser/update';
+import { ProductContribution, UpdateContribution, CONTEXT_UPDATE_STATE, SwitchProductQualityContribution, RELEASE_NOTES_URL, showReleaseNotesInEditor, DOWNLOAD_URL } from 'vs/workbench/contrib/update/browser/update';
 import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
 import product from 'vs/platform/product/common/product';
 import { IUpdateService, StateType } from 'vs/platform/update/common/update';
@@ -22,6 +22,7 @@ import { IsWebContext } from 'vs/platform/contextkey/common/contextkeys';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { IProductService } from 'vs/platform/product/common/productService';
 import { URI } from 'vs/base/common/uri';
+import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 
 const workbench = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
 
@@ -38,7 +39,7 @@ export class ShowCurrentReleaseNotesAction extends Action2 {
 			id: ShowCurrentReleaseNotesActionId,
 			title: {
 				value: localize('showReleaseNotes', "Show Release Notes"),
-				mnemonicTitle: localize('mshowReleaseNotes', "Show &&Release Notes"),
+				mnemonicTitle: localize({ key: 'mshowReleaseNotes', comment: ['&& denotes a mnemonic'] }, "Show &&Release Notes"),
 				original: 'Show Release Notes'
 			},
 			category: { value: product.nameShort, original: product.nameShort },
@@ -143,7 +144,6 @@ class RestartToUpdateAction extends Action2 {
 class DownloadAction extends Action2 {
 
 	static readonly ID = 'workbench.action.download';
-	static readonly AVAILABLE = !!product.downloadUrl;
 
 	constructor() {
 		super({
@@ -152,11 +152,11 @@ class DownloadAction extends Action2 {
 				value: localize('openDownloadPage', "Download {0}", product.nameLong),
 				original: `Download ${product.downloadUrl}`
 			},
-			precondition: IsWebContext, // Only show when running in a web browser
+			precondition: ContextKeyExpr.and(IsWebContext, DOWNLOAD_URL), // Only show when running in a web browser and a download url is available
 			f1: true,
 			menu: [{
 				id: MenuId.StatusBarWindowIndicatorMenu,
-				when: IsWebContext
+				when: ContextKeyExpr.and(IsWebContext, DOWNLOAD_URL)
 			}]
 		});
 	}
diff --git a/src/vs/workbench/contrib/update/browser/update.ts b/src/vs/workbench/contrib/update/browser/update.ts
index f2144c2a6db9f2..97d5e45e37d62c 100644
--- a/src/vs/workbench/contrib/update/browser/update.ts
+++ b/src/vs/workbench/contrib/update/browser/update.ts
@@ -32,6 +32,7 @@ import { Event } from 'vs/base/common/event';
 
 export const CONTEXT_UPDATE_STATE = new RawContextKey<string>('updateState', StateType.Uninitialized);
 export const RELEASE_NOTES_URL = new RawContextKey<string>('releaseNotesUrl', '');
+export const DOWNLOAD_URL = new RawContextKey<string>('downloadUrl', '');
 
 let releaseNotesManager: ReleaseNotesManager | undefined = undefined;
 
@@ -111,6 +112,10 @@ export class ProductContribution implements IWorkbenchContribution {
 			const releaseNotesUrlKey = RELEASE_NOTES_URL.bindTo(contextKeyService);
 			releaseNotesUrlKey.set(productService.releaseNotesUrl);
 		}
+		if (productService.downloadUrl) {
+			const downloadUrlKey = DOWNLOAD_URL.bindTo(contextKeyService);
+			downloadUrlKey.set(productService.downloadUrl);
+		}
 
 		hostService.hadLastFocus().then(async hadLastFocus => {
 			if (!hadLastFocus) {
diff --git a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.ts b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.ts
index 4352b3b69fc014..4b863922ff8c84 100644
--- a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.ts
+++ b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.ts
@@ -33,6 +33,9 @@ import { URI } from 'vs/base/common/uri';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IWorkspaceTagsService } from 'vs/workbench/contrib/tags/common/workspaceTags';
+import { getErrorMessage } from 'vs/base/common/errors';
+
+const SelectProfileSubMenu = new MenuId('SelectProfile');
 
 export class UserDataProfilesWorkbenchContribution extends Disposable implements IWorkbenchContribution {
 
@@ -98,6 +101,7 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 
 	private registerActions(): void {
 		this.registerManageProfilesSubMenu();
+		this.registerSelectProfileSubMenu();
 
 		this.registerProfilesActions();
 		this._register(this.userDataProfilesService.onDidChangeProfiles(() => this.registerProfilesActions()));
@@ -107,14 +111,6 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 	}
 
 	private registerManageProfilesSubMenu(): void {
-		const that = this;
-		MenuRegistry.appendMenuItem(MenuId.GlobalActivity, <ISubmenuItem>{
-			get title() { return localize('manageProfiles', "{0} ({1})", PROFILES_TTILE.value, that.userDataProfileService.currentProfile.name); },
-			submenu: ManageProfilesSubMenu,
-			group: '5_settings',
-			when: PROFILES_ENABLEMENT_CONTEXT,
-			order: 1
-		});
 		MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, <ISubmenuItem>{
 			title: PROFILES_TTILE,
 			submenu: ManageProfilesSubMenu,
@@ -122,10 +118,14 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 			when: PROFILES_ENABLEMENT_CONTEXT,
 			order: 1
 		});
-		MenuRegistry.appendMenuItem(MenuId.AccountsContext, <ISubmenuItem>{
-			get title() { return localize('manageProfiles', "{0} ({1})", PROFILES_TTILE.value, that.userDataProfileService.currentProfile.name); },
-			submenu: ManageProfilesSubMenu,
-			group: '1_settings',
+	}
+
+	private registerSelectProfileSubMenu(): IDisposable {
+		const that = this;
+		return MenuRegistry.appendMenuItem(ManageProfilesSubMenu, <ISubmenuItem>{
+			get title() { return localize('profile', "Profile ({0})", that.userDataProfileService.currentProfile.name); },
+			submenu: SelectProfileSubMenu,
+			group: '0_profiles',
 			when: PROFILES_ENABLEMENT_CONTEXT,
 		});
 	}
@@ -148,7 +148,7 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 					toggled: ContextKeyExpr.equals(CURRENT_PROFILE_CONTEXT.key, profile.id),
 					menu: [
 						{
-							id: ManageProfilesSubMenu,
+							id: SelectProfileSubMenu,
 							group: '0_profiles',
 							when: PROFILES_ENABLEMENT_CONTEXT,
 						}
@@ -181,8 +181,8 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 				super({
 					id: `workbench.profiles.actions.updateCurrentProfileShortName`,
 					title: {
-						value: localize('change short name profile', "Change Short Name ({0})...", themeIcon?.id ?? shortName),
-						original: `Change Short Name (${themeIcon?.id ?? shortName})...`
+						value: localize('change short name profile', "Change Profile Short Name ({0})...", themeIcon?.id ?? shortName),
+						original: `Change Profile Short Name (${themeIcon?.id ?? shortName})...`
 					},
 					menu: [
 						{
@@ -237,8 +237,8 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 				super({
 					id: `workbench.profiles.actions.renameCurrentProfile`,
 					title: {
-						value: localize('rename profile', "Rename ({0})...", that.userDataProfileService.currentProfile.name),
-						original: `Rename (${that.userDataProfileService.currentProfile.name})...`
+						value: localize('rename profile', "Rename Profile ({0})...", that.userDataProfileService.currentProfile.name),
+						original: `Rename Profile (${that.userDataProfileService.currentProfile.name})...`
 					},
 					menu: [
 						{
@@ -265,8 +265,8 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 				super({
 					id,
 					title: {
-						value: localize('export profile', "Export ({0})...", that.userDataProfileService.currentProfile.name),
-						original: `Export (${that.userDataProfileService.currentProfile.name})...`
+						value: localize('export profile', "Export Profile ({0})...", that.userDataProfileService.currentProfile.name),
+						original: `Export Profile (${that.userDataProfileService.currentProfile.name})...`
 					},
 					category: PROFILES_CATEGORY,
 					precondition: IS_PROFILE_IMPORT_EXPORT_IN_PROGRESS_CONTEXT.toNegated(),
@@ -309,8 +309,8 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 				super({
 					id,
 					title: {
-						value: localize('import profile', "Import..."),
-						original: 'Import...'
+						value: localize('import profile', "Import Profile..."),
+						original: 'Import Profile...'
 					},
 					category: PROFILES_CATEGORY,
 					f1: true,
@@ -375,7 +375,7 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 							}
 						}
 					} catch (error) {
-						notificationService.error(error);
+						notificationService.error(localize('profile import error', "Error while importing profile: {0}", getErrorMessage(error)));
 					}
 				}));
 				disposables.add(quickPick.onDidHide(() => disposables.dispose()));
@@ -438,7 +438,7 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 			owner: 'sandy081';
 			comment: 'Report profile information of the current workspace';
 			workspaceId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'A UUID given to a workspace to identify it.' };
-			defaultProfile: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the profile of the workspace is default or not.' };
+			defaultProfile: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Whether the profile of the workspace is default or not.' };
 		};
 		type WorkspaceProfileInfoEvent = {
 			workspaceId: string | undefined;
diff --git a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfileActions.ts b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfileActions.ts
index 8fe6a87299423b..701f467099f599 100644
--- a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfileActions.ts
+++ b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfileActions.ts
@@ -7,13 +7,12 @@ import { localize } from 'vs/nls';
 import { Action2, IMenuService, registerAction2 } from 'vs/platform/actions/common/actions';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { INotificationService } from 'vs/platform/notification/common/notification';
-import { QuickPickItem, IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
+import { QuickPickItem, IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 import { IUserDataProfileManagementService, PROFILES_CATEGORY, ManageProfilesSubMenu, IUserDataProfileService, PROFILES_ENABLEMENT_CONTEXT, HAS_PROFILES_CONTEXT, MANAGE_PROFILES_ACTION_ID } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
 import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
 import { Categories } from 'vs/platform/action/common/actionCommonCategories';
 import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { ICommandService } from 'vs/platform/commands/common/commands';
-import { compare } from 'vs/base/common/strings';
 import { Codicon } from 'vs/base/common/codicons';
 import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
 import { IAction, Separator } from 'vs/base/common/actions';
@@ -107,11 +106,10 @@ registerAction2(class CreateProfileAction extends Action2 {
 		super({
 			id: 'workbench.profiles.actions.createProfile',
 			title: {
-				value: localize('create profile', "Create..."),
-				original: 'Create...'
+				value: localize('create profile', "Create Profile..."),
+				original: 'Create Profile...'
 			},
 			category: PROFILES_CATEGORY,
-			f1: true,
 			precondition: PROFILES_ENABLEMENT_CONTEXT,
 			menu: [
 				{
@@ -131,16 +129,9 @@ registerAction2(class CreateProfileAction extends Action2 {
 			[{
 				id: CreateEmptyProfileAction.ID,
 				label: CreateEmptyProfileAction.TITLE.value,
-			}, {
-				type: 'separator',
 			}, {
 				id: CreateFromCurrentProfileAction.ID,
 				label: CreateFromCurrentProfileAction.TITLE.value,
-			}, {
-				type: 'separator',
-			}, {
-				id: CreateTransientProfileAction.ID,
-				label: CreateTransientProfileAction.TITLE.value,
 			}], { hideInput: true, canPickMany: false, title: localize('create profile title', "{0}: Create...", PROFILES_CATEGORY.value) });
 		if (pick?.id) {
 			return commandService.executeCommand(pick.id);
@@ -183,14 +174,6 @@ export class RenameProfileAction extends Action2 {
 			category: PROFILES_CATEGORY,
 			f1: true,
 			precondition: ContextKeyExpr.and(PROFILES_ENABLEMENT_CONTEXT, HAS_PROFILES_CONTEXT),
-			menu: [
-				{
-					id: ManageProfilesSubMenu,
-					group: '3_manage_profiles',
-					when: PROFILES_ENABLEMENT_CONTEXT,
-					order: 1
-				}
-			]
 		});
 	}
 
@@ -254,8 +237,8 @@ registerAction2(class DeleteProfileAction extends Action2 {
 		super({
 			id: 'workbench.profiles.actions.deleteProfile',
 			title: {
-				value: localize('delete profile', "Delete..."),
-				original: 'Delete...'
+				value: localize('delete profile', "Delete Profile..."),
+				original: 'Delete Profile...'
 			},
 			category: PROFILES_CATEGORY,
 			f1: true,
@@ -344,40 +327,6 @@ registerAction2(class ManageProfilesAction extends Action2 {
 	}
 });
 
-registerAction2(class SwitchProfileAction extends Action2 {
-	constructor() {
-		super({
-			id: 'workbench.profiles.actions.switchProfile',
-			title: {
-				value: localize('switch profile', "Switch..."),
-				original: 'Switch...'
-			},
-			category: PROFILES_CATEGORY,
-			f1: true,
-			precondition: ContextKeyExpr.and(PROFILES_ENABLEMENT_CONTEXT, HAS_PROFILES_CONTEXT),
-		});
-	}
-
-	async run(accessor: ServicesAccessor) {
-		const quickInputService = accessor.get(IQuickInputService);
-		const userDataProfileService = accessor.get(IUserDataProfileService);
-		const userDataProfilesService = accessor.get(IUserDataProfilesService);
-		const userDataProfileManagementService = accessor.get(IUserDataProfileManagementService);
-
-		const profiles = userDataProfilesService.profiles.slice(0).sort((a, b) => compare(a.name, b.name));
-		if (profiles.length) {
-			const picks: Array<IQuickPickItem & { profile: IUserDataProfile }> = profiles.map(profile => ({
-				label: `${profile.name}${profile.id === userDataProfileService.currentProfile.id ? ` $(${Codicon.check.id})` : ''}`,
-				profile
-			}));
-			const pick = await quickInputService.pick(picks, { placeHolder: localize('pick profile', "Select Profile") });
-			if (pick) {
-				await userDataProfileManagementService.switchProfile(pick.profile);
-			}
-		}
-	}
-});
-
 // Developer Actions
 
 registerAction2(class CleanupProfilesAction extends Action2 {
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
index 8d573e890756a1..a670b9de270150 100644
--- a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
+++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
@@ -36,7 +36,6 @@ import { IOutputService } from 'vs/workbench/services/output/common/output';
 import { IActivityService, IBadge, NumberBadge, ProgressBadge } from 'vs/workbench/services/activity/common/activity';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { IUserDataSyncAccountService } from 'vs/platform/userDataSync/common/userDataSyncAccount';
 import { fromNow } from 'vs/base/common/date';
 import { IProductService } from 'vs/platform/product/common/productService';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
@@ -53,7 +52,7 @@ import { IHostService } from 'vs/workbench/services/host/browser/host';
 import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { ctxIsMergeResultEditor, ctxMergeBaseUri } from 'vs/workbench/contrib/mergeEditor/common/mergeEditor';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { IWorkbenchIssueService } from 'vs/workbench/services/issue/common/issue';
 
 type ConfigureSyncQuickPickItem = { id: SyncResource; label: string; description?: string };
 
@@ -106,7 +105,6 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 		@IQuickInputService private readonly quickInputService: IQuickInputService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IOutputService private readonly outputService: IOutputService,
-		@IUserDataSyncAccountService readonly authTokenService: IUserDataSyncAccountService,
 		@IUserDataAutoSyncService userDataAutoSyncService: IUserDataAutoSyncService,
 		@ITextModelService textModelResolverService: ITextModelService,
 		@IPreferencesService private readonly preferencesService: IPreferencesService,
@@ -116,8 +114,9 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 		@IAuthenticationService private readonly authenticationService: IAuthenticationService,
 		@IUserDataSyncStoreManagementService private readonly userDataSyncStoreManagementService: IUserDataSyncStoreManagementService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IEnvironmentService private readonly environmentService: IEnvironmentService,
-		@IHostService private readonly hostService: IHostService
+		@IHostService private readonly hostService: IHostService,
+		@ICommandService private readonly commandService: ICommandService,
+		@IWorkbenchIssueService private readonly workbenchIssueService: IWorkbenchIssueService
 	) {
 		super();
 
@@ -270,6 +269,10 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 					this.handleTooLargeError(error.resource, localize('too large', "Disabled syncing {0} because size of the {1} file to sync is larger than {2}. Please open the file and reduce the size and enable sync", sourceArea.toLowerCase(), sourceArea.toLowerCase(), '100kb'), error);
 				}
 				break;
+			case UserDataSyncErrorCode.LocalTooManyProfiles:
+				this.disableSync(SyncResource.Profiles);
+				this.notificationService.error(localize('too many profiles', "Disabled syncing profiles because there are too many profiles to sync. Settings Sync supports syncing maximum 20 profiles. Please reduce the number of profiles and enable sync"));
+				break;
 			case UserDataSyncErrorCode.IncompatibleLocalContent:
 			case UserDataSyncErrorCode.Gone:
 			case UserDataSyncErrorCode.UpgradeRequired: {
@@ -281,6 +284,21 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 				});
 				break;
 			}
+			case UserDataSyncErrorCode.MethodNotFound: {
+				const message = localize('method not found', "Settings sync is disabled because the client is making invalid requests. Please report an issue with the logs.");
+				const operationId = error.operationId ? localize('operationId', "Operation Id: {0}", error.operationId) : undefined;
+				this.notificationService.notify({
+					severity: Severity.Error,
+					message: operationId ? `${message} ${operationId}` : message,
+					actions: {
+						primary: [
+							new Action('Show Sync Logs', localize('show sync logs', "Show Log"), undefined, true, () => this.commandService.executeCommand(SHOW_SYNC_LOG_COMMAND_ID)),
+							new Action('Report Issue', localize('report issue', "Report Issue"), undefined, true, () => this.workbenchIssueService.openReporter())
+						]
+					}
+				});
+				break;
+			}
 			case UserDataSyncErrorCode.IncompatibleRemoteContent:
 				this.notificationService.notify({
 					severity: Severity.Error,
@@ -552,7 +570,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 			id: SyncResource.GlobalState,
 			label: getSyncAreaLabel(SyncResource.GlobalState),
 		}];
-		if (this.userDataProfilesService.isEnabled() && (!this.environmentService.isBuilt || this.productService.enableSyncingProfiles)) {
+		if (this.userDataProfilesService.isEnabled()) {
 			result.push({
 				id: SyncResource.Profiles,
 				label: getSyncAreaLabel(SyncResource.Profiles),
@@ -621,6 +639,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 			case SyncResource.Tasks: return this.userDataSyncEnablementService.setResourceEnablement(SyncResource.Tasks, false);
 			case SyncResource.Extensions: return this.userDataSyncEnablementService.setResourceEnablement(SyncResource.Extensions, false);
 			case SyncResource.GlobalState: return this.userDataSyncEnablementService.setResourceEnablement(SyncResource.GlobalState, false);
+			case SyncResource.Profiles: return this.userDataSyncEnablementService.setResourceEnablement(SyncResource.Profiles, false);
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSyncConflictsView.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSyncConflictsView.ts
index c938952198263a..d90aa2e503840e 100644
--- a/src/vs/workbench/contrib/userDataSync/browser/userDataSyncConflictsView.ts
+++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSyncConflictsView.ts
@@ -12,7 +12,6 @@ import { IUserDataSyncService, Change, MergeState, IUserDataSyncResource, IResou
 import { registerAction2, Action2, MenuId } from 'vs/platform/actions/common/actions';
 import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { URI } from 'vs/base/common/uri';
-import { Event } from 'vs/base/common/event';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { getSyncAreaLabel, IUserDataSyncConflictsView, IUserDataSyncWorkbenchService, SYNC_CONFLICTS_VIEW_ID } from 'vs/workbench/services/userDataSync/common/userDataSync';
 import { basename, isEqual } from 'vs/base/common/resources';
@@ -27,11 +26,6 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { Codicon } from 'vs/base/common/codicons';
 import { IUserDataProfile, IUserDataProfilesService, reviveProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { Disposable, dispose } from 'vs/base/common/lifecycle';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { FloatingClickWidget } from 'vs/workbench/browser/codeeditor';
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
 import { DEFAULT_EDITOR_ASSOCIATION } from 'vs/workbench/common/editor';
 
 type UserDataSyncConflictResource = IUserDataSyncResource & IResourcePreview;
@@ -189,139 +183,22 @@ export class UserDataSyncConflictsViewPane extends TreeViewPane implements IUser
 			return;
 		}
 
-		// Open Merge Editor if Sync is enabled
-		if (this.userDataSyncEnablementService.isEnabled()) {
-			const remoteResourceName = localize({ key: 'remoteResourceName', comment: ['remote as in file in cloud'] }, "{0} (Remote)", basename(conflictToOpen.remoteResource));
-			const localResourceName = localize('localResourceName', "{0} (Local)", basename(conflictToOpen.remoteResource));
-			await this.editorService.openEditor({
-				input1: { resource: conflictToOpen.remoteResource, label: localize('Theirs', 'Theirs'), description: remoteResourceName },
-				input2: { resource: conflictToOpen.localResource, label: localize('Yours', 'Yours'), description: localResourceName },
-				base: { resource: conflictToOpen.baseResource },
-				result: { resource: conflictToOpen.previewResource }
-			});
-			return;
-		}
-
-		// Open Diff Editor if Sync is disabled
-		else {
-			const leftResource = conflictToOpen.remoteResource;
-			const rightResource = conflictToOpen.localResource;
-			const leftResourceName = localize({ key: 'leftResourceName', comment: ['remote as in file in cloud'] }, "{0} (Remote)", basename(leftResource));
-			const rightResourceName = localize({ key: 'rightResourceName', comment: ['local as in file in disk'] }, "{0} (Local)", basename(rightResource));
-			await this.editorService.openEditor({
-				original: { resource: leftResource },
-				modified: { resource: rightResource },
-				label: localize('sideBySideLabels', "{0} ↔ {1}", leftResourceName, rightResourceName),
-				description: localize('sideBySideDescription', "Settings Sync"),
-				options: {
-					preserveFocus: true,
-					revealIfVisible: true,
-					pinned: true,
-					override: DEFAULT_EDITOR_ASSOCIATION.id
-				},
-			});
-		}
-	}
-
-}
-
-class AcceptChangesContribution extends Disposable implements IEditorContribution {
-
-	static get(editor: ICodeEditor): AcceptChangesContribution | null {
-		return editor.getContribution<AcceptChangesContribution>(AcceptChangesContribution.ID);
-	}
-
-	public static readonly ID = 'editor.contrib.acceptChangesButton2';
-
-	private acceptChangesButton: FloatingClickWidget | undefined;
-
-	constructor(
-		private editor: ICodeEditor,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IUserDataSyncService private readonly userDataSyncService: IUserDataSyncService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IUserDataSyncWorkbenchService private readonly userDataSyncWorkbenchService: IUserDataSyncWorkbenchService,
-	) {
-		super();
-
-		this.update();
-		this.registerListeners();
-	}
-
-	private registerListeners(): void {
-		this._register(this.editor.onDidChangeModel(() => this.update()));
-		this._register(this.userDataSyncService.onDidChangeConflicts(() => this.update()));
-		this._register(Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('diffEditor.renderSideBySide'))(() => this.update()));
-	}
-
-	private update(): void {
-		if (!this.shouldShowButton(this.editor)) {
-			this.disposeAcceptChangesWidgetRenderer();
-			return;
-		}
-
-		this.createAcceptChangesWidgetRenderer();
-	}
-
-	private shouldShowButton(editor: ICodeEditor): boolean {
-		const model = editor.getModel();
-		if (!model) {
-			return false; // we need a model
-		}
-
-		const userDataSyncResource = this.getUserDataSyncResource(model.uri);
-		if (!userDataSyncResource) {
-			return false;
-		}
-
-		if (!this.configurationService.getValue('diffEditor.renderSideBySide')) {
-			return isEqual(userDataSyncResource.localResource, model.uri);
-		}
-
-		return true;
-	}
-
-	private createAcceptChangesWidgetRenderer(): void {
-		if (!this.acceptChangesButton) {
-			const resource = this.editor.getModel()!.uri;
-			const userDataSyncResource = this.getUserDataSyncResource(resource)!;
-
-			const isRemoteResource = isEqual(userDataSyncResource.remoteResource, resource);
-			const label = isRemoteResource ? localize('accept remote', "Accept Remote")
-				: localize('accept local', "Accept Local");
-
-			this.acceptChangesButton = this.instantiationService.createInstance(FloatingClickWidget, this.editor, label, null);
-			this._register(this.acceptChangesButton.onClick(async () => {
-				const model = this.editor.getModel();
-				if (model) {
-					await this.userDataSyncWorkbenchService.accept({ syncResource: userDataSyncResource.syncResource, profile: userDataSyncResource.profile }, model.uri, model.getValue(), false);
-				}
-			}));
-
-			this.acceptChangesButton.render();
-		}
-	}
-
-	private getUserDataSyncResource(resource: URI): (IUserDataSyncResource & IResourcePreview) | undefined {
-		for (const userDataSyncResource of this.userDataSyncService.conflicts) {
-			for (const conflict of userDataSyncResource.conflicts) {
-				if (isEqual(conflict.remoteResource, resource) || isEqual(conflict.localResource, resource)) {
-					return { syncResource: userDataSyncResource.syncResource, profile: userDataSyncResource.profile, ...conflict };
-				}
+		const remoteResourceName = localize({ key: 'remoteResourceName', comment: ['remote as in file in cloud'] }, "{0} (Remote)", basename(conflictToOpen.remoteResource));
+		const localResourceName = localize('localResourceName', "{0} (Local)", basename(conflictToOpen.remoteResource));
+		await this.editorService.openEditor({
+			input1: { resource: conflictToOpen.remoteResource, label: localize('Theirs', 'Theirs'), description: remoteResourceName },
+			input2: { resource: conflictToOpen.localResource, label: localize('Yours', 'Yours'), description: localResourceName },
+			base: { resource: conflictToOpen.baseResource },
+			result: { resource: conflictToOpen.previewResource },
+			options: {
+				preserveFocus: true,
+				revealIfVisible: true,
+				pinned: true,
+				override: DEFAULT_EDITOR_ASSOCIATION.id
 			}
-		}
-		return undefined;
+		});
+		return;
 	}
 
-	private disposeAcceptChangesWidgetRenderer(): void {
-		dispose(this.acceptChangesButton);
-		this.acceptChangesButton = undefined;
-	}
-
-	override dispose(): void {
-		this.disposeAcceptChangesWidgetRenderer();
-		super.dispose();
-	}
 }
 
-registerEditorContribution(AcceptChangesContribution.ID, AcceptChangesContribution, EditorContributionInstantiation.AfterFirstRender);
diff --git a/src/vs/workbench/contrib/watermark/browser/watermark.ts b/src/vs/workbench/contrib/watermark/browser/watermark.ts
index 30c71634a233ed..a7cca4975c6660 100644
--- a/src/vs/workbench/contrib/watermark/browser/watermark.ts
+++ b/src/vs/workbench/contrib/watermark/browser/watermark.ts
@@ -48,7 +48,7 @@ const openFileNonMacOnly: WatermarkEntry = { text: nls.localize('watermark.openF
 const openFolderNonMacOnly: WatermarkEntry = { text: nls.localize('watermark.openFolder', "Open Folder"), id: OpenFolderAction.ID, mac: false };
 const openFileOrFolderMacOnly: WatermarkEntry = { text: nls.localize('watermark.openFileFolder', "Open File or Folder"), id: OpenFileFolderAction.ID, mac: true };
 const openRecent: WatermarkEntry = { text: nls.localize('watermark.openRecent', "Open Recent"), id: OpenRecentAction.ID };
-const newUntitledFile: WatermarkEntry = { text: nls.localize('watermark.newUntitledFile', "New Untitled File"), id: NEW_UNTITLED_FILE_COMMAND_ID };
+const newUntitledFile: WatermarkEntry = { text: nls.localize('watermark.newUntitledFile', "New Untitled Text File"), id: NEW_UNTITLED_FILE_COMMAND_ID };
 const newUntitledFileMacOnly: WatermarkEntry = Object.assign({ mac: true }, newUntitledFile);
 const findInFiles: WatermarkEntry = { text: nls.localize('watermark.findInFiles', "Find in Files"), id: FindInFilesActionId };
 const toggleTerminal: WatermarkEntry = { text: nls.localize({ key: 'watermark.toggleTerminal', comment: ['toggle is a verb here'] }, "Toggle Terminal"), id: TerminalCommandId.Toggle, when: TerminalContextKeys.processSupported };
diff --git a/src/vs/workbench/contrib/webview/browser/themeing.ts b/src/vs/workbench/contrib/webview/browser/themeing.ts
index 76f85134455f28..4fd074d18aeec8 100644
--- a/src/vs/workbench/contrib/webview/browser/themeing.ts
+++ b/src/vs/workbench/contrib/webview/browser/themeing.ts
@@ -5,7 +5,7 @@
 
 import { Emitter } from 'vs/base/common/event';
 import { Disposable } from 'vs/base/common/lifecycle';
-import { EditorOptions, EDITOR_FONT_DEFAULTS, IEditorOptions } from 'vs/editor/common/config/editorOptions';
+import { EDITOR_FONT_DEFAULTS, IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import * as colorRegistry from 'vs/platform/theme/common/colorRegistry';
 import { ColorScheme } from 'vs/platform/theme/common/theme';
@@ -52,7 +52,7 @@ export class WebviewThemeDataProvider extends Disposable {
 	public getWebviewThemeData(): WebviewThemeData {
 		if (!this._cachedWebViewThemeData) {
 			const configuration = this._configurationService.getValue<IEditorOptions>('editor');
-			const editorFontFamily = EditorOptions.fontFamily.validate(configuration.fontFamily);
+			const editorFontFamily = configuration.fontFamily || EDITOR_FONT_DEFAULTS.fontFamily;
 			const editorFontWeight = configuration.fontWeight || EDITOR_FONT_DEFAULTS.fontWeight;
 			const editorFontSize = configuration.fontSize || EDITOR_FONT_DEFAULTS.fontSize;
 
diff --git a/src/vs/workbench/contrib/webview/browser/webviewElement.ts b/src/vs/workbench/contrib/webview/browser/webviewElement.ts
index e3c5db338b4bee..fb09ce265221af 100644
--- a/src/vs/workbench/contrib/webview/browser/webviewElement.ts
+++ b/src/vs/workbench/contrib/webview/browser/webviewElement.ts
@@ -475,28 +475,30 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD
 		this.element!.setAttribute('src', `${this.webviewContentEndpoint(encodedWebviewOrigin)}/${fileName}?${queryString}`);
 	}
 
-	public mountTo(_stopBlockingIframeDragEvents: HTMLElement) {
+	public mountTo(element: HTMLElement) {
 		if (!this.element) {
 			return;
 		}
 
 		if (this._webviewFindWidget) {
-			_stopBlockingIframeDragEvents.appendChild(this._webviewFindWidget.getDomNode());
+			element.appendChild(this._webviewFindWidget.getDomNode());
 		}
 
 		for (const eventName of [EventType.MOUSE_DOWN, EventType.MOUSE_MOVE, EventType.DROP]) {
-			this._register(addDisposableListener(_stopBlockingIframeDragEvents, eventName, () => {
+			this._register(addDisposableListener(element, eventName, () => {
 				this._stopBlockingIframeDragEvents();
 			}));
 		}
 
-		for (const node of [_stopBlockingIframeDragEvents, window]) {
+		for (const node of [element, window]) {
 			this._register(addDisposableListener(node, EventType.DRAG_END, () => {
 				this._stopBlockingIframeDragEvents();
 			}));
 		}
 
-		_stopBlockingIframeDragEvents.appendChild(this.element);
+		element.id = this.id; // This is used by aria-flow for accessibility order
+
+		element.appendChild(this.element);
 	}
 
 	private _startBlockingIframeDragEvents() {
diff --git a/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.ts b/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.ts
index 3bcaadf2733db0..b37c2016f45915 100644
--- a/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.ts
+++ b/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.ts
@@ -185,7 +185,7 @@ export class WebviewViewPane extends ViewPane {
 		this._webview.value = webview;
 
 		if (this._container) {
-			this._webview.value?.layoutWebviewOverElement(this._container);
+			this.layoutWebview();
 		}
 
 		this._webviewDisposables.add(toDisposable(() => {
@@ -278,7 +278,7 @@ export class WebviewViewPane extends ViewPane {
 		this.layoutWebview();
 	}
 
-	private layoutWebview(dimension?: Dimension) {
+	private doLayoutWebview(dimension?: Dimension) {
 		const webviewEntry = this._webview.value;
 		if (!this._container || !webviewEntry) {
 			return;
@@ -289,11 +289,14 @@ export class WebviewViewPane extends ViewPane {
 		}
 
 		webviewEntry.layoutWebviewOverElement(this._container, dimension, this._rootContainer);
+	}
 
+	private layoutWebview(dimension?: Dimension) {
+		this.doLayoutWebview(dimension);
 		// Temporary fix for https://github.com/microsoft/vscode/issues/110450
 		// There is an animation that lasts about 200ms, update the webview positioning once this animation is complete.
 		clearTimeout(this._repositionTimeout);
-		this._repositionTimeout = setTimeout(() => this.layoutWebview(), 200);
+		this._repositionTimeout = setTimeout(() => this.doLayoutWebview(dimension), 200);
 	}
 
 	private findRootContainer(container: HTMLElement): HTMLElement | undefined {
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
index 572d08bc4392a8..8e01048ebd92cd 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
@@ -319,7 +319,7 @@ configurationRegistry.registerConfiguration({
 				localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.none' }, "Start without an editor."),
 				localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.welcomePage' }, "Open the Welcome page, with content to aid in getting started with VS Code and extensions."),
 				localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.readme' }, "Open the README when opening a folder that contains one, fallback to 'welcomePage' otherwise. Note: This is only observed as a global configuration, it will be ignored if set in a workspace or folder configuration."),
-				localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.newUntitledFile' }, "Open a new untitled file (only applies when opening an empty window)."),
+				localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.newUntitledFile' }, "Open a new untitled text file (only applies when opening an empty window)."),
 				localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.welcomePageInEmptyWorkbench' }, "Open the Welcome page when opening an empty workbench."),
 			],
 			'default': 'welcomePage',
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
index 07c570eeb176f5..a8d16303f75922 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
@@ -29,7 +29,7 @@ import { ContextKeyExpr, ContextKeyExpression, IContextKeyService, RawContextKey
 import { IRecentFolder, IRecentlyOpened, IRecentWorkspace, isRecentFolder, isRecentWorkspace, IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { onUnexpectedError } from 'vs/base/common/errors';
-import { ILabelService } from 'vs/platform/label/common/label';
+import { ILabelService, Verbosity } from 'vs/platform/label/common/label';
 import { IWindowOpenable } from 'vs/platform/window/common/window';
 import { splitName } from 'vs/base/common/labels';
 import { IHostService } from 'vs/workbench/services/host/browser/host';
@@ -849,9 +849,9 @@ export class GettingStartedPage extends EditorPane {
 			let windowOpenable: IWindowOpenable;
 			if (isRecentFolder(recent)) {
 				windowOpenable = { folderUri: recent.folderUri };
-				fullPath = recent.label || this.labelService.getWorkspaceLabel(recent.folderUri, { verbose: true });
+				fullPath = recent.label || this.labelService.getWorkspaceLabel(recent.folderUri, { verbose: Verbosity.LONG });
 			} else {
-				fullPath = recent.label || this.labelService.getWorkspaceLabel(recent.workspace, { verbose: true });
+				fullPath = recent.label || this.labelService.getWorkspaceLabel(recent.workspace, { verbose: Verbosity.LONG });
 				windowOpenable = { workspaceUri: recent.workspace.configPath };
 			}
 
@@ -1115,7 +1115,7 @@ export class GettingStartedPage extends EditorPane {
 
 		if (toSide && fullSize.width > 700) {
 			if (this.groupsService.count === 1) {
-				this.groupsService.addGroup(this.groupsService.groups[0], GroupDirection.LEFT, { activate: true });
+				this.groupsService.addGroup(this.groupsService.groups[0], GroupDirection.RIGHT, { activate: true });
 
 				const gettingStartedSize = Math.floor(fullSize.width / 2);
 
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/startupPage.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/startupPage.ts
index d5cfa8c3323bd9..05cbee8a44b5ed 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/startupPage.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/startupPage.ts
@@ -24,6 +24,7 @@ import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storag
 import { getTelemetryLevel } from 'vs/platform/telemetry/common/telemetryUtils';
 import { TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
 import { IProductService } from 'vs/platform/product/common/productService';
+import { ILogService } from 'vs/platform/log/common/log';
 
 export const restoreWalkthroughsConfigurationKey = 'workbench.welcomePage.restorableWalkthroughs';
 export type RestoreWalkthroughsConfigurationValue = { folder: string; category?: string; step?: string };
@@ -46,7 +47,8 @@ export class StartupPageContribution implements IWorkbenchContribution {
 		@IProductService private readonly productService: IProductService,
 		@ICommandService private readonly commandService: ICommandService,
 		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
-		@IStorageService private readonly storageService: IStorageService
+		@IStorageService private readonly storageService: IStorageService,
+		@ILogService private readonly logService: ILogService
 	) {
 		this.run().then(undefined, onUnexpectedError);
 	}
@@ -79,14 +81,21 @@ export class StartupPageContribution implements IWorkbenchContribution {
 			if (!this.editorService.activeEditor || this.layoutService.openedDefaultEditors) {
 				const startupEditorSetting = this.configurationService.inspect<string>(configurationKey);
 
+
+				const isStartupEditorReadme = startupEditorSetting.value === 'readme';
+				const isStartupEditorUserReadme = startupEditorSetting.userValue === 'readme';
+				const isStartupEditorDefaultReadme = startupEditorSetting.defaultValue === 'readme';
+
 				// 'readme' should not be set in workspace settings to prevent tracking,
-				// but it can be set as a default (as in codespaces) or a user setting
-				const openWithReadme = startupEditorSetting.value === 'readme' &&
-					(startupEditorSetting.userValue === 'readme' || startupEditorSetting.defaultValue === 'readme');
+				// but it can be set as a default (as in codespaces or from configurationDefaults) or a user setting
+				if (isStartupEditorReadme && (!isStartupEditorUserReadme || !isStartupEditorDefaultReadme)) {
+					this.logService.warn(`Warning: 'workbench.startupEditor: readme' setting ignored due to being set somewhere other than user or default settings (user=${startupEditorSetting.userValue}, default=${startupEditorSetting.defaultValue})`);
+				}
 
+				const openWithReadme = isStartupEditorReadme && (isStartupEditorUserReadme || isStartupEditorDefaultReadme);
 				if (openWithReadme) {
 					await this.openReadme();
-				} else {
+				} else if (startupEditorSetting.value === 'welcomePage' || startupEditorSetting.value === 'welcomePageInEmptyWorkbench') {
 					await this.openGettingStarted();
 				}
 			}
@@ -133,8 +142,6 @@ export class StartupPageContribution implements IWorkbenchContribution {
 					this.commandService.executeCommand('markdown.showPreview', null, readmes.filter(isMarkDown), { locked: true }),
 					this.editorService.openEditors(readmes.filter(readme => !isMarkDown(readme)).map(readme => ({ resource: readme }))),
 				]);
-			} else {
-				await this.openGettingStarted();
 			}
 		}
 	}
@@ -168,9 +175,6 @@ function isStartupPageEnabled(configurationService: IConfigurationService, conte
 		}
 	}
 
-	if (startupEditor.value === 'readme' && startupEditor.userValue !== 'readme' && startupEditor.defaultValue !== 'readme') {
-		console.error(`Warning: 'workbench.startupEditor: readme' setting ignored due to being set somewhere other than user or default settings (user=${startupEditor.userValue}, default=${startupEditor.defaultValue})`);
-	}
 	return startupEditor.value === 'welcomePage'
 		|| startupEditor.value === 'readme' && (startupEditor.userValue === 'readme' || startupEditor.defaultValue === 'readme')
 		|| (contextService.getWorkbenchState() === WorkbenchState.EMPTY && startupEditor.value === 'welcomePageInEmptyWorkbench');
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
index acc4275a9c2ebf..f9ef65c641de9e 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
@@ -58,7 +58,7 @@ export const startEntries: GettingStartedStartEntryContent = [
 	{
 		id: 'welcome.showNewFileEntries',
 		title: localize('gettingStarted.newFile.title', "New File..."),
-		description: localize('gettingStarted.newFile.description', "Open a new untitled file, notebook, or custom editor."),
+		description: localize('gettingStarted.newFile.description', "Open a new untitled text file, notebook, or custom editor."),
 		icon: Codicon.newFile,
 		content: {
 			type: 'startEntry',
@@ -267,8 +267,8 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 
 	{
 		id: 'SetupWeb',
-		title: localize('gettingStarted.setupWeb.title', "Get Started with VS Code in the Web"),
-		description: localize('gettingStarted.setupWeb.description', "Discover the best customizations to make VS Code in the Web yours."),
+		title: localize('gettingStarted.setupWeb.title', "Get Started with VS Code for the Web"),
+		description: localize('gettingStarted.setupWeb.description', "Discover the best customizations to make VS Code for the Web yours."),
 		isFeatured: true,
 		icon: setupIcon,
 		when: 'isWeb',
@@ -305,7 +305,7 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 				{
 					id: 'menuBarWeb',
 					title: localize('gettingStarted.menuBar.title', "Just the right amount of UI"),
-					description: localize('gettingStarted.menuBar.description.interpolated', "The full menu bar is available in the dropdown menu to make room for your code. Toggle its apperance for faster access. \n{0}", Button(localize('toggleMenuBar', "Toggle Menu Bar"), 'command:workbench.action.toggleMenuBar')),
+					description: localize('gettingStarted.menuBar.description.interpolated', "The full menu bar is available in the dropdown menu to make room for your code. Toggle its appearance for faster access. \n{0}", Button(localize('toggleMenuBar', "Toggle Menu Bar"), 'command:workbench.action.toggleMenuBar')),
 					when: 'isWeb',
 					media: {
 						type: 'svg', altText: 'Comparing menu dropdown with the visible menu bar.', path: 'menuBar.svg'
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/media/colorTheme.png b/src/vs/workbench/contrib/welcomeGettingStarted/common/media/colorTheme.png
deleted file mode 100644
index a123c924e312dd..00000000000000
Binary files a/src/vs/workbench/contrib/welcomeGettingStarted/common/media/colorTheme.png and /dev/null differ
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/media/github.png b/src/vs/workbench/contrib/welcomeGettingStarted/common/media/github.png
deleted file mode 100644
index ed324758c9ade4..00000000000000
Binary files a/src/vs/workbench/contrib/welcomeGettingStarted/common/media/github.png and /dev/null differ
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/media/more.png b/src/vs/workbench/contrib/welcomeGettingStarted/common/media/more.png
deleted file mode 100644
index e1b741da46a12c..00000000000000
Binary files a/src/vs/workbench/contrib/welcomeGettingStarted/common/media/more.png and /dev/null differ
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/media/quiet-light.png b/src/vs/workbench/contrib/welcomeGettingStarted/common/media/quiet-light.png
deleted file mode 100644
index f620e22d3bea55..00000000000000
Binary files a/src/vs/workbench/contrib/welcomeGettingStarted/common/media/quiet-light.png and /dev/null differ
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/media/tutorialVideo.png b/src/vs/workbench/contrib/welcomeGettingStarted/common/media/tutorialVideo.png
deleted file mode 100644
index 3d1bca2a2f071c..00000000000000
Binary files a/src/vs/workbench/contrib/welcomeGettingStarted/common/media/tutorialVideo.png and /dev/null differ
diff --git a/src/vs/workbench/contrib/welcomeOverlay/browser/media/welcomeOverlay.css b/src/vs/workbench/contrib/welcomeOverlay/browser/media/welcomeOverlay.css
index 88de8da3412112..cea1303dd5229a 100644
--- a/src/vs/workbench/contrib/welcomeOverlay/browser/media/welcomeOverlay.css
+++ b/src/vs/workbench/contrib/welcomeOverlay/browser/media/welcomeOverlay.css
@@ -13,6 +13,7 @@
 	font-size: 10px;
 	transition: font-size .25s;
 	outline: none;
+	background-color: var(--vscode-welcomeOverlay-background);
 }
 
 #workbench\.parts\.editor {
@@ -37,6 +38,7 @@
 
 .monaco-workbench > .welcomeOverlay > .key {
 	font-size: 1.6em;
+	color: var(--vscode-foreground);
 }
 
 .monaco-workbench > .welcomeOverlay > .key > .label {
@@ -47,6 +49,7 @@
 	letter-spacing: 0.15em;
 	font-size: 0.8125em;
 	font-family: "Lucida Grande", sans-serif;
+	color: var(--vscode-textPreformat-foreground);
 }
 
 .monaco-workbench > .welcomeOverlay > .key.explorer {
@@ -173,3 +176,4 @@
 		left: 50%;
 	}
 }
+
diff --git a/src/vs/workbench/contrib/welcomeOverlay/browser/welcomeOverlay.ts b/src/vs/workbench/contrib/welcomeOverlay/browser/welcomeOverlay.ts
index 5e7a51a2ba0ab2..2f4b557e6e3673 100644
--- a/src/vs/workbench/contrib/welcomeOverlay/browser/welcomeOverlay.ts
+++ b/src/vs/workbench/contrib/welcomeOverlay/browser/welcomeOverlay.ts
@@ -17,11 +17,9 @@ import { Disposable } from 'vs/base/common/lifecycle';
 import { RawContextKey, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { textPreformatForeground, foreground } from 'vs/platform/theme/common/colorRegistry';
-import { Color } from 'vs/base/common/color';
 import { Codicon } from 'vs/base/common/codicons';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { registerColor } from 'vs/platform/theme/common/colorRegistry';
 
 const $ = dom.$;
 
@@ -34,6 +32,7 @@ interface Key {
 	withEditor?: boolean;
 }
 
+
 const keys: Key[] = [
 	{
 		id: 'explorer',
@@ -106,6 +105,12 @@ const keys: Key[] = [
 
 const OVERLAY_VISIBLE = new RawContextKey<boolean>('interfaceOverviewVisible', false);
 
+/**
+ * welcomeOverlay background color.
+ */
+export const welcomeOverlayBackground = registerColor('welcomeOverlay.background', { light: '#FFFFFF85', dark: '#00000085', hcDark: null, hcLight: null }, localize('welcomeOverlayBackground', "welcomeOverlay Background color."));
+
+
 let welcomeOverlay: WelcomeOverlay;
 
 export class WelcomeOverlayAction extends Action2 {
@@ -269,19 +274,3 @@ class WelcomeOverlay extends Disposable {
 registerAction2(WelcomeOverlayAction);
 registerAction2(HideWelcomeOverlayAction);
 
-// theming
-
-registerThemingParticipant((theme, collector) => {
-	const key = theme.getColor(foreground);
-	if (key) {
-		collector.addRule(`.monaco-workbench > .welcomeOverlay > .key { color: ${key}; }`);
-	}
-	const backgroundColor = Color.fromHex(theme.type === 'light' ? '#FFFFFF85' : '#00000085');
-	if (backgroundColor) {
-		collector.addRule(`.monaco-workbench > .welcomeOverlay { background: ${backgroundColor}; }`);
-	}
-	const shortcut = theme.getColor(textPreformatForeground);
-	if (shortcut) {
-		collector.addRule(`.monaco-workbench > .welcomeOverlay > .key > .shortcut { color: ${shortcut}; }`);
-	}
-});
diff --git a/src/vs/workbench/contrib/welcomeWalkthrough/browser/media/walkThroughPart.css b/src/vs/workbench/contrib/welcomeWalkthrough/browser/media/walkThroughPart.css
index 77383d51f14301..97951462acb940 100644
--- a/src/vs/workbench/contrib/welcomeWalkthrough/browser/media/walkThroughPart.css
+++ b/src/vs/workbench/contrib/welcomeWalkthrough/browser/media/walkThroughPart.css
@@ -92,12 +92,6 @@
 	border-top: 1px solid;
 }
 
-.monaco-workbench .part.editor > .content .walkThroughContent blockquote {
-	margin: 0 7px 0 5px;
-	padding: 0 16px 0 10px;
-	border-left: 5px solid;
-}
-
 .monaco-workbench .part.editor > .content .walkThroughContent code,
 .monaco-workbench .part.editor > .content .walkThroughContent .shortcut {
 	font-family: var(--monaco-monospace-font);
@@ -109,6 +103,8 @@
 	margin: 0 7px 0 5px;
 	padding: 0 16px 0 10px;
 	border-left: 5px solid;
+	background: var(--vscode-textBlockQuote-background);
+	border-color: var(--vscode-textBlockQuote-border);
 }
 
 .monaco-workbench .part.editor > .content .walkThroughContent .monaco-tokenized-source {
@@ -140,3 +136,27 @@
 	border-width: 1px;
 	border-style: solid;
 }
+
+.monaco-workbench .part.editor > .content .walkThroughContent a[href] {
+	color: var(--vscode-textLink-foreground);
+}
+
+.monaco-workbench .part.editor > .content .walkThroughContent a:hover,
+.monaco-workbench .part.editor > .content .walkThroughContent a[href]:active {
+	color: var(--vscode-textLink-activeForeground);
+}
+
+.monaco-workbench .part.editor > .content .walkThroughContent a[href]:focus {
+	outline-color: var(--vscode-focusBorder);
+}
+
+.monaco-workbench .part.editor > .content .walkThroughContent code,
+.monaco-workbench .part.editor > .content .walkThroughContent .shortcut {
+	color: var(--vscode-textPreformat-foreground);
+}
+
+.monaco-workbench .part.editor > .content .walkThroughContent .monaco-editor {
+	border-color: var(--vscode-contrastBorder);
+}
+
+
diff --git a/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughPart.ts b/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughPart.ts
index 7372c9771bfb9e..78df6afcdc2e75 100644
--- a/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughPart.ts
+++ b/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughPart.ts
@@ -27,7 +27,7 @@ import { isObject } from 'vs/base/common/types';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { IEditorOptions as ICodeEditorOptions, EditorOption } from 'vs/editor/common/config/editorOptions';
 import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { registerColor, focusBorder, textLinkForeground, textLinkActiveForeground, textPreformatForeground, contrastBorder, textBlockQuoteBackground, textBlockQuoteBorder } from 'vs/platform/theme/common/colorRegistry';
+import { registerColor } from 'vs/platform/theme/common/colorRegistry';
 import { getExtraColor } from 'vs/workbench/contrib/welcomeWalkthrough/common/walkThroughUtils';
 import { UILabelProvider } from 'vs/base/common/keybindingLabels';
 import { OS, OperatingSystem } from 'vs/base/common/platform';
@@ -493,34 +493,4 @@ registerThemingParticipant((theme, collector) => {
 		collector.addRule(`.monaco-workbench .part.editor > .content .walkThroughContent .monaco-editor-background,
 			.monaco-workbench .part.editor > .content .walkThroughContent .margin-view-overlays { background: ${color}; }`);
 	}
-	const link = theme.getColor(textLinkForeground);
-	if (link) {
-		collector.addRule(`.monaco-workbench .part.editor > .content .walkThroughContent a[href] { color: ${link}; }`);
-	}
-	const activeLink = theme.getColor(textLinkActiveForeground);
-	if (activeLink) {
-		collector.addRule(`.monaco-workbench .part.editor > .content .walkThroughContent a:hover,
-			.monaco-workbench .part.editor > .content .walkThroughContent a[href]:active { color: ${activeLink}; }`);
-	}
-	const focusColor = theme.getColor(focusBorder);
-	if (focusColor) {
-		collector.addRule(`.monaco-workbench .part.editor > .content .walkThroughContent a[href]:focus { outline-color: ${focusColor}; }`);
-	}
-	const shortcut = theme.getColor(textPreformatForeground);
-	if (shortcut) {
-		collector.addRule(`.monaco-workbench .part.editor > .content .walkThroughContent code,
-			.monaco-workbench .part.editor > .content .walkThroughContent .shortcut { color: ${shortcut}; }`);
-	}
-	const border = theme.getColor(contrastBorder);
-	if (border) {
-		collector.addRule(`.monaco-workbench .part.editor > .content .walkThroughContent .monaco-editor { border-color: ${border}; }`);
-	}
-	const quoteBackground = theme.getColor(textBlockQuoteBackground);
-	if (quoteBackground) {
-		collector.addRule(`.monaco-workbench .part.editor > .content .walkThroughContent blockquote { background: ${quoteBackground}; }`);
-	}
-	const quoteBorder = theme.getColor(textBlockQuoteBorder);
-	if (quoteBorder) {
-		collector.addRule(`.monaco-workbench .part.editor > .content .walkThroughContent blockquote { border-color: ${quoteBorder}; }`);
-	}
 });
diff --git a/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts b/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
index f259dceb44c7c3..c2528ada8006d7 100644
--- a/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
+++ b/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
@@ -28,7 +28,7 @@ import { WORKSPACE_TRUST_BANNER, WORKSPACE_TRUST_EMPTY_WINDOW, WORKSPACE_TRUST_E
 import { IEditorSerializer, IEditorFactoryRegistry, EditorExtensions } from 'vs/workbench/common/editor';
 import { EditorInput } from 'vs/workbench/common/editor/editorInput';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, IWorkspaceContextService, IWorkspaceFoldersWillChangeEvent, toWorkspaceIdentifier, WorkbenchState } from 'vs/platform/workspace/common/workspace';
+import { isEmptyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, IWorkspaceContextService, IWorkspaceFoldersWillChangeEvent, toWorkspaceIdentifier, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { dirname, resolve } from 'vs/base/common/path';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IMarkdownString, MarkdownString } from 'vs/base/common/htmlContent';
@@ -42,7 +42,7 @@ import { LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID } from 'vs/workbench/c
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { WORKSPACE_TRUST_SETTING_TAG } from 'vs/workbench/contrib/preferences/common/preferences';
 import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { ILabelService } from 'vs/platform/label/common/label';
+import { ILabelService, Verbosity } from 'vs/platform/label/common/label';
 import { IProductService } from 'vs/platform/product/common/productService';
 import { MANAGE_TRUST_COMMAND_ID, WorkspaceTrustContext } from 'vs/workbench/contrib/workspace/common/workspace';
 import { isWeb } from 'vs/base/common/platform';
@@ -299,8 +299,9 @@ export class WorkspaceTrustUXHandler extends Disposable implements IWorkbenchCon
 				localize('folderTrust', "Do you trust the authors of the files in this folder?");
 
 			let checkboxText: string | undefined;
-			const workspaceIdentifier = toWorkspaceIdentifier(this.workspaceContextService.getWorkspace())!;
+			const workspaceIdentifier = toWorkspaceIdentifier(this.workspaceContextService.getWorkspace());
 			const isSingleFolderWorkspace = isSingleFolderWorkspaceIdentifier(workspaceIdentifier);
+			const isEmptyWindow = isEmptyWorkspaceIdentifier(workspaceIdentifier);
 			if (this.workspaceTrustManagementService.canSetParentFolderTrust()) {
 				const { name } = splitName(splitName((workspaceIdentifier as ISingleFolderWorkspaceIdentifier).uri.fsPath).parentPath);
 				checkboxText = localize('checkboxString', "Trust the authors of all files in the parent folder '{0}'", name);
@@ -316,7 +317,8 @@ export class WorkspaceTrustUXHandler extends Disposable implements IWorkbenchCon
 						localize('workspaceStartupTrustDetails', "{0} provides features that may automatically execute files in this workspace.", this.productService.nameShort) :
 						localize('folderStartupTrustDetails', "{0} provides features that may automatically execute files in this folder.", this.productService.nameShort),
 					localize('startupTrustRequestLearnMore', "If you don't trust the authors of these files, we recommend to continue in restricted mode as the files may be malicious. See [our docs](https://aka.ms/vscode-workspace-trust) to learn more."),
-					`\`${this.labelService.getWorkspaceLabel(workspaceIdentifier, { verbose: true })}\``,
+					!isEmptyWindow ?
+						`\`${this.labelService.getWorkspaceLabel(workspaceIdentifier, { verbose: Verbosity.LONG })}\`` : '',
 				],
 				checkboxText
 			);
@@ -629,7 +631,7 @@ Registry.as<IEditorPaneRegistry>(EditorExtensions.EditorPane).registerEditorPane
  * Actions
  */
 
-// Configure Workspace Trust
+// Configure Workspace Trust Settings
 
 const CONFIGURE_TRUST_COMMAND_ID = 'workbench.trust.configure';
 const WORKSPACES_CATEGORY = { value: localize('workspacesCategory', "Workspaces"), original: 'Workspaces' };
@@ -638,7 +640,7 @@ registerAction2(class extends Action2 {
 	constructor() {
 		super({
 			id: CONFIGURE_TRUST_COMMAND_ID,
-			title: { original: 'Configure Workspace Trust', value: localize('configureWorkspaceTrust', "Configure Workspace Trust") },
+			title: { original: 'Configure Workspace Trust Settings', value: localize('configureWorkspaceTrustSettings', "Configure Workspace Trust Settings") },
 			precondition: ContextKeyExpr.and(WorkspaceTrustContext.IsEnabled, ContextKeyExpr.equals(`config.${WORKSPACE_TRUST_ENABLED}`, true)),
 			category: WORKSPACES_CATEGORY,
 			f1: true
diff --git a/src/vs/workbench/contrib/workspace/browser/workspaceTrustEditor.ts b/src/vs/workbench/contrib/workspace/browser/workspaceTrustEditor.ts
index b4bca640bd9d5a..6b0f22ee769d9e 100644
--- a/src/vs/workbench/contrib/workspace/browser/workspaceTrustEditor.ts
+++ b/src/vs/workbench/contrib/workspace/browser/workspaceTrustEditor.ts
@@ -292,14 +292,14 @@ class WorkspaceTrustedUrisTable extends Disposable {
 			if (segments.length === 0 && path.startsWith(posix.sep)) {
 				return {
 					type: MessageType.WARNING,
-					content: localize('trustAll', "You will trust all repositories on {0}.", getHostLabel(this.labelService, item))
+					content: localize({ key: 'trustAll', comment: ['The {0} will be a host name where repositories are hosted.'] }, "You will trust all repositories on {0}.", getHostLabel(this.labelService, item))
 				};
 			}
 
 			if (segments.length === 1) {
 				return {
 					type: MessageType.WARNING,
-					content: localize('trustOrg', "You will trust all repositories and forks under '{0}' on {1}.", segments[0], getHostLabel(this.labelService, item))
+					content: localize({ key: 'trustOrg', comment: ['The {0} will be an organization or user name.', 'The {1} will be a host name where repositories are hosted.'] }, "You will trust all repositories and forks under '{0}' on {1}.", segments[0], getHostLabel(this.labelService, item))
 				};
 			}
 
diff --git a/src/vs/workbench/contrib/xdg_data/fish/vendor_conf.d/vscode-shell-integration.fish b/src/vs/workbench/contrib/xdg_data/fish/vendor_conf.d/vscode-shell-integration.fish
new file mode 120000
index 00000000000000..c6e13ca1dfca21
--- /dev/null
+++ b/src/vs/workbench/contrib/xdg_data/fish/vendor_conf.d/vscode-shell-integration.fish
@@ -0,0 +1 @@
+../../../terminal/browser/media/shellIntegration.fish
\ No newline at end of file
diff --git a/src/vs/workbench/electron-sandbox/desktop.contribution.ts b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
index d63c51a6303cd1..1e9925c81065d1 100644
--- a/src/vs/workbench/electron-sandbox/desktop.contribution.ts
+++ b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
@@ -27,6 +27,7 @@ import { ShutdownReason } from 'vs/workbench/services/lifecycle/common/lifecycle
 import { NativeWindow } from 'vs/workbench/electron-sandbox/window';
 import { ModifierKeyEmitter } from 'vs/base/browser/dom';
 import product from 'vs/platform/product/common/product';
+import { applicationConfigurationNodeBase } from 'vs/workbench/common/configuration';
 
 // Actions
 (function registerActions(): void {
@@ -128,6 +129,22 @@ import product from 'vs/platform/product/common/product';
 (function registerConfiguration(): void {
 	const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
 
+	// Application
+	registry.registerConfiguration({
+		...applicationConfigurationNodeBase,
+		'properties': {
+			'application.shellEnvironmentResolutionTimeout': {
+				'type': 'number',
+				'default': 10,
+				'minimum': 1,
+				'maximum': 120,
+				'included': !isWindows,
+				'scope': ConfigurationScope.APPLICATION,
+				'markdownDescription': localize('application.shellEnvironmentResolutionTimeout', "Controls the timeout in seconds before giving up resolving the shell environment when the application is not already launched from a terminal. See our [documentation](https://go.microsoft.com/fwlink/?linkid=2149667) for more information.")
+			}
+		}
+	});
+
 	// Window
 	registry.registerConfiguration({
 		'id': 'window',
@@ -169,6 +186,7 @@ import product from 'vs/platform/product/common/product';
 			'window.zoomLevel': {
 				'type': 'number',
 				'default': 0,
+				'minimum': -5,
 				'description': localize('zoomLevel', "Adjust the zoom level of the window. The original size is 0 and each increment above (e.g. 1) or below (e.g. -1) represents zooming 20% larger or smaller. You can also enter decimals to adjust the zoom level with a finer granularity."),
 				ignoreSync: true,
 				tags: ['accessibility']
@@ -196,7 +214,7 @@ import product from 'vs/platform/product/common/product';
 				'type': 'boolean',
 				'default': false,
 				'scope': ConfigurationScope.APPLICATION,
-				'markdownDescription': localize('window.doubleClickIconToClose', "If enabled, double clicking the application icon in the title bar will close the window and the window cannot be dragged by the icon. This setting only has an effect when `#window.titleBarStyle#` is set to `custom`.")
+				'markdownDescription': localize('window.doubleClickIconToClose', "If enabled, this setting will close the window when the application icon in the title bar is double-clicked. The window will not be able to be dragged by the icon. This setting is effective only if `#window.titleBarStyle#` is set to `custom`.")
 			},
 			'window.titleBarStyle': {
 				'type': 'string',
@@ -335,7 +353,7 @@ import product from 'vs/platform/product/common/product';
 			},
 			'log-level': {
 				type: 'string',
-				description: localize('argv.logLevel', "Log level to use. Default is 'info'. Allowed values are 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'.")
+				description: localize('argv.logLevel', "Log level to use. Default is 'info'. Allowed values are 'error', 'warn', 'info', 'debug', 'trace', 'off'.")
 			}
 		}
 	};
diff --git a/src/vs/workbench/electron-sandbox/desktop.main.ts b/src/vs/workbench/electron-sandbox/desktop.main.ts
index 9e982bd0e5a31c..d18415cd6e088d 100644
--- a/src/vs/workbench/electron-sandbox/desktop.main.ts
+++ b/src/vs/workbench/electron-sandbox/desktop.main.ts
@@ -35,8 +35,7 @@ import { ISignService } from 'vs/platform/sign/common/sign';
 import { IProductService } from 'vs/platform/product/common/productService';
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { KeyboardLayoutService } from 'vs/workbench/services/keybinding/electron-sandbox/nativeKeyboardLayout';
-import { IKeyboardLayoutService } from 'vs/platform/keyboardLayout/common/keyboardLayout';
+import { ISandboxKeyboardLayoutService, SandboxKeyboardLayoutService } from 'vs/workbench/services/keybinding/electron-sandbox/sandboxKeyboardLayout';
 import { ElectronIPCMainProcessService } from 'vs/platform/ipc/electron-sandbox/mainProcessService';
 import { LoggerChannelClient, LogLevelChannelClient } from 'vs/platform/log/common/logIpc';
 import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
@@ -274,10 +273,10 @@ export class DesktopMain extends Disposable {
 				return service;
 			}),
 
-			this.createKeyboardLayoutService(mainProcessService).then(service => {
+			this.createSandboxKeyboardLayoutService(mainProcessService).then(service => {
 
 				// KeyboardLayout
-				serviceCollection.set(IKeyboardLayoutService, service);
+				serviceCollection.set(ISandboxKeyboardLayoutService, service);
 
 				return service;
 			})
@@ -318,12 +317,7 @@ export class DesktopMain extends Disposable {
 		}
 
 		// Otherwise, workspace is empty, so we derive an identifier
-		const emptyWorkspaceIdentifier = toWorkspaceIdentifier(this.configuration.backupPath, environmentService.isExtensionDevelopment);
-		if (!emptyWorkspaceIdentifier) {
-			throw new Error('Unable to resolve an empty workspace identifier from the environment');
-		}
-
-		return emptyWorkspaceIdentifier;
+		return toWorkspaceIdentifier(this.configuration.backupPath, environmentService.isExtensionDevelopment);
 	}
 
 	private async createWorkspaceService(
@@ -365,17 +359,17 @@ export class DesktopMain extends Disposable {
 		}
 	}
 
-	private async createKeyboardLayoutService(mainProcessService: IMainProcessService): Promise<KeyboardLayoutService> {
-		const keyboardLayoutService = new KeyboardLayoutService(mainProcessService);
+	private async createSandboxKeyboardLayoutService(mainProcessService: IMainProcessService): Promise<SandboxKeyboardLayoutService> {
+		const sandboxKeyboardLayoutService = new SandboxKeyboardLayoutService(mainProcessService);
 
 		try {
-			await keyboardLayoutService.initialize();
+			await sandboxKeyboardLayoutService.initialize();
 
-			return keyboardLayoutService;
+			return sandboxKeyboardLayoutService;
 		} catch (error) {
 			onUnexpectedError(error);
 
-			return keyboardLayoutService;
+			return sandboxKeyboardLayoutService;
 		}
 	}
 }
diff --git a/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts b/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts
index 88038f13135093..8471fcf166c5d4 100644
--- a/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts
+++ b/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getZoomFactor, isWCOVisible } from 'vs/base/browser/browser';
+import { getZoomFactor, isWCOEnabled } from 'vs/base/browser/browser';
 import { $, addDisposableListener, append, EventType, hide, show } from 'vs/base/browser/dom';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
@@ -165,7 +165,7 @@ export class TitlebarPart extends BrowserTitleBarPart {
 		}
 
 		// Window Controls (Native Windows/Linux)
-		if (!isMacintosh && getTitleBarStyle(this.configurationService) !== 'native' && !isWCOVisible() && this.windowControls) {
+		if (!isMacintosh && getTitleBarStyle(this.configurationService) !== 'native' && !isWCOEnabled() && this.windowControls) {
 			// Minimize
 			const minimizeIcon = append(this.windowControls, $('div.window-icon.window-minimize' + Codicon.chromeMinimize.cssSelector));
 			this._register(addDisposableListener(minimizeIcon, EventType.CLICK, e => {
diff --git a/src/vs/workbench/electron-sandbox/window.ts b/src/vs/workbench/electron-sandbox/window.ts
index e020a5eec2c2d8..cd78f5a9659021 100644
--- a/src/vs/workbench/electron-sandbox/window.ts
+++ b/src/vs/workbench/electron-sandbox/window.ts
@@ -7,7 +7,7 @@ import { localize } from 'vs/nls';
 import { URI } from 'vs/base/common/uri';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { equals } from 'vs/base/common/objects';
-import { EventType, EventHelper, addDisposableListener, scheduleAtNextAnimationFrame, ModifierKeyEmitter } from 'vs/base/browser/dom';
+import { EventType, EventHelper, addDisposableListener, ModifierKeyEmitter } from 'vs/base/browser/dom';
 import { Separator, WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from 'vs/base/common/actions';
 import { IFileService } from 'vs/platform/files/common/files';
 import { EditorResourceAccessor, IUntitledTextResourceEditorInput, SideBySideEditor, pathsToEditors, IResourceDiffEditorInput, IUntypedEditorInput, IEditorPane, isResourceEditorInput, IResourceMergeEditorInput } from 'vs/workbench/common/editor';
@@ -20,7 +20,7 @@ import { applyZoom } from 'vs/platform/window/electron-sandbox/window';
 import { setFullscreen, getZoomLevel } from 'vs/base/browser/browser';
 import { ICommandService, CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { IResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { ipcRenderer } from 'vs/base/parts/sandbox/electron-sandbox/globals';
+import { ipcRenderer, process } from 'vs/base/parts/sandbox/electron-sandbox/globals';
 import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing';
 import { IMenuService, MenuId, IMenu, MenuItemAction, MenuRegistry } from 'vs/platform/actions/common/actions';
 import { ICommandAction } from 'vs/platform/action/common/action';
@@ -68,6 +68,7 @@ import { dirname } from 'vs/base/common/resources';
 import { IBannerService } from 'vs/workbench/services/banner/browser/bannerService';
 import { Codicon } from 'vs/base/common/codicons';
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
+import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
 
 export class NativeWindow extends Disposable {
 
@@ -120,7 +121,8 @@ export class NativeWindow extends Disposable {
 		@IProgressService private readonly progressService: IProgressService,
 		@ILabelService private readonly labelService: ILabelService,
 		@IBannerService private readonly bannerService: IBannerService,
-		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
+		@IPreferencesService private readonly preferencesService: IPreferencesService
 	) {
 		super();
 
@@ -131,7 +133,7 @@ export class NativeWindow extends Disposable {
 	private registerListeners(): void {
 
 		// Layout
-		this._register(addDisposableListener(window, EventType.RESIZE, e => this.onWindowResize(e, true)));
+		this._register(addDisposableListener(window, EventType.RESIZE, e => this.onWindowResize(e)));
 
 		// React to editor input changes
 		this._register(this.editorService.onDidActiveEditorChange(() => this.updateTouchbarMenu()));
@@ -199,6 +201,14 @@ export class NativeWindow extends Disposable {
 				Severity.Error,
 				message,
 				[{
+					label: localize('restart', "Restart"),
+					run: () => this.nativeHostService.relaunch()
+				},
+				{
+					label: localize('configure', "Configure"),
+					run: () => this.preferencesService.openUserSettings({ query: 'application.shellEnvironmentResolutionTimeout' })
+				},
+				{
 					label: localize('learnMore', "Learn More"),
 					run: () => this.openerService.open('https://go.microsoft.com/fwlink/?linkid=2149667')
 				}]
@@ -493,20 +503,8 @@ export class NativeWindow extends Disposable {
 		}
 	}
 
-	private onWindowResize(e: UIEvent, retry: boolean): void {
+	private onWindowResize(e: UIEvent): void {
 		if (e.target === window) {
-			if (window.document && window.document.body && window.document.body.clientWidth === 0) {
-				// TODO@electron this is an electron issue on macOS when simple fullscreen is enabled
-				// where for some reason the window clientWidth is reported as 0 when switching
-				// between simple fullscreen and normal screen. In that case we schedule the layout
-				// call at the next animation frame once, in the hope that the dimensions are
-				// proper then.
-				if (retry) {
-					scheduleAtNextAnimationFrame(() => this.onWindowResize(e, false));
-				}
-				return;
-			}
-
 			this.layoutService.layout();
 		}
 	}
@@ -720,6 +718,15 @@ export class NativeWindow extends Disposable {
 				);
 			}
 		}
+
+		// Slow shell environment progress indicator
+		const shellEnv = process.shellEnv();
+		this.progressService.withProgress({
+			title: localize('resolveShellEnvironment', "Resolving shell environment..."),
+			location: ProgressLocation.Window,
+			delay: 1600,
+			buttons: [localize('learnMore', "Learn More")]
+		}, () => shellEnv, () => this.openerService.open('https://go.microsoft.com/fwlink/?linkid=2149667'));
 	}
 
 	private setupDriver(): void {
diff --git a/src/vs/workbench/services/actions/common/menusExtensionPoint.ts b/src/vs/workbench/services/actions/common/menusExtensionPoint.ts
index fe81a6da6bc0e5..629d38b20ebb41 100644
--- a/src/vs/workbench/services/actions/common/menusExtensionPoint.ts
+++ b/src/vs/workbench/services/actions/common/menusExtensionPoint.ts
@@ -148,6 +148,12 @@ const apiMenus: IAPIMenu[] = [
 		id: MenuId.ViewItemContext,
 		description: localize('view.itemContext', "The contributed view item context menu")
 	},
+	{
+		key: 'comments/comment/editorActions',
+		id: MenuId.CommentEditorActions,
+		description: localize('commentThread.editorActions', "The contributed comment editor actions"),
+		proposed: 'contribCommentEditorActionsMenu'
+	},
 	{
 		key: 'comments/commentThread/title',
 		id: MenuId.CommentThreadTitle,
diff --git a/src/vs/workbench/services/configuration/browser/configurationService.ts b/src/vs/workbench/services/configuration/browser/configurationService.ts
index 3ae0db4640b12e..5ba082f31ca4d9 100644
--- a/src/vs/workbench/services/configuration/browser/configurationService.ts
+++ b/src/vs/workbench/services/configuration/browser/configurationService.ts
@@ -12,7 +12,7 @@ import { Queue, Barrier, runWhenIdle, Promises } from 'vs/base/common/async';
 import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
 import { IWorkspaceContextService, Workspace as BaseWorkspace, WorkbenchState, IWorkspaceFolder, IWorkspaceFoldersChangeEvent, WorkspaceFolder, toWorkspaceFolder, isWorkspaceFolder, IWorkspaceFoldersWillChangeEvent, IEmptyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IWorkspaceIdentifier, IAnyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
 import { ConfigurationModel, ConfigurationChangeEvent, mergeChanges } from 'vs/platform/configuration/common/configurationModels';
-import { IConfigurationChangeEvent, ConfigurationTarget, IConfigurationOverrides, isConfigurationOverrides, IConfigurationData, IConfigurationValue, IConfigurationChange, ConfigurationTargetToString, IConfigurationUpdateOverrides, isConfigurationUpdateOverrides, IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IConfigurationChangeEvent, ConfigurationTarget, IConfigurationOverrides, isConfigurationOverrides, IConfigurationData, IConfigurationValue, IConfigurationChange, ConfigurationTargetToString, IConfigurationUpdateOverrides, isConfigurationUpdateOverrides, IConfigurationService, IConfigurationUpdateOptions } from 'vs/platform/configuration/common/configuration';
 import { IPolicyConfiguration, NullPolicyConfiguration, PolicyConfiguration } from 'vs/platform/configuration/common/configurations';
 import { Configuration } from 'vs/workbench/services/configuration/common/configurationModels';
 import { FOLDER_CONFIG_FOLDER_NAME, defaultSettingsSchemaId, userSettingsSchemaId, workspaceSettingsSchemaId, folderSettingsSchemaId, IConfigurationCache, machineSettingsSchemaId, LOCAL_MACHINE_SCOPES, IWorkbenchConfigurationService, RestrictedSettings, PROFILE_SCOPES, LOCAL_MACHINE_PROFILE_SCOPES, profileSettingsSchemaId } from 'vs/workbench/services/configuration/common/configuration';
@@ -330,8 +330,8 @@ export class WorkspaceService extends Disposable implements IWorkbenchConfigurat
 	updateValue(key: string, value: any): Promise<void>;
 	updateValue(key: string, value: any, overrides: IConfigurationOverrides | IConfigurationUpdateOverrides): Promise<void>;
 	updateValue(key: string, value: any, target: ConfigurationTarget): Promise<void>;
-	updateValue(key: string, value: any, overrides: IConfigurationOverrides | IConfigurationUpdateOverrides, target: ConfigurationTarget, donotNotifyError?: boolean): Promise<void>;
-	async updateValue(key: string, value: any, arg3?: any, arg4?: any, donotNotifyError?: any): Promise<void> {
+	updateValue(key: string, value: any, overrides: IConfigurationOverrides | IConfigurationUpdateOverrides, target: ConfigurationTarget, options?: IConfigurationUpdateOptions): Promise<void>;
+	async updateValue(key: string, value: any, arg3?: any, arg4?: any, options?: any): Promise<void> {
 		const overrides: IConfigurationUpdateOverrides | undefined = isConfigurationUpdateOverrides(arg3) ? arg3
 			: isConfigurationOverrides(arg3) ? { resource: arg3.resource, overrideIdentifiers: arg3.overrideIdentifier ? [arg3.overrideIdentifier] : undefined } : undefined;
 		const target: ConfigurationTarget | undefined = overrides ? arg4 : arg3;
@@ -355,7 +355,7 @@ export class WorkspaceService extends Disposable implements IWorkbenchConfigurat
 			}
 		}
 
-		await Promises.settled(targets.map(target => this.writeConfigurationValue(key, value, target, overrides, donotNotifyError)));
+		await Promises.settled(targets.map(target => this.writeConfigurationValue(key, value, target, overrides, options)));
 	}
 
 	async reloadConfiguration(target?: ConfigurationTarget | IWorkspaceFolder): Promise<void> {
@@ -971,7 +971,7 @@ export class WorkspaceService extends Disposable implements IWorkbenchConfigurat
 		return validWorkspaceFolders;
 	}
 
-	private async writeConfigurationValue(key: string, value: any, target: ConfigurationTarget, overrides: IConfigurationUpdateOverrides | undefined, donotNotifyError: boolean): Promise<void> {
+	private async writeConfigurationValue(key: string, value: any, target: ConfigurationTarget, overrides: IConfigurationUpdateOverrides | undefined, options?: IConfigurationUpdateOverrides): Promise<void> {
 		if (!this.instantiationService) {
 			throw new Error('Cannot write configuration because the configuration service is not yet ready to accept writes.');
 		}
@@ -998,7 +998,7 @@ export class WorkspaceService extends Disposable implements IWorkbenchConfigurat
 
 		// Use same instance of ConfigurationEditing to make sure all writes go through the same queue
 		this.configurationEditing = this.configurationEditing ?? this.instantiationService.createInstance(ConfigurationEditing, (await this.remoteAgentService.getEnvironment())?.settingsPath ?? null);
-		await this.configurationEditing.writeConfiguration(editableConfigurationTarget, { key, value }, { scopes: overrides, donotNotifyError });
+		await this.configurationEditing.writeConfiguration(editableConfigurationTarget, { key, value }, { scopes: overrides, ...options });
 		switch (editableConfigurationTarget) {
 			case EditableConfigurationTarget.USER_LOCAL:
 				if (this.applicationConfiguration && this.configurationRegistry.getConfigurationProperties()[key].scope === ConfigurationScope.APPLICATION) {
@@ -1109,9 +1109,9 @@ class RegisterConfigurationSchemasContribution extends Disposable implements IWo
 		super();
 		this.registerConfigurationSchemas();
 		const configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
-		this._register(configurationRegistry.onDidUpdateConfiguration(e => this.registerConfigurationSchemas()));
-		this._register(configurationRegistry.onDidSchemaChange(e => this.registerConfigurationSchemas()));
-		this._register(workspaceTrustManagementService.onDidChangeTrust(() => this.registerConfigurationSchemas()));
+
+		const anyEvent = Event.any(configurationRegistry.onDidUpdateConfiguration, configurationRegistry.onDidSchemaChange, workspaceTrustManagementService.onDidChangeTrust);
+		this._register(Event.debounce(anyEvent, () => undefined, 0)(() => this.registerConfigurationSchemas()));
 	}
 
 	private registerConfigurationSchemas(): void {
diff --git a/src/vs/workbench/services/configuration/common/configurationEditing.ts b/src/vs/workbench/services/configuration/common/configurationEditing.ts
index 73ca3d0bc65e2e..33919697053ac9 100644
--- a/src/vs/workbench/services/configuration/common/configurationEditing.ts
+++ b/src/vs/workbench/services/configuration/common/configurationEditing.ts
@@ -12,7 +12,7 @@ import { Edit, FormattingOptions } from 'vs/base/common/jsonFormatter';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IConfigurationService, IConfigurationUpdateOverrides } from 'vs/platform/configuration/common/configuration';
+import { IConfigurationService, IConfigurationUpdateOptions, IConfigurationUpdateOverrides } from 'vs/platform/configuration/common/configuration';
 import { FOLDER_SETTINGS_PATH, WORKSPACE_STANDALONE_CONFIGURATIONS, TASKS_CONFIGURATION_KEY, LAUNCH_CONFIGURATION_KEY, USER_STANDALONE_CONFIGURATIONS, TASKS_DEFAULT, FOLDER_SCOPES } from 'vs/workbench/services/configuration/common/configuration';
 import { FileOperationError, FileOperationResult, IFileService } from 'vs/platform/files/common/files';
 import { IResolvedTextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
@@ -114,11 +114,7 @@ export interface IConfigurationValue {
 	value: any;
 }
 
-export interface IConfigurationEditingOptions {
-	/**
-	 * If `true`, do not notifies the error to user by showing the message box. Default is `false`.
-	 */
-	donotNotifyError?: boolean;
+export interface IConfigurationEditingOptions extends IConfigurationUpdateOptions {
 	/**
 	 * Scope of configuration to be written into.
 	 */
@@ -139,10 +135,6 @@ interface IConfigurationEditOperation extends IConfigurationValue {
 	workspaceStandAloneConfigurationKey?: string;
 }
 
-interface ConfigurationEditingOptions extends IConfigurationEditingOptions {
-	handleDirtyFile?: 'save' | 'revert';
-}
-
 export class ConfigurationEditing {
 
 	public _serviceBrand: undefined;
@@ -181,7 +173,7 @@ export class ConfigurationEditing {
 		});
 	}
 
-	private async doWriteConfiguration(operation: IConfigurationEditOperation, options: ConfigurationEditingOptions): Promise<void> {
+	private async doWriteConfiguration(operation: IConfigurationEditOperation, options: IConfigurationEditingOptions): Promise<void> {
 		await this.validate(operation.target, operation, !options.handleDirtyFile, options.scopes || {});
 		const resource: URI = operation.resource!;
 		const reference = await this.resolveModelReference(resource);
@@ -193,7 +185,7 @@ export class ConfigurationEditing {
 		}
 	}
 
-	private async updateConfiguration(operation: IConfigurationEditOperation, model: ITextModel, formattingOptions: FormattingOptions, options: ConfigurationEditingOptions): Promise<void> {
+	private async updateConfiguration(operation: IConfigurationEditOperation, model: ITextModel, formattingOptions: FormattingOptions, options: IConfigurationEditingOptions): Promise<void> {
 		if (this.hasParseErrors(model.getValue(), operation)) {
 			throw this.toConfigurationEditingError(ConfigurationEditingErrorCode.ERROR_INVALID_CONFIGURATION, operation.target, operation);
 		}
@@ -301,7 +293,7 @@ export class ConfigurationEditing {
 					label: nls.localize('saveAndRetry', "Save and Retry"),
 					run: () => {
 						const key = operation.key ? `${operation.workspaceStandAloneConfigurationKey}.${operation.key}` : operation.workspaceStandAloneConfigurationKey!;
-						this.writeConfiguration(operation.target, { key, value: operation.value }, <ConfigurationEditingOptions>{ handleDirtyFile: 'save', scopes });
+						this.writeConfiguration(operation.target, { key, value: operation.value }, <IConfigurationEditingOptions>{ handleDirtyFile: 'save', scopes });
 					}
 				},
 				{
@@ -313,7 +305,7 @@ export class ConfigurationEditing {
 			this.notificationService.prompt(Severity.Error, error.message,
 				[{
 					label: nls.localize('saveAndRetry', "Save and Retry"),
-					run: () => this.writeConfiguration(operation.target, { key: operation.key, value: operation.value }, <ConfigurationEditingOptions>{ handleDirtyFile: 'save', scopes })
+					run: () => this.writeConfiguration(operation.target, { key: operation.key, value: operation.value }, <IConfigurationEditingOptions>{ handleDirtyFile: 'save', scopes })
 				},
 				{
 					label: nls.localize('open', "Open Settings"),
diff --git a/src/vs/workbench/services/configuration/common/jsonEditing.ts b/src/vs/workbench/services/configuration/common/jsonEditing.ts
index b5dc176eb0a6ce..ea4e426b1c4a10 100644
--- a/src/vs/workbench/services/configuration/common/jsonEditing.ts
+++ b/src/vs/workbench/services/configuration/common/jsonEditing.ts
@@ -11,11 +11,6 @@ export const IJSONEditingService = createDecorator<IJSONEditingService>('jsonEdi
 
 export const enum JSONEditingErrorCode {
 
-	/**
-	 * Error when trying to write and save to the file while it is dirty in the editor.
-	 */
-	ERROR_FILE_DIRTY,
-
 	/**
 	 * Error when trying to write to a file that contains JSON errors.
 	 */
diff --git a/src/vs/workbench/services/configuration/common/jsonEditingService.ts b/src/vs/workbench/services/configuration/common/jsonEditingService.ts
index e906a376240e82..31ca52ef0f0e55 100644
--- a/src/vs/workbench/services/configuration/common/jsonEditingService.ts
+++ b/src/vs/workbench/services/configuration/common/jsonEditingService.ts
@@ -34,26 +34,26 @@ export class JSONEditingService implements IJSONEditingService {
 		this.queue = new Queue<void>();
 	}
 
-	write(resource: URI, values: IJSONValue[], save: boolean): Promise<void> {
-		return Promise.resolve(this.queue.queue(() => this.doWriteConfiguration(resource, values, save))); // queue up writes to prevent race conditions
+	write(resource: URI, values: IJSONValue[]): Promise<void> {
+		return Promise.resolve(this.queue.queue(() => this.doWriteConfiguration(resource, values))); // queue up writes to prevent race conditions
 	}
 
-	private async doWriteConfiguration(resource: URI, values: IJSONValue[], save: boolean): Promise<void> {
-		const reference = await this.resolveAndValidate(resource, save);
+	private async doWriteConfiguration(resource: URI, values: IJSONValue[]): Promise<void> {
+		const reference = await this.resolveAndValidate(resource, true);
 		try {
-			await this.writeToBuffer(reference.object.textEditorModel, values, save);
+			await this.writeToBuffer(reference.object.textEditorModel, values);
 		} finally {
 			reference.dispose();
 		}
 	}
 
-	private async writeToBuffer(model: ITextModel, values: IJSONValue[], save: boolean): Promise<any> {
+	private async writeToBuffer(model: ITextModel, values: IJSONValue[]): Promise<any> {
 		let hasEdits: boolean = false;
 		for (const value of values) {
 			const edit = this.getEdits(model, value)[0];
 			hasEdits = this.applyEditsToBuffer(edit, model);
 		}
-		if (hasEdits && save) {
+		if (hasEdits) {
 			return this.textFileService.save(model.uri);
 		}
 	}
@@ -113,12 +113,6 @@ export class JSONEditingService implements IJSONEditingService {
 			return this.reject<IReference<IResolvedTextEditorModel>>(JSONEditingErrorCode.ERROR_INVALID_FILE);
 		}
 
-		// Target cannot be dirty if not writing into buffer
-		if (checkDirty && this.textFileService.isDirty(resource)) {
-			reference.dispose();
-			return this.reject<IReference<IResolvedTextEditorModel>>(JSONEditingErrorCode.ERROR_FILE_DIRTY);
-		}
-
 		return reference;
 	}
 
@@ -133,9 +127,6 @@ export class JSONEditingService implements IJSONEditingService {
 			case JSONEditingErrorCode.ERROR_INVALID_FILE: {
 				return nls.localize('errorInvalidFile', "Unable to write into the file. Please open the file to correct errors/warnings in the file and try again.");
 			}
-			case JSONEditingErrorCode.ERROR_FILE_DIRTY: {
-				return nls.localize('errorFileDirty', "Unable to write into the file because the file has unsaved changes. Please save the file and try again.");
-			}
 		}
 	}
 }
diff --git a/src/vs/workbench/services/configuration/test/browser/configurationService.test.ts b/src/vs/workbench/services/configuration/test/browser/configurationService.test.ts
index c37183e8f48bc3..4dc05d95008625 100644
--- a/src/vs/workbench/services/configuration/test/browser/configurationService.test.ts
+++ b/src/vs/workbench/services/configuration/test/browser/configurationService.test.ts
@@ -565,7 +565,7 @@ suite('WorkspaceService - Initialization', () => {
 
 		assert.strictEqual(testObject.getValue('initialization.testSetting1'), 'workspaceValue');
 		assert.strictEqual(target.callCount, 5);
-		assert.deepStrictEqual((<IConfigurationChangeEvent>target.args[0][0]).affectedKeys, ['initialization.testSetting1']);
+		assert.deepStrictEqual([...(<IConfigurationChangeEvent>target.args[0][0]).affectedKeys], ['initialization.testSetting1']);
 		assert.deepStrictEqual(target.args[1], [WorkbenchState.FOLDER]);
 		assert.deepStrictEqual(target.args[2], [undefined]);
 		assert.deepStrictEqual((<IWorkspaceFoldersChangeEvent>target.args[4][0]).added.map(f => f.uri.toString()), [folder.toString()]);
@@ -614,7 +614,7 @@ suite('WorkspaceService - Initialization', () => {
 		await testObject.initialize(getWorkspaceIdentifier(configResource));
 
 		assert.strictEqual(target.callCount, 5);
-		assert.deepStrictEqual((<IConfigurationChangeEvent>target.args[0][0]).affectedKeys, ['initialization.testSetting1', 'initialization.testSetting2']);
+		assert.deepStrictEqual([...(<IConfigurationChangeEvent>target.args[0][0]).affectedKeys], ['initialization.testSetting1', 'initialization.testSetting2']);
 		assert.deepStrictEqual(target.args[1], [WorkbenchState.WORKSPACE]);
 		assert.deepStrictEqual(target.args[2], [undefined]);
 		assert.deepStrictEqual((<IWorkspaceFoldersChangeEvent>target.args[4][0]).added.map(folder => folder.uri.toString()), [joinPath(ROOT, 'a').toString(), joinPath(ROOT, 'b').toString()]);
@@ -660,7 +660,7 @@ suite('WorkspaceService - Initialization', () => {
 
 		assert.strictEqual(testObject.getValue('initialization.testSetting1'), 'workspaceValue2');
 		assert.strictEqual(target.callCount, 3);
-		assert.deepStrictEqual((<IConfigurationChangeEvent>target.args[0][0]).affectedKeys, ['initialization.testSetting1']);
+		assert.deepStrictEqual([...(<IConfigurationChangeEvent>target.args[0][0]).affectedKeys], ['initialization.testSetting1']);
 		assert.deepStrictEqual((<IWorkspaceFoldersChangeEvent>target.args[2][0]).added.map(folder_1 => folder_1.uri.toString()), [joinPath(ROOT, 'b').toString()]);
 		assert.deepStrictEqual((<IWorkspaceFoldersChangeEvent>target.args[2][0]).removed.map(folder_2 => folder_2.uri.toString()), [joinPath(ROOT, 'a').toString()]);
 		assert.deepStrictEqual((<IWorkspaceFoldersChangeEvent>target.args[2][0]).changed, []);
@@ -680,7 +680,7 @@ suite('WorkspaceService - Initialization', () => {
 		await testObject.initialize(getWorkspaceIdentifier(configResource));
 
 		assert.strictEqual(target.callCount, 5);
-		assert.deepStrictEqual((<IConfigurationChangeEvent>target.args[0][0]).affectedKeys, ['initialization.testSetting1']);
+		assert.deepStrictEqual([...(<IConfigurationChangeEvent>target.args[0][0]).affectedKeys], ['initialization.testSetting1']);
 		assert.deepStrictEqual(target.args[1], [WorkbenchState.WORKSPACE]);
 		assert.deepStrictEqual(target.args[2], [undefined]);
 		assert.deepStrictEqual((<IWorkspaceFoldersChangeEvent>target.args[4][0]).added.map(folder_1 => folder_1.uri.toString()), [joinPath(ROOT, 'b').toString()]);
@@ -997,7 +997,7 @@ suite('WorkspaceConfigurationService - Folder', () => {
 			await fileService.writeFile(environmentService.policyFile!, VSBuffer.fromString('{ "configurationService.folder.policySetting": "policyValue" }'));
 			return promise;
 		});
-		assert.deepStrictEqual(result.affectedKeys, ['configurationService.folder.policySetting']);
+		assert.deepStrictEqual([...result.affectedKeys], ['configurationService.folder.policySetting']);
 		assert.strictEqual(testObject.getValue('configurationService.folder.policySetting'), 'policyValue');
 		assert.strictEqual(testObject.inspect('configurationService.folder.policySetting').policyValue, 'policyValue');
 	}));
@@ -1277,12 +1277,12 @@ suite('WorkspaceConfigurationService - Folder', () => {
 	}));
 
 	test('update application setting into workspace configuration in a workspace is not supported', () => {
-		return testObject.updateValue('configurationService.folder.applicationSetting', 'workspaceValue', {}, ConfigurationTarget.WORKSPACE, true)
+		return testObject.updateValue('configurationService.folder.applicationSetting', 'workspaceValue', {}, ConfigurationTarget.WORKSPACE, { donotNotifyError: true })
 			.then(() => assert.fail('Should not be supported'), (e) => assert.strictEqual(e.code, ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_CONFIGURATION_APPLICATION));
 	});
 
 	test('update machine setting into workspace configuration in a workspace is not supported', () => {
-		return testObject.updateValue('configurationService.folder.machineSetting', 'workspaceValue', {}, ConfigurationTarget.WORKSPACE, true)
+		return testObject.updateValue('configurationService.folder.machineSetting', 'workspaceValue', {}, ConfigurationTarget.WORKSPACE, { donotNotifyError: true })
 			.then(() => assert.fail('Should not be supported'), (e) => assert.strictEqual(e.code, ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_CONFIGURATION_MACHINE));
 	});
 
@@ -1436,7 +1436,7 @@ suite('WorkspaceConfigurationService - Folder', () => {
 		testObject.updateWorkspaceTrust(false);
 
 		const event = await promise;
-		assert.ok(event.affectedKeys.includes('configurationService.folder.restrictedSetting'));
+		assert.ok(event.affectedKeys.has('configurationService.folder.restrictedSetting'));
 		assert.ok(event.affectsConfiguration('configurationService.folder.restrictedSetting'));
 	}));
 
@@ -1485,7 +1485,7 @@ suite('WorkspaceConfigurationService - Folder', () => {
 		testObject.updateWorkspaceTrust(true);
 
 		const event = await promise;
-		assert.ok(event.affectedKeys.includes('configurationService.folder.restrictedSetting'));
+		assert.ok(event.affectedKeys.has('configurationService.folder.restrictedSetting'));
 		assert.ok(event.affectsConfiguration('configurationService.folder.restrictedSetting'));
 	}));
 
@@ -1650,7 +1650,7 @@ suite('WorkspaceConfigurationService - Profiles', () => {
 		await userDataProfileService.updateCurrentProfile(instantiationService.get(IUserDataProfilesService).defaultProfile, false);
 
 		const changeEvent = await promise;
-		assert.deepStrictEqual(changeEvent.affectedKeys, ['configurationService.profiles.testSetting']);
+		assert.deepStrictEqual([...changeEvent.affectedKeys], ['configurationService.profiles.testSetting']);
 		assert.strictEqual(testObject.getValue('configurationService.profiles.applicationSetting'), 'applicationValue');
 		assert.strictEqual(testObject.getValue('configurationService.profiles.testSetting'), 'userValue');
 	}));
@@ -1666,7 +1666,7 @@ suite('WorkspaceConfigurationService - Profiles', () => {
 		await userDataProfileService.updateCurrentProfile(profile, false);
 
 		const changeEvent = await promise;
-		assert.deepStrictEqual(changeEvent.affectedKeys, ['configurationService.profiles.testSetting']);
+		assert.deepStrictEqual([...changeEvent.affectedKeys], ['configurationService.profiles.testSetting']);
 		assert.strictEqual(testObject.getValue('configurationService.profiles.applicationSetting'), 'applicationValue');
 		assert.strictEqual(testObject.getValue('configurationService.profiles.testSetting'), 'profileValue2');
 	}));
@@ -1949,7 +1949,7 @@ suite('WorkspaceConfigurationService-Multiroot', () => {
 		assert.strictEqual(testObject.getValue('configurationService.workspace.testNewApplicationSetting', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'userValue');
 	}));
 
-	test('application settings are not read from workspace folder after defaults are registered', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
+	test('machine settings are not read from workspace folder after defaults are registered', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
 		await fileService.writeFile(userDataProfileService.currentProfile.settingsResource, VSBuffer.fromString('{ "configurationService.workspace.testNewMachineSetting": "userValue" }'));
 		await fileService.writeFile(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json'), VSBuffer.fromString('{ "configurationService.workspace.testNewMachineSetting": "workspaceFolderValue" }'));
 		await testObject.reloadConfiguration();
@@ -2261,12 +2261,12 @@ suite('WorkspaceConfigurationService-Multiroot', () => {
 	}));
 
 	test('update application setting into workspace configuration in a workspace is not supported', () => {
-		return testObject.updateValue('configurationService.workspace.applicationSetting', 'workspaceValue', {}, ConfigurationTarget.WORKSPACE, true)
+		return testObject.updateValue('configurationService.workspace.applicationSetting', 'workspaceValue', {}, ConfigurationTarget.WORKSPACE, { donotNotifyError: true })
 			.then(() => assert.fail('Should not be supported'), (e) => assert.strictEqual(e.code, ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_CONFIGURATION_APPLICATION));
 	});
 
 	test('update machine setting into workspace configuration in a workspace is not supported', () => {
-		return testObject.updateValue('configurationService.workspace.machineSetting', 'workspaceValue', {}, ConfigurationTarget.WORKSPACE, true)
+		return testObject.updateValue('configurationService.workspace.machineSetting', 'workspaceValue', {}, ConfigurationTarget.WORKSPACE, { donotNotifyError: true })
 			.then(() => assert.fail('Should not be supported'), (e) => assert.strictEqual(e.code, ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_CONFIGURATION_MACHINE));
 	});
 
@@ -2341,14 +2341,14 @@ suite('WorkspaceConfigurationService-Multiroot', () => {
 
 	test('update launch configuration in a workspace', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
 		const workspace = workspaceContextService.getWorkspace();
-		await testObject.updateValue('launch', { 'version': '1.0.0', configurations: [{ 'name': 'myLaunch' }] }, { resource: workspace.folders[0].uri }, ConfigurationTarget.WORKSPACE, true);
+		await testObject.updateValue('launch', { 'version': '1.0.0', configurations: [{ 'name': 'myLaunch' }] }, { resource: workspace.folders[0].uri }, ConfigurationTarget.WORKSPACE, { donotNotifyError: true });
 		assert.deepStrictEqual(testObject.getValue('launch'), { 'version': '1.0.0', configurations: [{ 'name': 'myLaunch' }] });
 	}));
 
 	test('update tasks configuration in a workspace', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
 		const workspace = workspaceContextService.getWorkspace();
 		const tasks = { 'version': '2.0.0', tasks: [{ 'label': 'myTask' }] };
-		await testObject.updateValue('tasks', tasks, { resource: workspace.folders[0].uri }, ConfigurationTarget.WORKSPACE, true);
+		await testObject.updateValue('tasks', tasks, { resource: workspace.folders[0].uri }, ConfigurationTarget.WORKSPACE, { donotNotifyError: true });
 		assert.deepStrictEqual(testObject.getValue(TasksSchemaProperties.Tasks), tasks);
 	}));
 
@@ -2549,7 +2549,7 @@ suite('WorkspaceConfigurationService - Remote Folder', () => {
 			testObject.onDidChangeConfiguration(event => {
 				try {
 					assert.strictEqual(event.source, ConfigurationTarget.USER);
-					assert.deepStrictEqual(event.affectedKeys, ['configurationService.remote.machineSetting']);
+					assert.deepStrictEqual([...event.affectedKeys], ['configurationService.remote.machineSetting']);
 					assert.strictEqual(testObject.getValue('configurationService.remote.machineSetting'), 'remoteValue');
 					c();
 				} catch (error) {
@@ -2569,7 +2569,7 @@ suite('WorkspaceConfigurationService - Remote Folder', () => {
 			testObject.onDidChangeConfiguration(event => {
 				try {
 					assert.strictEqual(event.source, ConfigurationTarget.USER);
-					assert.deepStrictEqual(event.affectedKeys, ['configurationService.remote.machineSetting']);
+					assert.deepStrictEqual([...event.affectedKeys], ['configurationService.remote.machineSetting']);
 					assert.strictEqual(testObject.getValue('configurationService.remote.machineSetting'), 'remoteValue');
 					c();
 				} catch (error) {
diff --git a/src/vs/workbench/services/configurationResolver/common/variableResolver.ts b/src/vs/workbench/services/configurationResolver/common/variableResolver.ts
index 1da1b0334df4c5..a8a2cd9e38061a 100644
--- a/src/vs/workbench/services/configurationResolver/common/variableResolver.ts
+++ b/src/vs/workbench/services/configurationResolver/common/variableResolver.ts
@@ -194,7 +194,7 @@ export class AbstractVariableResolverService implements IConfigurationResolverSe
 
 			const filePath = this._context.getFilePath();
 			if (filePath) {
-				return filePath;
+				return normalizeDriveLetter(filePath);
 			}
 			throw new VariableError(variableKind, (localize('canNotResolveFile', "Variable {0} can not be resolved. Please open an editor.", match)));
 		};
@@ -206,7 +206,7 @@ export class AbstractVariableResolverService implements IConfigurationResolverSe
 			if (this._context.getWorkspaceFolderPathForFile) {
 				const folderPath = this._context.getWorkspaceFolderPathForFile();
 				if (folderPath) {
-					return folderPath;
+					return normalizeDriveLetter(folderPath);
 				}
 			}
 			throw new VariableError(variableKind, localize('canNotResolveFolderForFile', "Variable {0}: can not find workspace folder of '{1}'.", match, paths.basename(filePath)));
@@ -291,7 +291,7 @@ export class AbstractVariableResolverService implements IConfigurationResolverSe
 
 					case 'workspaceRootFolderName':
 					case 'workspaceFolderBasename':
-						return paths.basename(this.fsPath(getFolderUri(VariableKind.WorkspaceFolderBasename)));
+						return normalizeDriveLetter(paths.basename(this.fsPath(getFolderUri(VariableKind.WorkspaceFolderBasename))));
 
 					case 'userHome': {
 						if (environment.userHome) {
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 e2b42221a76bdb..486908e2e86ebe 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
@@ -18,7 +18,7 @@ import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { IFormatterChangeEvent, ILabelService, ResourceLabelFormatter } from 'vs/platform/label/common/label';
+import { IFormatterChangeEvent, ILabelService, ResourceLabelFormatter, Verbosity } from 'vs/platform/label/common/label';
 import { IWorkspace, IWorkspaceFolder, IWorkspaceIdentifier, Workspace } from 'vs/platform/workspace/common/workspace';
 import { testWorkspace } from 'vs/platform/workspace/test/common/testWorkspace';
 import { BaseConfigurationResolverService } from 'vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService';
@@ -280,26 +280,6 @@ suite('Configuration Resolver Service', () => {
 		}
 	});
 
-	test('substitute one env variable as array and a configuration variable', async () => {
-		const configurationService = new TestConfigurationService({
-			editor: {
-				fontFamily: ['foo']
-			},
-			terminal: {
-				integrated: {
-					fontFamily: 'bar'
-				}
-			}
-		});
-
-		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(environmentService.userEnv), new TestEditorServiceWithActiveEditor(), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService);
-		if (platform.isWindows) {
-			assert.strictEqual(await service.resolveAsync(workspace, 'abc ${config:editor.fontFamily} ${workspaceFolder} ${env:key1} xyz'), 'abc foo \\VSCode\\workspaceLocation Value for key1 xyz');
-		} else {
-			assert.strictEqual(await service.resolveAsync(workspace, 'abc ${config:editor.fontFamily} ${workspaceFolder} ${env:key1} xyz'), 'abc foo /VSCode/workspaceLocation Value for key1 xyz');
-		}
-	});
-
 	test('substitute many env variable and a configuration variable', async () => {
 		const configurationService = new TestConfigurationService({
 			editor: {
@@ -699,7 +679,7 @@ class MockLabelService implements ILabelService {
 	getUriBasenameLabel(resource: URI): string {
 		throw new Error('Method not implemented.');
 	}
-	getWorkspaceLabel(workspace: URI | IWorkspaceIdentifier | IWorkspace, options?: { verbose: boolean }): string {
+	getWorkspaceLabel(workspace: URI | IWorkspaceIdentifier | IWorkspace, options?: { verbose: Verbosity }): string {
 		throw new Error('Method not implemented.');
 	}
 	getHostLabel(scheme: string, authority?: string): string {
diff --git a/src/vs/workbench/services/decorations/browser/decorationsService.ts b/src/vs/workbench/services/decorations/browser/decorationsService.ts
index 4502eeeff06aee..d59d765038e133 100644
--- a/src/vs/workbench/services/decorations/browser/decorationsService.ts
+++ b/src/vs/workbench/services/decorations/browser/decorationsService.ts
@@ -224,7 +224,7 @@ class FileDecorationChangeEvent implements IResourceDecorationChangeEvent {
 	}
 
 	affectsResource(uri: URI): boolean {
-		return this._data.get(uri) ?? this._data.findSuperstr(uri) !== undefined;
+		return this._data.hasElementOrSubtree(uri);
 	}
 }
 
diff --git a/src/vs/workbench/services/editor/browser/editorService.ts b/src/vs/workbench/services/editor/browser/editorService.ts
index 0c78bf083bccaf..874feb67c2738b 100644
--- a/src/vs/workbench/services/editor/browser/editorService.ts
+++ b/src/vs/workbench/services/editor/browser/editorService.ts
@@ -29,7 +29,6 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace
 import { indexOfPath } from 'vs/base/common/extpath';
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 import { IEditorResolverService, ResolvedStatus } from 'vs/workbench/services/editor/common/editorResolverService';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
 import { IWorkspaceTrustRequestService, WorkspaceTrustUriResponse } from 'vs/platform/workspace/common/workspaceTrust';
 import { IHostService } from 'vs/workbench/services/host/browser/host';
 import { findGroup } from 'vs/workbench/services/editor/common/editorGroupFinder';
@@ -69,7 +68,6 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
 		@IEditorResolverService private readonly editorResolverService: IEditorResolverService,
-		@IWorkingCopyService private readonly workingCopyService: IWorkingCopyService,
 		@IWorkspaceTrustRequestService private readonly workspaceTrustRequestService: IWorkspaceTrustRequestService,
 		@IHostService private readonly hostService: IHostService,
 		@ITextEditorService private readonly textEditorService: ITextEditorService
@@ -316,9 +314,7 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 				// Handle deletes in opened editors depending on:
 				// - we close any editor when `closeOnFileDelete: true`
 				// - we close any editor when the delete occurred from within VSCode
-				// - we close any editor without resolved working copy assuming that
-				//   this editor could not be opened after the file is gone
-				if (this.closeOnFileDelete || !isExternal || !this.workingCopyService.has(resource)) {
+				if (this.closeOnFileDelete || !isExternal) {
 
 					// Do NOT close any opened editor that matches the resource path (either equal or being parent) of the
 					// resource we move to (movedTo). Otherwise we would close a resource that has been renamed to the same
diff --git a/src/vs/workbench/services/extensionManagement/browser/extensionBisect.ts b/src/vs/workbench/services/extensionManagement/browser/extensionBisect.ts
index c9d26ad3b32e06..366a1bbf6356a2 100644
--- a/src/vs/workbench/services/extensionManagement/browser/extensionBisect.ts
+++ b/src/vs/workbench/services/extensionManagement/browser/extensionBisect.ts
@@ -24,6 +24,7 @@ import { IWorkbenchIssueService } from 'vs/workbench/services/issue/common/issue
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { Categories } from 'vs/platform/action/common/actionCommonCategories';
+import { IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
 
 // --- bisect service
 
@@ -235,11 +236,10 @@ registerAction2(class extends Action2 {
 		const dialogService = accessor.get(IDialogService);
 		const hostService = accessor.get(IHostService);
 		const extensionManagement = accessor.get(IExtensionManagementService);
-		const extensionEnablementService = accessor.get(IGlobalExtensionEnablementService);
+		const extensionEnablementService = accessor.get(IWorkbenchExtensionEnablementService);
 		const extensionsBisect = accessor.get(IExtensionBisectService);
 
-		const disabled = new Set(extensionEnablementService.getDisabledExtensions().map(id => id.id));
-		const extensions = (await extensionManagement.getInstalled(ExtensionType.User)).filter(ext => !disabled.has(ext.identifier.id));
+		const extensions = (await extensionManagement.getInstalled(ExtensionType.User)).filter(ext => extensionEnablementService.isEnabled(ext));
 
 		const res = await dialogService.confirm({
 			message: localize('msg.start', "Extension Bisect"),
diff --git a/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts b/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
index 94369a63ef3aca..bd4f4ab15f7670 100644
--- a/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
+++ b/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
@@ -55,7 +55,7 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 		@IUserDataSyncAccountService private readonly userDataSyncAccountService: IUserDataSyncAccountService,
 		@ILifecycleService private readonly lifecycleService: ILifecycleService,
 		@INotificationService private readonly notificationService: INotificationService,
-		@IHostService readonly hostService: IHostService,
+		@IHostService hostService: IHostService,
 		@IExtensionBisectService private readonly extensionBisectService: IExtensionBisectService,
 		@IWorkspaceTrustManagementService private readonly workspaceTrustManagementService: IWorkspaceTrustManagementService,
 		@IWorkspaceTrustRequestService private readonly workspaceTrustRequestService: IWorkspaceTrustRequestService,
diff --git a/src/vs/workbench/services/extensionRecommendations/common/extensionRecommendations.ts b/src/vs/workbench/services/extensionRecommendations/common/extensionRecommendations.ts
index d23438cde7719f..b623a54473c86c 100644
--- a/src/vs/workbench/services/extensionRecommendations/common/extensionRecommendations.ts
+++ b/src/vs/workbench/services/extensionRecommendations/common/extensionRecommendations.ts
@@ -24,7 +24,7 @@ export const enum ExtensionRecommendationReason {
 	Application,
 }
 
-export interface IExtensionRecommendationReson {
+export interface IExtensionRecommendationReason {
 	reasonId: ExtensionRecommendationReason;
 	reasonText: string;
 }
@@ -35,7 +35,7 @@ export interface IExtensionRecommendationsService {
 	readonly _serviceBrand: undefined;
 
 	readonly onDidChangeRecommendations: Event<void>;
-	getAllRecommendationsWithReason(): IStringDictionary<IExtensionRecommendationReson>;
+	getAllRecommendationsWithReason(): IStringDictionary<IExtensionRecommendationReason>;
 
 	getImportantRecommendations(): Promise<string[]>;
 	getOtherRecommendations(): Promise<string[]>;
diff --git a/src/vs/workbench/services/extensions/common/extensionDescriptionRegistry.ts b/src/vs/workbench/services/extensions/common/extensionDescriptionRegistry.ts
index 0277a064de7cf5..d788251d88e705 100644
--- a/src/vs/workbench/services/extensions/common/extensionDescriptionRegistry.ts
+++ b/src/vs/workbench/services/extensions/common/extensionDescriptionRegistry.ts
@@ -14,6 +14,23 @@ export class DeltaExtensionsResult {
 }
 
 export class ExtensionDescriptionRegistry {
+
+	public static isHostExtension(extensionId: ExtensionIdentifier | string, myRegistry: ExtensionDescriptionRegistry, globalRegistry: ExtensionDescriptionRegistry): boolean {
+		if (myRegistry.getExtensionDescription(extensionId)) {
+			// I have this extension
+			return false;
+		}
+		const extensionDescription = globalRegistry.getExtensionDescription(extensionId);
+		if (!extensionDescription) {
+			// unknown extension
+			return false;
+		}
+		if ((extensionDescription.main || extensionDescription.browser) && extensionDescription.api === 'none') {
+			return true;
+		}
+		return false;
+	}
+
 	private readonly _onDidChange = new Emitter<void>();
 	public readonly onDidChange = this._onDidChange.event;
 
diff --git a/src/vs/workbench/services/extensions/common/extensionHostManager.ts b/src/vs/workbench/services/extensions/common/extensionHostManager.ts
index 6dd0f2be6df7e2..0d0ecf8263e5b1 100644
--- a/src/vs/workbench/services/extensions/common/extensionHostManager.ts
+++ b/src/vs/workbench/services/extensions/common/extensionHostManager.ts
@@ -21,12 +21,13 @@ import { StopWatch } from 'vs/base/common/stopwatch';
 import { VSBuffer } from 'vs/base/common/buffer';
 import { IExtensionHost, ExtensionHostKind, ActivationKind, extensionHostKindToString, ExtensionActivationReason, IInternalExtensionService, ExtensionRunningLocation, ExtensionHostExtensions } from 'vs/workbench/services/extensions/common/extensions';
 import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { Barrier } from 'vs/base/common/async';
+import { Barrier, IntervalTimer } from 'vs/base/common/async';
 import { URI } from 'vs/base/common/uri';
 import { ILogService } from 'vs/platform/log/common/log';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IExtensionHostProxy, IResolveAuthorityResult } from 'vs/workbench/services/extensions/common/extensionHostProxy';
 import { IExtensionDescriptionDelta } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
+import { getRemoteAuthorityPrefix } from 'vs/workbench/services/extensions/common/remoteExtensionHost';
 
 // Enable to see detailed message communication between window and extension host
 const LOG_EXTENSION_HOST_COMMUNICATION = false;
@@ -143,7 +144,7 @@ class ExtensionHostManager extends Disposable implements IExtensionHostManager {
 				};
 				this._telemetryService.publicLog2<ExtensionHostStartupEvent, ExtensionHostStartupClassification>('extensionHostStartup', successTelemetryEvent);
 
-				return this._createExtensionHostCustomers(protocol);
+				return this._createExtensionHostCustomers(this.kind, protocol);
 			},
 			(err) => {
 				this._logService.error(`Error received from starting extension host (kind: ${extensionHostKindToString(this.kind)})`);
@@ -258,11 +259,11 @@ class ExtensionHostManager extends Disposable implements IExtensionHostManager {
 		return ExtensionHostManager._convert(SIZE, sw.elapsed());
 	}
 
-	private _createExtensionHostCustomers(protocol: IMessagePassingProtocol): IExtensionHostProxy {
+	private _createExtensionHostCustomers(kind: ExtensionHostKind, protocol: IMessagePassingProtocol): IExtensionHostProxy {
 
 		let logger: IRPCProtocolLogger | null = null;
 		if (LOG_EXTENSION_HOST_COMMUNICATION || this._environmentService.logExtensionHostCommunication) {
-			logger = new RPCLogger();
+			logger = new RPCLogger(kind);
 		}
 
 		this._rpcProtocol = new RPCProtocol(protocol, logger);
@@ -377,8 +378,15 @@ class ExtensionHostManager extends Disposable implements IExtensionHostManager {
 	}
 
 	public async resolveAuthority(remoteAuthority: string, resolveAttempt: number): Promise<IResolveAuthorityResult> {
+		const sw = StopWatch.create(false);
+		const prefix = () => `[${extensionHostKindToString(this._extensionHost.runningLocation.kind)}${this._extensionHost.runningLocation.affinity}][resolveAuthority(${getRemoteAuthorityPrefix(remoteAuthority)},${resolveAttempt})][${sw.elapsed()}ms] `;
+		const logInfo = (msg: string) => this._logService.info(`${prefix()}${msg}`);
+		const logError = (msg: string, err: any = undefined) => this._logService.error(`${prefix()}${msg}`, err);
+
+		logInfo(`obtaining proxy...`);
 		const proxy = await this._proxy;
 		if (!proxy) {
+			logError(`no proxy`);
 			return {
 				type: 'error',
 				error: {
@@ -388,10 +396,21 @@ class ExtensionHostManager extends Disposable implements IExtensionHostManager {
 				}
 			};
 		}
-
+		logInfo(`invoking...`);
+		const intervalLogger = new IntervalTimer();
 		try {
-			return proxy.resolveAuthority(remoteAuthority, resolveAttempt);
+			intervalLogger.cancelAndSet(() => logInfo('waiting...'), 1000);
+			const resolverResult = await proxy.resolveAuthority(remoteAuthority, resolveAttempt);
+			intervalLogger.dispose();
+			if (resolverResult.type === 'ok') {
+				logInfo(`returned ${resolverResult.value.authority.host}:${resolverResult.value.authority.port}`);
+			} else {
+				logError(`returned an error`, resolverResult.error);
+			}
+			return resolverResult;
 		} catch (err) {
+			intervalLogger.dispose();
+			logError(`returned an error`, err);
 			return {
 				type: 'error',
 				error: {
@@ -643,12 +662,16 @@ class RPCLogger implements IRPCProtocolLogger {
 	private _totalIncoming = 0;
 	private _totalOutgoing = 0;
 
+	constructor(
+		private readonly _kind: ExtensionHostKind
+	) { }
+
 	private _log(direction: string, totalLength: number, msgLength: number, req: number, initiator: RequestInitiator, str: string, data: any): void {
 		data = pretty(data);
 
 		const colorTable = colorTables[initiator];
 		const color = LOG_USE_COLORS ? colorTable[req % colorTable.length] : '#000000';
-		let args = [`%c[${direction}]%c[${String(totalLength).padStart(7)}]%c[len: ${String(msgLength).padStart(5)}]%c${String(req).padStart(5)} - ${str}`, 'color: darkgreen', 'color: grey', 'color: grey', `color: ${color}`];
+		let args = [`%c[${extensionHostKindToString(this._kind)}][${direction}]%c[${String(totalLength).padStart(7)}]%c[len: ${String(msgLength).padStart(5)}]%c${String(req).padStart(5)} - ${str}`, 'color: darkgreen', 'color: grey', 'color: grey', `color: ${color}`];
 		if (/\($/.test(str)) {
 			args = args.concat(data);
 			args.push(')');
diff --git a/src/vs/workbench/services/extensions/common/extensionsApiProposals.ts b/src/vs/workbench/services/extensions/common/extensionsApiProposals.ts
index d8a6dd45156b2e..f0f0b916875b60 100644
--- a/src/vs/workbench/services/extensions/common/extensionsApiProposals.ts
+++ b/src/vs/workbench/services/extensions/common/extensionsApiProposals.ts
@@ -9,6 +9,7 @@ export const allApiProposals = Object.freeze({
 	authSession: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.authSession.d.ts',
 	codiconDecoration: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.codiconDecoration.d.ts',
 	commentsResolvedState: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.commentsResolvedState.d.ts',
+	contribCommentEditorActionsMenu: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribCommentEditorActionsMenu.d.ts',
 	contribCommentPeekContext: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribCommentPeekContext.d.ts',
 	contribCommentThreadAdditionalMenu: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribCommentThreadAdditionalMenu.d.ts',
 	contribEditSessions: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribEditSessions.d.ts',
diff --git a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
index 9b21eb7556860c..5736f50c881a9c 100644
--- a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
+++ b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
@@ -239,6 +239,14 @@ export const schema: IJSONSchema = {
 				markdownEnumDescriptions: Object.values(allApiProposals)
 			}
 		},
+		api: {
+			markdownDescription: nls.localize('vscode.extension.api', 'Describe the API provided by this extension. For more details visit: https://code.visualstudio.com/api/advanced-topics/remote-extensions#handling-dependencies-with-remote-extensions'),
+			type: 'string',
+			enum: ['none'],
+			enumDescriptions: [
+				nls.localize('vscode.extension.api.none', "Give up entirely the ability to export any APIs. This allows other extensions that depend on this extension to run in a separate extension host process or in a remote machine.")
+			]
+		},
 		activationEvents: {
 			description: nls.localize('vscode.extension.activationEvents', 'Activation events for the VS Code extension.'),
 			type: 'array',
@@ -565,7 +573,7 @@ export const schema: IJSONSchema = {
 	}
 };
 
-export type toArray<T> = T extends Array<any> ? T : T[];
+export type removeArray<T> = T extends Array<infer X> ? X : T;
 
 export interface IExtensionPointDescriptor<T> {
 	extensionPoint: string;
@@ -576,7 +584,7 @@ export interface IExtensionPointDescriptor<T> {
 	 * A function which runs before the extension point has been validated and which
 	 * can should collect automatic activation events from the contribution.
 	 */
-	activationEventsGenerator?: IActivationEventsGenerator<toArray<T>>;
+	activationEventsGenerator?: IActivationEventsGenerator<removeArray<T>>;
 }
 
 export class ExtensionsRegistryImpl {
diff --git a/src/vs/workbench/services/extensions/common/remoteExtensionHost.ts b/src/vs/workbench/services/extensions/common/remoteExtensionHost.ts
index 1cf2e6448eb2ef..54d741463b1f2e 100644
--- a/src/vs/workbench/services/extensions/common/remoteExtensionHost.ts
+++ b/src/vs/workbench/services/extensions/common/remoteExtensionHost.ts
@@ -284,3 +284,11 @@ export class RemoteExtensionHost extends Disposable implements IExtensionHost {
 		}
 	}
 }
+
+export function getRemoteAuthorityPrefix(remoteAuthority: string): string {
+	const plusIndex = remoteAuthority.indexOf('+');
+	if (plusIndex === -1) {
+		return remoteAuthority;
+	}
+	return remoteAuthority.substring(0, plusIndex);
+}
diff --git a/src/vs/workbench/services/extensions/electron-sandbox/cachedExtensionScanner.ts b/src/vs/workbench/services/extensions/electron-sandbox/cachedExtensionScanner.ts
index aef8a454f4aab7..dd9be1540682b7 100644
--- a/src/vs/workbench/services/extensions/electron-sandbox/cachedExtensionScanner.ts
+++ b/src/vs/workbench/services/extensions/electron-sandbox/cachedExtensionScanner.ts
@@ -16,7 +16,6 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 import { IHostService } from 'vs/workbench/services/host/browser/host';
 import { timeout } from 'vs/base/common/async';
 import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 
 export class CachedExtensionScanner {
 
@@ -29,7 +28,6 @@ export class CachedExtensionScanner {
 		@IHostService private readonly _hostService: IHostService,
 		@IExtensionsScannerService private readonly _extensionsScannerService: IExtensionsScannerService,
 		@IUserDataProfileService private readonly _userDataProfileService: IUserDataProfileService,
-		@IStorageService private readonly _storageService: IStorageService,
 		@ILogService private readonly _logService: ILogService,
 	) {
 		this.scannedExtensions = new Promise<IExtensionDescription[]>((resolve, reject) => {
@@ -55,11 +53,6 @@ export class CachedExtensionScanner {
 	private async _scanInstalledExtensions(): Promise<IExtensionDescription[]> {
 		try {
 			const language = platform.language;
-			const defaultProfileExtensionsInitKey = `${this._userDataProfileService.currentProfile.extensionsResource.toString()}.init`;
-			if (this._userDataProfileService.currentProfile.isDefault && !this._storageService.getBoolean(defaultProfileExtensionsInitKey, StorageScope.APPLICATION, false)) {
-				await this._extensionsScannerService.initializeDefaultProfileExtensions();
-				this._storageService.store(defaultProfileExtensionsInitKey, true, StorageScope.APPLICATION, StorageTarget.MACHINE);
-			}
 			const [scannedSystemExtensions, scannedUserExtensions] = await Promise.all([
 				this._extensionsScannerService.scanSystemExtensions({ language, useCache: true, checkControlFile: true }),
 				this._extensionsScannerService.scanUserExtensions({ language, profileLocation: this._userDataProfileService.currentProfile.extensionsResource, useCache: true })]);
diff --git a/src/vs/workbench/services/extensions/electron-sandbox/electronExtensionService.ts b/src/vs/workbench/services/extensions/electron-sandbox/electronExtensionService.ts
index e270e589674dd6..0cf9167ba7ca77 100644
--- a/src/vs/workbench/services/extensions/electron-sandbox/electronExtensionService.ts
+++ b/src/vs/workbench/services/extensions/electron-sandbox/electronExtensionService.ts
@@ -11,7 +11,7 @@ import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/
 import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { IWorkbenchExtensionEnablementService, EnablementState, IWorkbenchExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IRemoteExtensionHostDataProvider, RemoteExtensionHost, IRemoteExtensionHostInitData } from 'vs/workbench/services/extensions/common/remoteExtensionHost';
+import { IRemoteExtensionHostDataProvider, RemoteExtensionHost, IRemoteExtensionHostInitData, getRemoteAuthorityPrefix } from 'vs/workbench/services/extensions/common/remoteExtensionHost';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
 import { IRemoteAuthorityResolverService, RemoteAuthorityResolverError, RemoteAuthorityResolverErrorCode, ResolverResult } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
@@ -695,14 +695,6 @@ export abstract class ElectronExtensionService extends AbstractExtensionService
 	}
 }
 
-function getRemoteAuthorityPrefix(remoteAuthority: string): string {
-	const plusIndex = remoteAuthority.indexOf('+');
-	if (plusIndex === -1) {
-		return remoteAuthority;
-	}
-	return remoteAuthority.substring(0, plusIndex);
-}
-
 class RestartExtensionHostAction extends Action2 {
 
 	constructor() {
diff --git a/src/vs/workbench/services/extensions/electron-sandbox/nativeLocalProcessExtensionHost.ts b/src/vs/workbench/services/extensions/electron-sandbox/nativeLocalProcessExtensionHost.ts
index 8cc4de5338c579..514ee2545f82fc 100644
--- a/src/vs/workbench/services/extensions/electron-sandbox/nativeLocalProcessExtensionHost.ts
+++ b/src/vs/workbench/services/extensions/electron-sandbox/nativeLocalProcessExtensionHost.ts
@@ -90,7 +90,7 @@ class ExtHostNamedPipeCommunication extends Disposable implements IExtHostCommun
 				}
 
 				const nodeSocket = new NodeSocket(socket, 'renderer-exthost');
-				const protocol = new PersistentProtocol(nodeSocket);
+				const protocol = new PersistentProtocol({ socket: nodeSocket });
 
 				this._register(toDisposable(() => {
 					// Send the extension host a request to terminate itself
diff --git a/src/vs/workbench/services/host/browser/browserHostService.ts b/src/vs/workbench/services/host/browser/browserHostService.ts
index 5b01c61cd3a17e..e1e29b0f6e85f4 100644
--- a/src/vs/workbench/services/host/browser/browserHostService.ts
+++ b/src/vs/workbench/services/host/browser/browserHostService.ts
@@ -13,7 +13,7 @@ import { IWindowSettings, IWindowOpenable, IOpenWindowOptions, isFolderToOpen, i
 import { isResourceEditorInput, pathsToEditors } from 'vs/workbench/common/editor';
 import { whenEditorClosed } from 'vs/workbench/browser/editor';
 import { IFileService } from 'vs/platform/files/common/files';
-import { ILabelService } from 'vs/platform/label/common/label';
+import { ILabelService, Verbosity } from 'vs/platform/label/common/label';
 import { ModifierKeyEmitter, trackFocus } from 'vs/base/browser/dom';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
@@ -399,11 +399,11 @@ export class BrowserHostService extends Disposable implements IHostService {
 
 	private getRecentLabel(openable: IWindowOpenable): string {
 		if (isFolderToOpen(openable)) {
-			return this.labelService.getWorkspaceLabel(openable.folderUri, { verbose: true });
+			return this.labelService.getWorkspaceLabel(openable.folderUri, { verbose: Verbosity.LONG });
 		}
 
 		if (isWorkspaceToOpen(openable)) {
-			return this.labelService.getWorkspaceLabel(getWorkspaceIdentifier(openable.workspaceUri), { verbose: true });
+			return this.labelService.getWorkspaceLabel(getWorkspaceIdentifier(openable.workspaceUri), { verbose: Verbosity.LONG });
 		}
 
 		return this.labelService.getUriLabel(openable.fileUri);
diff --git a/src/vs/workbench/services/host/electron-sandbox/nativeHostService.ts b/src/vs/workbench/services/host/electron-sandbox/nativeHostService.ts
index f9181a1a37649a..548df18f2eb31c 100644
--- a/src/vs/workbench/services/host/electron-sandbox/nativeHostService.ts
+++ b/src/vs/workbench/services/host/electron-sandbox/nativeHostService.ts
@@ -7,7 +7,7 @@ import { Event } from 'vs/base/common/event';
 import { IHostService } from 'vs/workbench/services/host/browser/host';
 import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
 import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ILabelService } from 'vs/platform/label/common/label';
+import { ILabelService, Verbosity } from 'vs/platform/label/common/label';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { IWindowOpenable, IOpenWindowOptions, isFolderToOpen, isWorkspaceToOpen, IOpenEmptyWindowOptions } from 'vs/platform/window/common/window';
 import { Disposable } from 'vs/base/common/lifecycle';
@@ -91,11 +91,11 @@ class WorkbenchHostService extends Disposable implements IHostService {
 
 	private getRecentLabel(openable: IWindowOpenable): string {
 		if (isFolderToOpen(openable)) {
-			return this.labelService.getWorkspaceLabel(openable.folderUri, { verbose: true });
+			return this.labelService.getWorkspaceLabel(openable.folderUri, { verbose: Verbosity.LONG });
 		}
 
 		if (isWorkspaceToOpen(openable)) {
-			return this.labelService.getWorkspaceLabel({ id: '', configPath: openable.workspaceUri }, { verbose: true });
+			return this.labelService.getWorkspaceLabel({ id: '', configPath: openable.workspaceUri }, { verbose: Verbosity.LONG });
 		}
 
 		return this.labelService.getUriLabel(openable.fileUri);
diff --git a/src/vs/workbench/services/hover/browser/hover.ts b/src/vs/workbench/services/hover/browser/hover.ts
index 074b8203b5eb2e..eadb80f2df715d 100644
--- a/src/vs/workbench/services/hover/browser/hover.ts
+++ b/src/vs/workbench/services/hover/browser/hover.ts
@@ -119,6 +119,13 @@ export interface IHoverOptions {
 	 * another in the same group so it looks like the hover is moving from one element to the other.
 	 */
 	skipFadeInAnimation?: boolean;
+
+	/**
+	 * Whether to trap focus in the following ways:
+	 * - When the hover closes, focus goes to the element that had focus before the hover opened
+	 * - If there are elements in the hover to focus, focus stays inside of the hover when tabbing
+	 */
+	trapFocus?: boolean;
 }
 
 export interface IHoverAction {
diff --git a/src/vs/workbench/services/hover/browser/hoverService.ts b/src/vs/workbench/services/hover/browser/hoverService.ts
index 172390f00a63cf..5d6a0f34a034d8 100644
--- a/src/vs/workbench/services/hover/browser/hoverService.ts
+++ b/src/vs/workbench/services/hover/browser/hoverService.ts
@@ -23,6 +23,8 @@ export class HoverService implements IHoverService {
 	private _currentHoverOptions: IHoverOptions | undefined;
 	private _currentHover: HoverWidget | undefined;
 
+	private _lastFocusedElementBeforeOpen: HTMLElement | undefined;
+
 	constructor(
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IContextViewService private readonly _contextViewService: IContextViewService,
@@ -37,10 +39,18 @@ export class HoverService implements IHoverService {
 			return undefined;
 		}
 		this._currentHoverOptions = options;
+		if (options.trapFocus && document.activeElement) {
+			this._lastFocusedElementBeforeOpen = document.activeElement as HTMLElement;
+		} else {
+			this._lastFocusedElementBeforeOpen = undefined;
+		}
 
 		const hoverDisposables = new DisposableStore();
 		const hover = this._instantiationService.createInstance(HoverWidget, options);
 		hover.onDispose(() => {
+			// Required to handle cases such as closing the hover with the escape key
+			this._lastFocusedElementBeforeOpen?.focus();
+
 			// Only clear the current options if it's the current hover, the current options help
 			// reduce flickering when the same hover is shown multiple times
 			if (this._currentHoverOptions === options) {
@@ -64,11 +74,11 @@ export class HoverService implements IHoverService {
 			hoverDisposables.add(addDisposableListener(document, EventType.KEY_DOWN, e => this._keyDown(e, hover)));
 			hoverDisposables.add(addDisposableListener(focusedElement, EventType.KEY_UP, e => this._keyUp(e, hover)));
 			hoverDisposables.add(addDisposableListener(document, EventType.KEY_UP, e => this._keyUp(e, hover)));
-		}
-		if (options.hideOnKeyDown) {
-			const focusedElement = document.activeElement;
-			if (focusedElement) {
-				hoverDisposables.add(addDisposableListener(focusedElement, EventType.KEY_DOWN, () => this.hideHover()));
+			if (options.hideOnKeyDown) {
+				hoverDisposables.add(addDisposableListener(focusedElement, EventType.KEY_DOWN, () => {
+					this.hideHover();
+					this._lastFocusedElementBeforeOpen?.focus();
+				}));
 			}
 		}
 
@@ -110,7 +120,10 @@ export class HoverService implements IHoverService {
 		if (keybinding.getSingleModifierDispatchParts().some(value => !!value) || this._keybindingService.softDispatch(event, event.target)) {
 			return;
 		}
-		this.hideHover();
+		if (!this._currentHoverOptions?.trapFocus || e.key !== 'Tab') {
+			this.hideHover();
+			this._lastFocusedElementBeforeOpen?.focus();
+		}
 	}
 
 	private _keyUp(e: KeyboardEvent, hover: HoverWidget) {
@@ -119,6 +132,7 @@ export class HoverService implements IHoverService {
 			// Hide if alt is released while the mouse os not over hover/target
 			if (!hover.isMouseIn) {
 				this.hideHover();
+				this._lastFocusedElementBeforeOpen?.focus();
 			}
 		}
 	}
diff --git a/src/vs/workbench/services/hover/browser/hoverWidget.ts b/src/vs/workbench/services/hover/browser/hoverWidget.ts
index 26cac4eb56e09b..33bce1df01198a 100644
--- a/src/vs/workbench/services/hover/browser/hoverWidget.ts
+++ b/src/vs/workbench/services/hover/browser/hoverWidget.ts
@@ -10,7 +10,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IHoverTarget, IHoverOptions } from 'vs/workbench/services/hover/browser/hover';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { EditorOptions, IEditorOptions } from 'vs/editor/common/config/editorOptions';
+import { EDITOR_FONT_DEFAULTS, IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { HoverAction, HoverPosition, HoverWidget as BaseHoverWidget } from 'vs/base/browser/ui/hover/hoverWidget';
 import { Widget } from 'vs/base/browser/ui/widget';
 import { AnchorPosition } from 'vs/base/browser/ui/contextview/contextview';
@@ -52,6 +52,8 @@ export class HoverWidget extends Widget {
 	private _x: number = 0;
 	private _y: number = 0;
 	private _isLocked: boolean = false;
+	private _enableFocusTraps: boolean = false;
+	private _addedFocusTrap: boolean = false;
 
 	get isDisposed(): boolean { return this._isDisposed; }
 	get isMouseIn(): boolean { return this._lockMouseTracker.isMouseIn; }
@@ -109,6 +111,9 @@ export class HoverWidget extends Widget {
 		if (options.forcePosition) {
 			this._forcePosition = true;
 		}
+		if (options.trapFocus) {
+			this._enableFocusTraps = true;
+		}
 
 		this._hoverPosition = options.hoverPosition ?? HoverPosition.ABOVE;
 
@@ -137,7 +142,7 @@ export class HoverWidget extends Widget {
 			const markdown = options.content;
 			const mdRenderer = this._instantiationService.createInstance(
 				MarkdownRenderer,
-				{ codeBlockFontFamily: EditorOptions.fontFamily.validate(this._configurationService.getValue<IEditorOptions>('editor').fontFamily) }
+				{ codeBlockFontFamily: this._configurationService.getValue<IEditorOptions>('editor').fontFamily || EDITOR_FONT_DEFAULTS.fontFamily }
 			);
 
 			const { element } = mdRenderer.render(markdown, {
@@ -222,10 +227,55 @@ export class HoverWidget extends Widget {
 		}
 	}
 
+	private addFocusTrap() {
+		if (!this._enableFocusTraps || this._addedFocusTrap) {
+			return;
+		}
+		this._addedFocusTrap = true;
+
+		// Add a hover tab loop if the hover has at least one element with a valid tabIndex
+		const firstContainerFocusElement = this._hover.containerDomNode;
+		const lastContainerFocusElement = this.findLastFocusableChild(this._hover.containerDomNode);
+		if (lastContainerFocusElement) {
+			const beforeContainerFocusElement = dom.prepend(this._hoverContainer, $('div'));
+			const afterContainerFocusElement = dom.append(this._hoverContainer, $('div'));
+			beforeContainerFocusElement.tabIndex = 0;
+			afterContainerFocusElement.tabIndex = 0;
+			this._register(dom.addDisposableListener(afterContainerFocusElement, 'focus', (e) => {
+				firstContainerFocusElement.focus();
+				e.preventDefault();
+			}));
+			this._register(dom.addDisposableListener(beforeContainerFocusElement, 'focus', (e) => {
+				lastContainerFocusElement.focus();
+				e.preventDefault();
+			}));
+		}
+	}
+
+	private findLastFocusableChild(root: Node): HTMLElement | undefined {
+		if (root.hasChildNodes()) {
+			for (let i = 0; i < root.childNodes.length; i++) {
+				const node = root.childNodes.item(root.childNodes.length - i - 1);
+				if (node.nodeType === node.ELEMENT_NODE) {
+					const parsedNode = node as HTMLElement;
+					if (typeof parsedNode.tabIndex === 'number' && parsedNode.tabIndex >= 0) {
+						return parsedNode;
+					}
+				}
+				const recursivelyFoundElement = this.findLastFocusableChild(node);
+				if (recursivelyFoundElement) {
+					return recursivelyFoundElement;
+				}
+			}
+		}
+		return undefined;
+	}
+
 	public render(container: HTMLElement): void {
 		container.appendChild(this._hoverContainer);
 
 		this.layout();
+		this.addFocusTrap();
 	}
 
 	public layout() {
diff --git a/src/vs/workbench/services/issue/electron-sandbox/issueService.ts b/src/vs/workbench/services/issue/electron-sandbox/issueService.ts
index d8ad3673c93a8e..a9906ce2cecae4 100644
--- a/src/vs/workbench/services/issue/electron-sandbox/issueService.ts
+++ b/src/vs/workbench/services/issue/electron-sandbox/issueService.ts
@@ -47,7 +47,7 @@ export class WorkbenchIssueService implements IWorkbenchIssueService {
 			extensionData.push(...enabledExtensions.map((extension): IssueReporterExtensionData => {
 				const { manifest } = extension;
 				const manifestKeys = manifest.contributes ? Object.keys(manifest.contributes) : [];
-				const isTheme = !manifest.activationEvents && manifestKeys.length === 1 && manifestKeys[0] === 'themes';
+				const isTheme = !manifest.main && !manifest.browser && manifestKeys.length === 1 && manifestKeys[0] === 'themes';
 				const isBuiltin = extension.type === ExtensionType.System;
 				return {
 					name: manifest.name,
diff --git a/src/vs/workbench/services/keybinding/browser/keybindingService.ts b/src/vs/workbench/services/keybinding/browser/keybindingService.ts
index 4e68c5d7fa6377..c664e93b95ca87 100644
--- a/src/vs/workbench/services/keybinding/browser/keybindingService.ts
+++ b/src/vs/workbench/services/keybinding/browser/keybindingService.ts
@@ -15,7 +15,6 @@ import { KeybindingParser } from 'vs/base/common/keybindingParser';
 import { OS, OperatingSystem, isMacintosh } from 'vs/base/common/platform';
 import { ICommandService, CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ConfigurationScope, Extensions as ConfigExtensions, IConfigurationNode, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
 import { ContextKeyExpr, IContextKeyService, ContextKeyExpression, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { Extensions, IJSONContributionRegistry } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
 import { AbstractKeybindingService } from 'vs/platform/keybinding/common/abstractKeybindingService';
@@ -40,7 +39,6 @@ import { FileOperation, IFileService } from 'vs/platform/files/common/files';
 import { parse } from 'vs/base/common/json';
 import * as objects from 'vs/base/common/objects';
 import { IKeyboardLayoutService } from 'vs/platform/keyboardLayout/common/keyboardLayout';
-import { getDispatchConfig } from 'vs/platform/keyboardLayout/common/dispatchConfig';
 import { INavigatorWithKeyboard, IKeyboard } from 'vs/workbench/services/keybinding/browser/navigatorKeyboard';
 import { flatten } from 'vs/base/common/arrays';
 import { BrowserFeatures, KeyboardSupport } from 'vs/base/browser/canIUse';
@@ -202,21 +200,9 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService {
 		this.isComposingGlobalContextKey = contextKeyService.createKey('isComposing', false);
 		this.updateSchema();
 
-		let dispatchConfig = getDispatchConfig(configurationService);
-		configurationService.onDidChangeConfiguration((e) => {
-			const newDispatchConfig = getDispatchConfig(configurationService);
-			if (dispatchConfig === newDispatchConfig) {
-				return;
-			}
-
-			dispatchConfig = newDispatchConfig;
-			this._keyboardMapper = this.keyboardLayoutService.getKeyboardMapper(dispatchConfig);
-			this.updateResolver();
-		});
-
-		this._keyboardMapper = this.keyboardLayoutService.getKeyboardMapper(dispatchConfig);
+		this._keyboardMapper = this.keyboardLayoutService.getKeyboardMapper();
 		this.keyboardLayoutService.onDidChangeKeyboardLayout(() => {
-			this._keyboardMapper = this.keyboardLayoutService.getKeyboardMapper(dispatchConfig);
+			this._keyboardMapper = this.keyboardLayoutService.getKeyboardMapper();
 			this.updateResolver();
 		});
 
@@ -902,24 +888,4 @@ function updateSchema(additionalContributions: readonly IJSONSchema[]) {
 	schemaRegistry.notifySchemaChanged(schemaId);
 }
 
-const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigExtensions.Configuration);
-const keyboardConfiguration: IConfigurationNode = {
-	'id': 'keyboard',
-	'order': 15,
-	'type': 'object',
-	'title': nls.localize('keyboardConfigurationTitle', "Keyboard"),
-	'properties': {
-		'keyboard.dispatch': {
-			scope: ConfigurationScope.APPLICATION,
-			type: 'string',
-			enum: ['code', 'keyCode'],
-			default: 'code',
-			markdownDescription: nls.localize('dispatch', "Controls the dispatching logic for key presses to use either `code` (recommended) or `keyCode`."),
-			included: OS === OperatingSystem.Macintosh || OS === OperatingSystem.Linux
-		}
-	}
-};
-
-configurationRegistry.registerConfiguration(keyboardConfiguration);
-
 registerSingleton(IKeybindingService, WorkbenchKeybindingService, InstantiationType.Eager);
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts
index c83b9e0a72c9a3..c55684f04241a6 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts
@@ -8,11 +8,11 @@ import { Emitter, Event } from 'vs/base/common/event';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { KeymapInfo, IRawMixedKeyboardMapping, IKeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { DispatchConfig } from 'vs/platform/keyboardLayout/common/dispatchConfig';
+import { DispatchConfig, readKeyboardConfig } from 'vs/platform/keyboardLayout/common/keyboardConfig';
 import { IKeyboardMapper, CachedKeyboardMapper } from 'vs/platform/keyboardLayout/common/keyboardMapper';
 import { OS, OperatingSystem, isMacintosh, isWindows } from 'vs/base/common/platform';
 import { WindowsKeyboardMapper } from 'vs/workbench/services/keybinding/common/windowsKeyboardMapper';
-import { MacLinuxFallbackKeyboardMapper } from 'vs/workbench/services/keybinding/common/macLinuxFallbackKeyboardMapper';
+import { FallbackKeyboardMapper } from 'vs/workbench/services/keybinding/common/fallbackKeyboardMapper';
 import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
 import { MacLinuxKeyboardMapper } from 'vs/workbench/services/keybinding/common/macLinuxKeyboardMapper';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
@@ -31,7 +31,7 @@ import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { getKeyboardLayoutId, IKeyboardLayoutInfo, IKeyboardLayoutService, IKeyboardMapping, IMacLinuxKeyboardMapping, IWindowsKeyboardMapping } from 'vs/platform/keyboardLayout/common/keyboardLayout';
 
-export class BrowserKeyboardMapperFactoryBase {
+export class BrowserKeyboardMapperFactoryBase extends Disposable {
 	// keyboard mapper
 	protected _initialized: boolean;
 	protected _keyboardMapper: IKeyboardMapper | null;
@@ -56,7 +56,7 @@ export class BrowserKeyboardMapperFactoryBase {
 			return null;
 		}
 
-		return this._activeKeymapInfo && this._activeKeymapInfo.layout;
+		return this._activeKeymapInfo?.layout ?? null;
 	}
 
 	get activeKeyMapping(): IKeyboardMapping | null {
@@ -64,7 +64,7 @@ export class BrowserKeyboardMapperFactoryBase {
 			return null;
 		}
 
-		return this._activeKeymapInfo && this._activeKeymapInfo.mapping;
+		return this._activeKeymapInfo?.mapping ?? null;
 	}
 
 	get keyboardLayouts(): IKeyboardLayoutInfo[] {
@@ -72,10 +72,12 @@ export class BrowserKeyboardMapperFactoryBase {
 	}
 
 	protected constructor(
+		private readonly _configurationService: IConfigurationService,
 		// private _notificationService: INotificationService,
 		// private _storageService: IStorageService,
 		// private _commandService: ICommandService
 	) {
+		super();
 		this._keyboardMapper = null;
 		this._initialized = false;
 		this._keymapInfos = [];
@@ -94,6 +96,13 @@ export class BrowserKeyboardMapperFactoryBase {
 				});
 			});
 		}
+
+		this._register(this._configurationService.onDidChangeConfiguration((e) => {
+			if (e.affectsConfiguration('keyboard')) {
+				this._keyboardMapper = null;
+				this._onDidChangeKeyboardMapper.fire();
+			}
+		}));
 	}
 
 	registerKeyboardLayout(layout: KeymapInfo) {
@@ -270,15 +279,16 @@ export class BrowserKeyboardMapperFactoryBase {
 		});
 	}
 
-	public getKeyboardMapper(dispatchConfig: DispatchConfig): IKeyboardMapper {
-		if (!this._initialized) {
-			return new MacLinuxFallbackKeyboardMapper(OS);
-		}
-		if (dispatchConfig === DispatchConfig.KeyCode) {
+	public getKeyboardMapper(): IKeyboardMapper {
+		const config = readKeyboardConfig(this._configurationService);
+		if (config.dispatch === DispatchConfig.KeyCode || !this._initialized || !this._activeKeymapInfo) {
 			// Forcefully set to use keyCode
-			return new MacLinuxFallbackKeyboardMapper(OS);
+			return new FallbackKeyboardMapper(config.mapAltGrToCtrlAlt, OS);
+		}
+		if (!this._keyboardMapper) {
+			this._keyboardMapper = new CachedKeyboardMapper(BrowserKeyboardMapperFactory._createKeyboardMapper(this._activeKeymapInfo, config.mapAltGrToCtrlAlt));
 		}
-		return this._keyboardMapper!;
+		return this._keyboardMapper;
 	}
 
 	public validateCurrentKeyboardMapping(keyboardEvent: IKeyboardEvent): void {
@@ -306,22 +316,22 @@ export class BrowserKeyboardMapperFactoryBase {
 	private _setKeyboardData(keymapInfo: KeymapInfo): void {
 		this._initialized = true;
 
-		this._keyboardMapper = new CachedKeyboardMapper(BrowserKeyboardMapperFactory._createKeyboardMapper(keymapInfo));
+		this._keyboardMapper = null;
 		this._onDidChangeKeyboardMapper.fire();
 	}
 
-	private static _createKeyboardMapper(keymapInfo: KeymapInfo): IKeyboardMapper {
+	private static _createKeyboardMapper(keymapInfo: KeymapInfo, mapAltGrToCtrlAlt: boolean): IKeyboardMapper {
 		const rawMapping = keymapInfo.mapping;
 		const isUSStandard = !!keymapInfo.layout.isUSStandard;
 		if (OS === OperatingSystem.Windows) {
-			return new WindowsKeyboardMapper(isUSStandard, <IWindowsKeyboardMapping>rawMapping);
+			return new WindowsKeyboardMapper(isUSStandard, <IWindowsKeyboardMapping>rawMapping, mapAltGrToCtrlAlt);
 		}
 		if (Object.keys(rawMapping).length === 0) {
 			// Looks like reading the mappings failed (most likely Mac + Japanese/Chinese keyboard layouts)
-			return new MacLinuxFallbackKeyboardMapper(OS);
+			return new FallbackKeyboardMapper(mapAltGrToCtrlAlt, OS);
 		}
 
-		return new MacLinuxKeyboardMapper(isUSStandard, <IMacLinuxKeyboardMapping>rawMapping, OS);
+		return new MacLinuxKeyboardMapper(isUSStandard, <IMacLinuxKeyboardMapping>rawMapping, mapAltGrToCtrlAlt, OS);
 	}
 
 	//#region Browser API
@@ -436,9 +446,9 @@ export class BrowserKeyboardMapperFactoryBase {
 }
 
 export class BrowserKeyboardMapperFactory extends BrowserKeyboardMapperFactoryBase {
-	constructor(notificationService: INotificationService, storageService: IStorageService, commandService: ICommandService) {
+	constructor(configurationService: IConfigurationService, notificationService: INotificationService, storageService: IStorageService, commandService: ICommandService) {
 		// super(notificationService, storageService, commandService);
-		super();
+		super(configurationService);
 
 		const platform = isWindows ? 'win' : isMacintosh ? 'darwin' : 'linux';
 
@@ -526,7 +536,7 @@ export class BrowserKeyboardLayoutService extends Disposable implements IKeyboar
 		const keyboardConfig = configurationService.getValue<{ layout: string }>('keyboard');
 		const layout = keyboardConfig.layout;
 		this._keyboardLayoutMode = layout ?? 'autodetect';
-		this._factory = new BrowserKeyboardMapperFactory(notificationService, storageService, commandService);
+		this._factory = new BrowserKeyboardMapperFactory(configurationService, notificationService, storageService, commandService);
 
 		this._register(this._factory.onDidChangeKeyboardMapper(() => {
 			this._onDidChangeKeyboardLayout.fire();
@@ -538,7 +548,7 @@ export class BrowserKeyboardLayoutService extends Disposable implements IKeyboar
 		}
 
 		this._register(configurationService.onDidChangeConfiguration(e => {
-			if (e.affectedKeys.indexOf('keyboard.layout') >= 0) {
+			if (e.affectsConfiguration('keyboard.layout')) {
 				const keyboardConfig = configurationService.getValue<{ layout: string }>('keyboard');
 				const layout = keyboardConfig.layout;
 				this._keyboardLayoutMode = layout;
@@ -593,8 +603,8 @@ export class BrowserKeyboardLayoutService extends Disposable implements IKeyboar
 		}
 	}
 
-	getKeyboardMapper(dispatchConfig: DispatchConfig): IKeyboardMapper {
-		return this._factory.getKeyboardMapper(dispatchConfig);
+	getKeyboardMapper(): IKeyboardMapper {
+		return this._factory.getKeyboardMapper();
 	}
 
 	public getCurrentKeyboardLayout(): IKeyboardLayoutInfo | null {
diff --git a/src/vs/workbench/services/keybinding/common/macLinuxFallbackKeyboardMapper.ts b/src/vs/workbench/services/keybinding/common/fallbackKeyboardMapper.ts
similarity index 80%
rename from src/vs/workbench/services/keybinding/common/macLinuxFallbackKeyboardMapper.ts
rename to src/vs/workbench/services/keybinding/common/fallbackKeyboardMapper.ts
index de1c8824b11bfd..e4c752fb60a294 100644
--- a/src/vs/workbench/services/keybinding/common/macLinuxFallbackKeyboardMapper.ts
+++ b/src/vs/workbench/services/keybinding/common/fallbackKeyboardMapper.ts
@@ -12,16 +12,12 @@ import { IKeyboardMapper } from 'vs/platform/keyboardLayout/common/keyboardMappe
 /**
  * A keyboard mapper to be used when reading the keymap from the OS fails.
  */
-export class MacLinuxFallbackKeyboardMapper implements IKeyboardMapper {
+export class FallbackKeyboardMapper implements IKeyboardMapper {
 
-	/**
-	 * OS (can be Linux or Macintosh)
-	 */
-	private readonly _OS: OperatingSystem;
-
-	constructor(OS: OperatingSystem) {
-		this._OS = OS;
-	}
+	constructor(
+		private readonly _mapAltGrToCtrlAlt: boolean,
+		private readonly _OS: OperatingSystem,
+	) { }
 
 	public dumpDebugInfo(): string {
 		return 'FallbackKeyboardMapper dispatching on keyCode';
@@ -32,10 +28,12 @@ export class MacLinuxFallbackKeyboardMapper implements IKeyboardMapper {
 	}
 
 	public resolveKeyboardEvent(keyboardEvent: IKeyboardEvent): ResolvedKeybinding {
+		const ctrlKey = keyboardEvent.ctrlKey || (this._mapAltGrToCtrlAlt && keyboardEvent.altGraphKey);
+		const altKey = keyboardEvent.altKey || (this._mapAltGrToCtrlAlt && keyboardEvent.altGraphKey);
 		const keybinding = new SimpleKeybinding(
-			keyboardEvent.ctrlKey,
+			ctrlKey,
 			keyboardEvent.shiftKey,
-			keyboardEvent.altKey,
+			altKey,
 			keyboardEvent.metaKey,
 			keyboardEvent.keyCode
 		);
diff --git a/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts b/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts
index 30a25ac9d0b850..4912eada17175a 100644
--- a/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts
+++ b/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts
@@ -350,14 +350,6 @@ class ScanCodeKeyCodeMapper {
 
 export class MacLinuxKeyboardMapper implements IKeyboardMapper {
 
-	/**
-	 * Is this the standard US keyboard layout?
-	 */
-	private readonly _isUSStandard: boolean;
-	/**
-	 * OS (can be Linux or Macintosh)
-	 */
-	private readonly _OS: OperatingSystem;
 	/**
 	 * used only for debug purposes.
 	 */
@@ -375,9 +367,12 @@ export class MacLinuxKeyboardMapper implements IKeyboardMapper {
 	 */
 	private readonly _scanCodeToDispatch: Array<string | null> = [];
 
-	constructor(isUSStandard: boolean, rawMappings: IMacLinuxKeyboardMapping, OS: OperatingSystem) {
-		this._isUSStandard = isUSStandard;
-		this._OS = OS;
+	constructor(
+		private readonly _isUSStandard: boolean,
+		rawMappings: IMacLinuxKeyboardMapping,
+		private readonly _mapAltGrToCtrlAlt: boolean,
+		private readonly _OS: OperatingSystem,
+	) {
 		this._codeInfo = [];
 		this._scanCodeKeyCodeMapper = new ScanCodeKeyCodeMapper();
 		this._scanCodeToLabel = [];
@@ -704,6 +699,7 @@ export class MacLinuxKeyboardMapper implements IKeyboardMapper {
 					shiftKey: scanCodeCombo.shiftKey,
 					altKey: scanCodeCombo.altKey,
 					metaKey: false,
+					altGraphKey: false,
 					keyCode: KeyCode.DependsOnKbLayout,
 					code: ScanCodeUtils.toString(scanCode)
 				});
@@ -1001,7 +997,9 @@ export class MacLinuxKeyboardMapper implements IKeyboardMapper {
 			}
 		}
 
-		const keypress = new ScanCodeBinding(keyboardEvent.ctrlKey, keyboardEvent.shiftKey, keyboardEvent.altKey, keyboardEvent.metaKey, code);
+		const ctrlKey = keyboardEvent.ctrlKey || (this._mapAltGrToCtrlAlt && keyboardEvent.altGraphKey);
+		const altKey = keyboardEvent.altKey || (this._mapAltGrToCtrlAlt && keyboardEvent.altGraphKey);
+		const keypress = new ScanCodeBinding(ctrlKey, keyboardEvent.shiftKey, altKey, keyboardEvent.metaKey, code);
 		return new NativeResolvedKeybinding(this, this._OS, [keypress]);
 	}
 
diff --git a/src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.ts b/src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.ts
index f3a3d80c9d0cbf..2cd589520f1ccc 100644
--- a/src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.ts
+++ b/src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.ts
@@ -161,14 +161,16 @@ export class WindowsNativeResolvedKeybinding extends BaseResolvedKeybinding<Simp
 
 export class WindowsKeyboardMapper implements IKeyboardMapper {
 
-	public readonly isUSStandard: boolean;
 	private readonly _codeInfo: IScanCodeMapping[];
 	private readonly _scanCodeToKeyCode: KeyCode[];
 	private readonly _keyCodeToLabel: Array<string | null> = [];
 	private readonly _keyCodeExists: boolean[];
 
-	constructor(isUSStandard: boolean, rawMappings: IWindowsKeyboardMapping) {
-		this.isUSStandard = isUSStandard;
+	constructor(
+		private readonly _isUSStandard: boolean,
+		rawMappings: IWindowsKeyboardMapping,
+		private readonly _mapAltGrToCtrlAlt: boolean
+	) {
 		this._scanCodeToKeyCode = [];
 		this._keyCodeToLabel = [];
 		this._keyCodeExists = [];
@@ -394,7 +396,7 @@ export class WindowsKeyboardMapper implements IKeyboardMapper {
 	}
 
 	public getUserSettingsLabelForKeyCode(keyCode: KeyCode): string {
-		if (this.isUSStandard) {
+		if (this._isUSStandard) {
 			return KeyCodeUtils.toUserSettingsUS(keyCode);
 		}
 		return KeyCodeUtils.toUserSettingsGeneral(keyCode);
@@ -420,7 +422,9 @@ export class WindowsKeyboardMapper implements IKeyboardMapper {
 	}
 
 	public resolveKeyboardEvent(keyboardEvent: IKeyboardEvent): WindowsNativeResolvedKeybinding {
-		const keybinding = new SimpleKeybinding(keyboardEvent.ctrlKey, keyboardEvent.shiftKey, keyboardEvent.altKey, keyboardEvent.metaKey, keyboardEvent.keyCode);
+		const ctrlKey = keyboardEvent.ctrlKey || (this._mapAltGrToCtrlAlt && keyboardEvent.altGraphKey);
+		const altKey = keyboardEvent.altKey || (this._mapAltGrToCtrlAlt && keyboardEvent.altGraphKey);
+		const keybinding = new SimpleKeybinding(ctrlKey, keyboardEvent.shiftKey, altKey, keyboardEvent.metaKey, keyboardEvent.keyCode);
 		return new WindowsNativeResolvedKeybinding(this, [keybinding]);
 	}
 
diff --git a/src/vs/workbench/services/keybinding/electron-sandbox/nativeKeyboardLayout.ts b/src/vs/workbench/services/keybinding/electron-sandbox/nativeKeyboardLayout.ts
index 011f79efa884ee..862b6d2062620d 100644
--- a/src/vs/workbench/services/keybinding/electron-sandbox/nativeKeyboardLayout.ts
+++ b/src/vs/workbench/services/keybinding/electron-sandbox/nativeKeyboardLayout.ts
@@ -4,18 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Disposable } from 'vs/base/common/lifecycle';
-import { IKeyboardLayoutInfo, IKeyboardLayoutService, IKeyboardMapping, ILinuxKeyboardLayoutInfo, IMacKeyboardLayoutInfo, IMacLinuxKeyboardMapping, IWindowsKeyboardLayoutInfo, IWindowsKeyboardMapping, macLinuxKeyboardMappingEquals, windowsKeyboardMappingEquals } from 'vs/platform/keyboardLayout/common/keyboardLayout';
+import { IKeyboardLayoutInfo, IKeyboardLayoutService, IKeyboardMapping, ILinuxKeyboardLayoutInfo, IMacKeyboardLayoutInfo, IMacLinuxKeyboardMapping, IWindowsKeyboardLayoutInfo, IWindowsKeyboardMapping } from 'vs/platform/keyboardLayout/common/keyboardLayout';
 import { Emitter } from 'vs/base/common/event';
 import { OperatingSystem, OS } from 'vs/base/common/platform';
 import { CachedKeyboardMapper, IKeyboardMapper } from 'vs/platform/keyboardLayout/common/keyboardMapper';
 import { WindowsKeyboardMapper } from 'vs/workbench/services/keybinding/common/windowsKeyboardMapper';
-import { MacLinuxFallbackKeyboardMapper } from 'vs/workbench/services/keybinding/common/macLinuxFallbackKeyboardMapper';
+import { FallbackKeyboardMapper } from 'vs/workbench/services/keybinding/common/fallbackKeyboardMapper';
 import { MacLinuxKeyboardMapper } from 'vs/workbench/services/keybinding/common/macLinuxKeyboardMapper';
-import { DispatchConfig } from 'vs/platform/keyboardLayout/common/dispatchConfig';
+import { DispatchConfig, readKeyboardConfig } from 'vs/platform/keyboardLayout/common/keyboardConfig';
 import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
-import { IMainProcessService } from 'vs/platform/ipc/electron-sandbox/services';
-import { INativeKeyboardLayoutService } from 'vs/platform/keyboardLayout/common/keyboardLayoutService';
-import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ISandboxKeyboardLayoutService } from 'vs/workbench/services/keybinding/electron-sandbox/sandboxKeyboardLayout';
+import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
 
 export class KeyboardLayoutService extends Disposable implements IKeyboardLayoutService {
 
@@ -24,67 +24,48 @@ export class KeyboardLayoutService extends Disposable implements IKeyboardLayout
 	private readonly _onDidChangeKeyboardLayout = this._register(new Emitter<void>());
 	readonly onDidChangeKeyboardLayout = this._onDidChangeKeyboardLayout.event;
 
-	private readonly _keyboardLayoutService: INativeKeyboardLayoutService;
-	private _initPromise: Promise<void> | null;
-	private _keyboardMapping: IKeyboardMapping | null;
-	private _keyboardLayoutInfo: IKeyboardLayoutInfo | null;
-	private _keyboardMapper: IKeyboardMapper;
+	private _keyboardMapper: IKeyboardMapper | null;
 
 	constructor(
-		@IMainProcessService mainProcessService: IMainProcessService
+		@ISandboxKeyboardLayoutService private readonly _sandboxKeyboardLayoutService: ISandboxKeyboardLayoutService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService
 	) {
 		super();
-		this._keyboardLayoutService = ProxyChannel.toService<INativeKeyboardLayoutService>(mainProcessService.getChannel('keyboardLayout'));
-		this._initPromise = null;
-		this._keyboardMapping = null;
-		this._keyboardLayoutInfo = null;
-		this._keyboardMapper = new MacLinuxFallbackKeyboardMapper(OS);
-
-		this._register(this._keyboardLayoutService.onDidChangeKeyboardLayout(async ({ keyboardLayoutInfo, keyboardMapping }) => {
-			await this.initialize();
-			if (keyboardMappingEquals(this._keyboardMapping, keyboardMapping)) {
-				// the mappings are equal
-				return;
-			}
+		this._keyboardMapper = null;
 
-			this._keyboardMapping = keyboardMapping;
-			this._keyboardLayoutInfo = keyboardLayoutInfo;
-			this._keyboardMapper = new CachedKeyboardMapper(createKeyboardMapper(this._keyboardLayoutInfo, this._keyboardMapping));
+		this._register(this._sandboxKeyboardLayoutService.onDidChangeKeyboardLayout(async () => {
+			this._keyboardMapper = null;
 			this._onDidChangeKeyboardLayout.fire();
 		}));
-	}
 
-	public initialize(): Promise<void> {
-		if (!this._initPromise) {
-			this._initPromise = this._doInitialize();
-		}
-		return this._initPromise;
-	}
-
-	private async _doInitialize(): Promise<void> {
-		const keyboardLayoutData = await this._keyboardLayoutService.getKeyboardLayoutData();
-		const { keyboardLayoutInfo, keyboardMapping } = keyboardLayoutData;
-		this._keyboardMapping = keyboardMapping;
-		this._keyboardLayoutInfo = keyboardLayoutInfo;
-		this._keyboardMapper = new CachedKeyboardMapper(createKeyboardMapper(this._keyboardLayoutInfo, this._keyboardMapping));
+		this._register(_configurationService.onDidChangeConfiguration(async (e) => {
+			if (e.affectsConfiguration('keyboard')) {
+				this._keyboardMapper = null;
+				this._onDidChangeKeyboardLayout.fire();
+			}
+		}));
 	}
 
 	public getRawKeyboardMapping(): IKeyboardMapping | null {
-		return this._keyboardMapping;
+		return this._sandboxKeyboardLayoutService.getRawKeyboardMapping();
 	}
 
 	public getCurrentKeyboardLayout(): IKeyboardLayoutInfo | null {
-		return this._keyboardLayoutInfo;
+		return this._sandboxKeyboardLayoutService.getCurrentKeyboardLayout();
 	}
 
 	public getAllKeyboardLayouts(): IKeyboardLayoutInfo[] {
 		return [];
 	}
 
-	public getKeyboardMapper(dispatchConfig: DispatchConfig): IKeyboardMapper {
-		if (dispatchConfig === DispatchConfig.KeyCode) {
+	public getKeyboardMapper(): IKeyboardMapper {
+		const config = readKeyboardConfig(this._configurationService);
+		if (config.dispatch === DispatchConfig.KeyCode) {
 			// Forcefully set to use keyCode
-			return new MacLinuxFallbackKeyboardMapper(OS);
+			return new FallbackKeyboardMapper(config.mapAltGrToCtrlAlt, OS);
+		}
+		if (!this._keyboardMapper) {
+			this._keyboardMapper = new CachedKeyboardMapper(createKeyboardMapper(this.getCurrentKeyboardLayout(), this.getRawKeyboardMapping(), config.mapAltGrToCtrlAlt));
 		}
 		return this._keyboardMapper;
 	}
@@ -94,34 +75,26 @@ export class KeyboardLayoutService extends Disposable implements IKeyboardLayout
 	}
 }
 
-function keyboardMappingEquals(a: IKeyboardMapping | null, b: IKeyboardMapping | null): boolean {
-	if (OS === OperatingSystem.Windows) {
-		return windowsKeyboardMappingEquals(<IWindowsKeyboardMapping | null>a, <IWindowsKeyboardMapping | null>b);
-	}
-
-	return macLinuxKeyboardMappingEquals(<IMacLinuxKeyboardMapping | null>a, <IMacLinuxKeyboardMapping | null>b);
-}
-
-function createKeyboardMapper(layoutInfo: IKeyboardLayoutInfo | null, rawMapping: IKeyboardMapping | null): IKeyboardMapper {
+function createKeyboardMapper(layoutInfo: IKeyboardLayoutInfo | null, rawMapping: IKeyboardMapping | null, mapAltGrToCtrlAlt: boolean): IKeyboardMapper {
 	const _isUSStandard = isUSStandard(layoutInfo);
 	if (OS === OperatingSystem.Windows) {
-		return new WindowsKeyboardMapper(_isUSStandard, <IWindowsKeyboardMapping>rawMapping);
+		return new WindowsKeyboardMapper(_isUSStandard, <IWindowsKeyboardMapping>rawMapping, mapAltGrToCtrlAlt);
 	}
 
 	if (!rawMapping || Object.keys(rawMapping).length === 0) {
 		// Looks like reading the mappings failed (most likely Mac + Japanese/Chinese keyboard layouts)
-		return new MacLinuxFallbackKeyboardMapper(OS);
+		return new FallbackKeyboardMapper(mapAltGrToCtrlAlt, OS);
 	}
 
 	if (OS === OperatingSystem.Macintosh) {
 		const kbInfo = <IMacKeyboardLayoutInfo>layoutInfo;
 		if (kbInfo.id === 'com.apple.keylayout.DVORAK-QWERTYCMD') {
 			// Use keyCode based dispatching for DVORAK - QWERTY ⌘
-			return new MacLinuxFallbackKeyboardMapper(OS);
+			return new FallbackKeyboardMapper(mapAltGrToCtrlAlt, OS);
 		}
 	}
 
-	return new MacLinuxKeyboardMapper(_isUSStandard, <IMacLinuxKeyboardMapping>rawMapping, OS);
+	return new MacLinuxKeyboardMapper(_isUSStandard, <IMacLinuxKeyboardMapping>rawMapping, mapAltGrToCtrlAlt, OS);
 }
 
 function isUSStandard(_kbInfo: IKeyboardLayoutInfo | null): boolean {
@@ -147,3 +120,5 @@ function isUSStandard(_kbInfo: IKeyboardLayoutInfo | null): boolean {
 
 	return false;
 }
+
+registerSingleton(IKeyboardLayoutService, KeyboardLayoutService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/services/keybinding/electron-sandbox/sandboxKeyboardLayout.ts b/src/vs/workbench/services/keybinding/electron-sandbox/sandboxKeyboardLayout.ts
new file mode 100644
index 00000000000000..74171cdca49376
--- /dev/null
+++ b/src/vs/workbench/services/keybinding/electron-sandbox/sandboxKeyboardLayout.ts
@@ -0,0 +1,87 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 'vs/base/common/lifecycle';
+import { IKeyboardLayoutInfo, IKeyboardMapping, IMacLinuxKeyboardMapping, IWindowsKeyboardMapping, macLinuxKeyboardMappingEquals, windowsKeyboardMappingEquals } from 'vs/platform/keyboardLayout/common/keyboardLayout';
+import { Emitter, Event } from 'vs/base/common/event';
+import { OperatingSystem, OS } from 'vs/base/common/platform';
+import { IMainProcessService } from 'vs/platform/ipc/electron-sandbox/services';
+import { INativeKeyboardLayoutService } from 'vs/platform/keyboardLayout/common/keyboardLayoutService';
+import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+
+export const ISandboxKeyboardLayoutService = createDecorator<ISandboxKeyboardLayoutService>('sandboxKeyboardLayoutService');
+
+export interface ISandboxKeyboardLayoutService {
+	readonly _serviceBrand: undefined;
+	readonly onDidChangeKeyboardLayout: Event<void>;
+	getRawKeyboardMapping(): IKeyboardMapping | null;
+	getCurrentKeyboardLayout(): IKeyboardLayoutInfo | null;
+}
+
+export class SandboxKeyboardLayoutService extends Disposable implements ISandboxKeyboardLayoutService {
+
+	declare readonly _serviceBrand: undefined;
+
+	private readonly _onDidChangeKeyboardLayout = this._register(new Emitter<void>());
+	readonly onDidChangeKeyboardLayout = this._onDidChangeKeyboardLayout.event;
+
+	private readonly _keyboardLayoutService: INativeKeyboardLayoutService;
+	private _initPromise: Promise<void> | null;
+	private _keyboardMapping: IKeyboardMapping | null;
+	private _keyboardLayoutInfo: IKeyboardLayoutInfo | null;
+
+	constructor(
+		@IMainProcessService mainProcessService: IMainProcessService
+	) {
+		super();
+		this._keyboardLayoutService = ProxyChannel.toService<INativeKeyboardLayoutService>(mainProcessService.getChannel('keyboardLayout'));
+		this._initPromise = null;
+		this._keyboardMapping = null;
+		this._keyboardLayoutInfo = null;
+
+		this._register(this._keyboardLayoutService.onDidChangeKeyboardLayout(async ({ keyboardLayoutInfo, keyboardMapping }) => {
+			await this.initialize();
+			if (keyboardMappingEquals(this._keyboardMapping, keyboardMapping)) {
+				// the mappings are equal
+				return;
+			}
+
+			this._keyboardMapping = keyboardMapping;
+			this._keyboardLayoutInfo = keyboardLayoutInfo;
+			this._onDidChangeKeyboardLayout.fire();
+		}));
+	}
+
+	public initialize(): Promise<void> {
+		if (!this._initPromise) {
+			this._initPromise = this._doInitialize();
+		}
+		return this._initPromise;
+	}
+
+	private async _doInitialize(): Promise<void> {
+		const keyboardLayoutData = await this._keyboardLayoutService.getKeyboardLayoutData();
+		const { keyboardLayoutInfo, keyboardMapping } = keyboardLayoutData;
+		this._keyboardMapping = keyboardMapping;
+		this._keyboardLayoutInfo = keyboardLayoutInfo;
+	}
+
+	public getRawKeyboardMapping(): IKeyboardMapping | null {
+		return this._keyboardMapping;
+	}
+
+	public getCurrentKeyboardLayout(): IKeyboardLayoutInfo | null {
+		return this._keyboardLayoutInfo;
+	}
+}
+
+function keyboardMappingEquals(a: IKeyboardMapping | null, b: IKeyboardMapping | null): boolean {
+	if (OS === OperatingSystem.Windows) {
+		return windowsKeyboardMappingEquals(<IWindowsKeyboardMapping | null>a, <IWindowsKeyboardMapping | null>b);
+	}
+
+	return macLinuxKeyboardMappingEquals(<IMacLinuxKeyboardMapping | null>a, <IMacLinuxKeyboardMapping | null>b);
+}
diff --git a/src/vs/workbench/services/keybinding/test/browser/browserKeyboardMapper.test.ts b/src/vs/workbench/services/keybinding/test/browser/browserKeyboardMapper.test.ts
index 4787531f967047..5b466a15fe1024 100644
--- a/src/vs/workbench/services/keybinding/test/browser/browserKeyboardMapper.test.ts
+++ b/src/vs/workbench/services/keybinding/test/browser/browserKeyboardMapper.test.ts
@@ -14,11 +14,13 @@ import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
 import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 
 class TestKeyboardMapperFactory extends BrowserKeyboardMapperFactoryBase {
-	constructor(notificationService: INotificationService, storageService: IStorageService, commandService: ICommandService) {
+	constructor(configurationService: IConfigurationService, notificationService: INotificationService, storageService: IStorageService, commandService: ICommandService) {
 		// super(notificationService, storageService, commandService);
-		super();
+		super(configurationService);
 
 		const keymapInfos: IKeymapInfo[] = KeyboardLayoutContribution.INSTANCE.layoutInfos;
 		this._keymapInfos.push(...keymapInfos.map(info => (new KeymapInfo(info.layout, info.secondaryLayouts, info.mapping, info.isUserKeyboardLayout))));
@@ -36,9 +38,10 @@ suite('keyboard layout loader', () => {
 	const instantiationService: TestInstantiationService = new TestInstantiationService();
 	const notitifcationService = instantiationService.stub(INotificationService, new TestNotificationService());
 	const storageService = instantiationService.stub(IStorageService, new TestStorageService());
+	const configurationService = instantiationService.stub(IConfigurationService, new TestConfigurationService());
 
 	const commandService = instantiationService.stub(ICommandService, {});
-	const instance = new TestKeyboardMapperFactory(notitifcationService, storageService, commandService);
+	const instance = new TestKeyboardMapperFactory(configurationService, notitifcationService, storageService, commandService);
 
 	test('load default US keyboard layout', () => {
 		assert.notStrictEqual(instance.activeKeyboardLayout, null);
diff --git a/src/vs/workbench/services/keybinding/test/node/macLinuxFallbackKeyboardMapper.test.ts b/src/vs/workbench/services/keybinding/test/node/fallbackKeyboardMapper.test.ts
similarity index 84%
rename from src/vs/workbench/services/keybinding/test/node/macLinuxFallbackKeyboardMapper.test.ts
rename to src/vs/workbench/services/keybinding/test/node/fallbackKeyboardMapper.test.ts
index 649227a8921606..45c17f7ef9636e 100644
--- a/src/vs/workbench/services/keybinding/test/node/macLinuxFallbackKeyboardMapper.test.ts
+++ b/src/vs/workbench/services/keybinding/test/node/fallbackKeyboardMapper.test.ts
@@ -6,12 +6,12 @@
 import { KeyChord, KeyCode, KeyMod, ScanCode } from 'vs/base/common/keyCodes';
 import { SimpleKeybinding, createKeybinding, ScanCodeBinding } from 'vs/base/common/keybindings';
 import { OperatingSystem } from 'vs/base/common/platform';
-import { MacLinuxFallbackKeyboardMapper } from 'vs/workbench/services/keybinding/common/macLinuxFallbackKeyboardMapper';
+import { FallbackKeyboardMapper } from 'vs/workbench/services/keybinding/common/fallbackKeyboardMapper';
 import { IResolvedKeybinding, assertResolveKeybinding, assertResolveKeyboardEvent, assertResolveUserBinding } from 'vs/workbench/services/keybinding/test/node/keyboardMapperTestUtils';
 
 suite('keyboardMapper - MAC fallback', () => {
 
-	const mapper = new MacLinuxFallbackKeyboardMapper(OperatingSystem.Macintosh);
+	const mapper = new FallbackKeyboardMapper(false, OperatingSystem.Macintosh);
 
 	function _assertResolveKeybinding(k: number, expected: IResolvedKeybinding[]): void {
 		assertResolveKeybinding(mapper, createKeybinding(k, OperatingSystem.Macintosh)!, expected);
@@ -58,6 +58,7 @@ suite('keyboardMapper - MAC fallback', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: true,
+				altGraphKey: false,
 				keyCode: KeyCode.KeyZ,
 				code: null!
 			},
@@ -106,6 +107,7 @@ suite('keyboardMapper - MAC fallback', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: true,
+				altGraphKey: false,
 				keyCode: KeyCode.Meta,
 				code: null!
 			},
@@ -131,6 +133,7 @@ suite('keyboardMapper - MAC fallback', () => {
 				shiftKey: true,
 				altKey: false,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: KeyCode.Shift,
 				code: null!
 			},
@@ -156,6 +159,7 @@ suite('keyboardMapper - MAC fallback', () => {
 				shiftKey: false,
 				altKey: true,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: KeyCode.Alt,
 				code: null!
 			},
@@ -172,51 +176,55 @@ suite('keyboardMapper - MAC fallback', () => {
 		);
 	});
 
-	test('resolveKeyboardEvent Single Modifier Meta+', () => {
+	test('resolveKeyboardEvent Only Modifiers Ctrl+Shift+', () => {
 		assertResolveKeyboardEvent(
 			mapper,
 			{
 				_standardKeyboardEventBrand: true,
-				ctrlKey: false,
-				shiftKey: false,
+				ctrlKey: true,
+				shiftKey: true,
 				altKey: false,
-				metaKey: true,
-				keyCode: KeyCode.Meta,
+				metaKey: false,
+				altGraphKey: false,
+				keyCode: KeyCode.Shift,
 				code: null!
 			},
 			{
-				label: '⌘',
-				ariaLabel: 'Command',
+				label: '⌃⇧',
+				ariaLabel: 'Control+Shift',
 				electronAccelerator: null,
-				userSettingsLabel: 'cmd',
+				userSettingsLabel: 'ctrl+shift',
 				isWYSIWYG: true,
 				isChord: false,
 				dispatchParts: [null],
-				singleModifierDispatchParts: ['meta'],
+				singleModifierDispatchParts: [null],
 			}
 		);
 	});
 
-	test('resolveKeyboardEvent Only Modifiers Ctrl+Shift+', () => {
+	test('resolveKeyboardEvent mapAltGrToCtrlAlt AltGr+Z', () => {
+		const mapper = new FallbackKeyboardMapper(true, OperatingSystem.Macintosh);
+
 		assertResolveKeyboardEvent(
 			mapper,
 			{
 				_standardKeyboardEventBrand: true,
-				ctrlKey: true,
-				shiftKey: true,
+				ctrlKey: false,
+				shiftKey: false,
 				altKey: false,
 				metaKey: false,
-				keyCode: KeyCode.Shift,
+				altGraphKey: true,
+				keyCode: KeyCode.KeyZ,
 				code: null!
 			},
 			{
-				label: '⌃⇧',
-				ariaLabel: 'Control+Shift',
-				electronAccelerator: null,
-				userSettingsLabel: 'ctrl+shift',
+				label: '⌃⌥Z',
+				ariaLabel: 'Control+Option+Z',
+				electronAccelerator: 'Ctrl+Alt+Z',
+				userSettingsLabel: 'ctrl+alt+z',
 				isWYSIWYG: true,
 				isChord: false,
-				dispatchParts: [null],
+				dispatchParts: ['ctrl+alt+Z'],
 				singleModifierDispatchParts: [null],
 			}
 		);
@@ -225,7 +233,7 @@ suite('keyboardMapper - MAC fallback', () => {
 
 suite('keyboardMapper - LINUX fallback', () => {
 
-	const mapper = new MacLinuxFallbackKeyboardMapper(OperatingSystem.Linux);
+	const mapper = new FallbackKeyboardMapper(false, OperatingSystem.Linux);
 
 	function _assertResolveKeybinding(k: number, expected: IResolvedKeybinding[]): void {
 		assertResolveKeybinding(mapper, createKeybinding(k, OperatingSystem.Linux)!, expected);
@@ -272,6 +280,7 @@ suite('keyboardMapper - LINUX fallback', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: KeyCode.KeyZ,
 				code: null!
 			},
@@ -334,6 +343,7 @@ suite('keyboardMapper - LINUX fallback', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: KeyCode.Ctrl,
 				code: null!
 			},
@@ -349,4 +359,32 @@ suite('keyboardMapper - LINUX fallback', () => {
 			}
 		);
 	});
+
+	test('resolveKeyboardEvent mapAltGrToCtrlAlt AltGr+Z', () => {
+		const mapper = new FallbackKeyboardMapper(true, OperatingSystem.Linux);
+
+		assertResolveKeyboardEvent(
+			mapper,
+			{
+				_standardKeyboardEventBrand: true,
+				ctrlKey: false,
+				shiftKey: false,
+				altKey: false,
+				metaKey: false,
+				altGraphKey: true,
+				keyCode: KeyCode.KeyZ,
+				code: null!
+			},
+			{
+				label: 'Ctrl+Alt+Z',
+				ariaLabel: 'Control+Alt+Z',
+				electronAccelerator: 'Ctrl+Alt+Z',
+				userSettingsLabel: 'ctrl+alt+z',
+				isWYSIWYG: true,
+				isChord: false,
+				dispatchParts: ['ctrl+alt+Z'],
+				singleModifierDispatchParts: [null],
+			}
+		);
+	});
 });
diff --git a/src/vs/workbench/services/keybinding/test/node/macLinuxKeyboardMapper.test.ts b/src/vs/workbench/services/keybinding/test/node/macLinuxKeyboardMapper.test.ts
index 5c7c6021539cd7..db1a8d06c14cd5 100644
--- a/src/vs/workbench/services/keybinding/test/node/macLinuxKeyboardMapper.test.ts
+++ b/src/vs/workbench/services/keybinding/test/node/macLinuxKeyboardMapper.test.ts
@@ -15,9 +15,9 @@ import { IMacLinuxKeyboardMapping } from 'vs/platform/keyboardLayout/common/keyb
 
 const WRITE_FILE_IF_DIFFERENT = false;
 
-async function createKeyboardMapper(isUSStandard: boolean, file: string, OS: OperatingSystem): Promise<MacLinuxKeyboardMapper> {
+async function createKeyboardMapper(isUSStandard: boolean, file: string, mapAltGrToCtrlAlt: boolean, OS: OperatingSystem): Promise<MacLinuxKeyboardMapper> {
 	const rawMappings = await readRawMapping<IMacLinuxKeyboardMapping>(file);
-	return new MacLinuxKeyboardMapper(isUSStandard, rawMappings, OS);
+	return new MacLinuxKeyboardMapper(isUSStandard, rawMappings, mapAltGrToCtrlAlt, OS);
 }
 
 suite('keyboardMapper - MAC de_ch', () => {
@@ -25,7 +25,7 @@ suite('keyboardMapper - MAC de_ch', () => {
 	let mapper: MacLinuxKeyboardMapper;
 
 	suiteSetup(async () => {
-		const _mapper = await createKeyboardMapper(false, 'mac_de_ch', OperatingSystem.Macintosh);
+		const _mapper = await createKeyboardMapper(false, 'mac_de_ch', false, OperatingSystem.Macintosh);
 		mapper = _mapper;
 	});
 
@@ -113,6 +113,7 @@ suite('keyboardMapper - MAC de_ch', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: true,
+				altGraphKey: false,
 				keyCode: -1,
 				code: 'KeyY'
 			},
@@ -154,6 +155,7 @@ suite('keyboardMapper - MAC de_ch', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: true,
+				altGraphKey: false,
 				keyCode: -1,
 				code: 'BracketRight'
 			},
@@ -307,6 +309,7 @@ suite('keyboardMapper - MAC de_ch', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: true,
+				altGraphKey: false,
 				keyCode: -1,
 				code: 'Home'
 			},
@@ -356,6 +359,7 @@ suite('keyboardMapper - MAC de_ch', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: true,
+				altGraphKey: false,
 				keyCode: -1,
 				code: 'MetaLeft'
 			},
@@ -381,6 +385,7 @@ suite('keyboardMapper - MAC de_ch', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: true,
+				altGraphKey: false,
 				keyCode: -1,
 				code: 'MetaRight'
 			},
@@ -403,7 +408,7 @@ suite('keyboardMapper - MAC en_us', () => {
 	let mapper: MacLinuxKeyboardMapper;
 
 	suiteSetup(async () => {
-		const _mapper = await createKeyboardMapper(true, 'mac_en_us', OperatingSystem.Macintosh);
+		const _mapper = await createKeyboardMapper(true, 'mac_en_us', false, OperatingSystem.Macintosh);
 		mapper = _mapper;
 	});
 
@@ -440,6 +445,7 @@ suite('keyboardMapper - MAC en_us', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: true,
+				altGraphKey: false,
 				keyCode: -1,
 				code: 'MetaLeft'
 			},
@@ -465,6 +471,7 @@ suite('keyboardMapper - MAC en_us', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: true,
+				altGraphKey: false,
 				keyCode: -1,
 				code: 'MetaRight'
 			},
@@ -480,6 +487,34 @@ suite('keyboardMapper - MAC en_us', () => {
 			}
 		);
 	});
+
+	test('resolveKeyboardEvent mapAltGrToCtrlAlt AltGr+Z', async () => {
+		const mapper = await createKeyboardMapper(true, 'mac_en_us', true, OperatingSystem.Macintosh);
+
+		assertResolveKeyboardEvent(
+			mapper,
+			{
+				_standardKeyboardEventBrand: true,
+				ctrlKey: false,
+				shiftKey: false,
+				altKey: false,
+				metaKey: false,
+				altGraphKey: true,
+				keyCode: -1,
+				code: 'KeyZ'
+			},
+			{
+				label: '⌃⌥Z',
+				ariaLabel: 'Control+Option+Z',
+				electronAccelerator: 'Ctrl+Alt+Z',
+				userSettingsLabel: 'ctrl+alt+z',
+				isWYSIWYG: true,
+				isChord: false,
+				dispatchParts: ['ctrl+alt+[KeyZ]'],
+				singleModifierDispatchParts: [null],
+			}
+		);
+	});
 });
 
 suite('keyboardMapper - LINUX de_ch', () => {
@@ -487,7 +522,7 @@ suite('keyboardMapper - LINUX de_ch', () => {
 	let mapper: MacLinuxKeyboardMapper;
 
 	suiteSetup(async () => {
-		const _mapper = await createKeyboardMapper(false, 'linux_de_ch', OperatingSystem.Linux);
+		const _mapper = await createKeyboardMapper(false, 'linux_de_ch', false, OperatingSystem.Linux);
 		mapper = _mapper;
 	});
 
@@ -559,6 +594,7 @@ suite('keyboardMapper - LINUX de_ch', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: -1,
 				code: 'KeyY'
 			},
@@ -591,6 +627,7 @@ suite('keyboardMapper - LINUX de_ch', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: -1,
 				code: 'BracketRight'
 			},
@@ -744,6 +781,7 @@ suite('keyboardMapper - LINUX de_ch', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: -1,
 				code: 'Home'
 			},
@@ -769,6 +807,7 @@ suite('keyboardMapper - LINUX de_ch', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: -1,
 				code: 'KeyX'
 			},
@@ -813,6 +852,7 @@ suite('keyboardMapper - LINUX de_ch', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: -1,
 				code: 'ControlLeft'
 			},
@@ -838,6 +878,7 @@ suite('keyboardMapper - LINUX de_ch', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: -1,
 				code: 'ControlRight'
 			},
@@ -860,7 +901,7 @@ suite('keyboardMapper - LINUX en_us', () => {
 	let mapper: MacLinuxKeyboardMapper;
 
 	suiteSetup(async () => {
-		const _mapper = await createKeyboardMapper(true, 'linux_en_us', OperatingSystem.Linux);
+		const _mapper = await createKeyboardMapper(true, 'linux_en_us', false, OperatingSystem.Linux);
 		mapper = _mapper;
 	});
 
@@ -913,6 +954,7 @@ suite('keyboardMapper - LINUX en_us', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: -1,
 				code: 'KeyZ'
 			},
@@ -954,6 +996,7 @@ suite('keyboardMapper - LINUX en_us', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: -1,
 				code: 'BracketRight'
 			},
@@ -1107,6 +1150,7 @@ suite('keyboardMapper - LINUX en_us', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: -1,
 				code: 'Home'
 			},
@@ -1173,6 +1217,7 @@ suite('keyboardMapper - LINUX en_us', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: -1,
 				code: 'NumpadEnter'
 			},
@@ -1235,6 +1280,7 @@ suite('keyboardMapper - LINUX en_us', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: -1,
 				code: 'ControlLeft'
 			},
@@ -1260,6 +1306,7 @@ suite('keyboardMapper - LINUX en_us', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: -1,
 				code: 'ControlRight'
 			},
@@ -1285,6 +1332,7 @@ suite('keyboardMapper - LINUX en_us', () => {
 				shiftKey: true,
 				altKey: false,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: -1,
 				code: 'ShiftLeft'
 			},
@@ -1310,6 +1358,7 @@ suite('keyboardMapper - LINUX en_us', () => {
 				shiftKey: true,
 				altKey: false,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: -1,
 				code: 'ShiftRight'
 			},
@@ -1335,6 +1384,7 @@ suite('keyboardMapper - LINUX en_us', () => {
 				shiftKey: false,
 				altKey: true,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: -1,
 				code: 'AltLeft'
 			},
@@ -1360,6 +1410,7 @@ suite('keyboardMapper - LINUX en_us', () => {
 				shiftKey: false,
 				altKey: true,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: -1,
 				code: 'AltRight'
 			},
@@ -1385,6 +1436,7 @@ suite('keyboardMapper - LINUX en_us', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: true,
+				altGraphKey: false,
 				keyCode: -1,
 				code: 'MetaLeft'
 			},
@@ -1410,6 +1462,7 @@ suite('keyboardMapper - LINUX en_us', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: true,
+				altGraphKey: false,
 				keyCode: -1,
 				code: 'MetaRight'
 			},
@@ -1435,6 +1488,7 @@ suite('keyboardMapper - LINUX en_us', () => {
 				shiftKey: true,
 				altKey: false,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: -1,
 				code: 'ShiftLeft'
 			},
@@ -1450,6 +1504,34 @@ suite('keyboardMapper - LINUX en_us', () => {
 			}
 		);
 	});
+
+	test('resolveKeyboardEvent mapAltGrToCtrlAlt AltGr+Z', async () => {
+		const mapper = await createKeyboardMapper(true, 'linux_en_us', true, OperatingSystem.Linux);
+
+		assertResolveKeyboardEvent(
+			mapper,
+			{
+				_standardKeyboardEventBrand: true,
+				ctrlKey: false,
+				shiftKey: false,
+				altKey: false,
+				metaKey: false,
+				altGraphKey: true,
+				keyCode: -1,
+				code: 'KeyZ'
+			},
+			{
+				label: 'Ctrl+Alt+Z',
+				ariaLabel: 'Control+Alt+Z',
+				electronAccelerator: 'Ctrl+Alt+Z',
+				userSettingsLabel: 'ctrl+alt+z',
+				isWYSIWYG: true,
+				isChord: false,
+				dispatchParts: ['ctrl+alt+[KeyZ]'],
+				singleModifierDispatchParts: [null],
+			}
+		);
+	});
 });
 
 suite('keyboardMapper', () => {
@@ -1462,7 +1544,7 @@ suite('keyboardMapper', () => {
 				'withAltGr': '|',
 				'withShiftAltGr': '|'
 			}
-		}, OperatingSystem.Linux);
+		}, false, OperatingSystem.Linux);
 
 		assertResolveKeyboardEvent(
 			mapper,
@@ -1472,6 +1554,7 @@ suite('keyboardMapper', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: -1,
 				code: 'Backquote'
 			},
@@ -1489,7 +1572,7 @@ suite('keyboardMapper', () => {
 	});
 
 	test('issue #24064: NumLock/NumPad keys stopped working in 1.11 on Linux', () => {
-		const mapper = new MacLinuxKeyboardMapper(false, {}, OperatingSystem.Linux);
+		const mapper = new MacLinuxKeyboardMapper(false, {}, false, OperatingSystem.Linux);
 
 		function assertNumpadKeyboardEvent(keyCode: KeyCode, code: string, label: string, electronAccelerator: string | null, userSettingsLabel: string, dispatch: string): void {
 			assertResolveKeyboardEvent(
@@ -1500,6 +1583,7 @@ suite('keyboardMapper', () => {
 					shiftKey: false,
 					altKey: false,
 					metaKey: false,
+					altGraphKey: false,
 					keyCode: keyCode,
 					code: code
 				},
@@ -1530,7 +1614,7 @@ suite('keyboardMapper', () => {
 	});
 
 	test('issue #24107: Delete, Insert, Home, End, PgUp, PgDn, and arrow keys no longer work editor in 1.11', () => {
-		const mapper = new MacLinuxKeyboardMapper(false, {}, OperatingSystem.Linux);
+		const mapper = new MacLinuxKeyboardMapper(false, {}, false, OperatingSystem.Linux);
 
 		function assertKeyboardEvent(keyCode: KeyCode, code: string, label: string, electronAccelerator: string, userSettingsLabel: string, dispatch: string): void {
 			assertResolveKeyboardEvent(
@@ -1541,6 +1625,7 @@ suite('keyboardMapper', () => {
 					shiftKey: false,
 					altKey: false,
 					metaKey: false,
+					altGraphKey: false,
 					keyCode: keyCode,
 					code: code
 				},
@@ -1588,7 +1673,7 @@ suite('keyboardMapper - LINUX ru', () => {
 	let mapper: MacLinuxKeyboardMapper;
 
 	suiteSetup(async () => {
-		const _mapper = await createKeyboardMapper(false, 'linux_ru', OperatingSystem.Linux);
+		const _mapper = await createKeyboardMapper(false, 'linux_ru', false, OperatingSystem.Linux);
 		mapper = _mapper;
 	});
 
@@ -1622,7 +1707,7 @@ suite('keyboardMapper - LINUX en_uk', () => {
 	let mapper: MacLinuxKeyboardMapper;
 
 	suiteSetup(async () => {
-		const _mapper = await createKeyboardMapper(false, 'linux_en_uk', OperatingSystem.Linux);
+		const _mapper = await createKeyboardMapper(false, 'linux_en_uk', false, OperatingSystem.Linux);
 		mapper = _mapper;
 	});
 
@@ -1639,6 +1724,7 @@ suite('keyboardMapper - LINUX en_uk', () => {
 				shiftKey: false,
 				altKey: true,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: -1,
 				code: 'Minus'
 			},
@@ -1661,7 +1747,7 @@ suite('keyboardMapper - MAC zh_hant', () => {
 	let mapper: MacLinuxKeyboardMapper;
 
 	suiteSetup(async () => {
-		const _mapper = await createKeyboardMapper(false, 'mac_zh_hant', OperatingSystem.Macintosh);
+		const _mapper = await createKeyboardMapper(false, 'mac_zh_hant', false, OperatingSystem.Macintosh);
 		mapper = _mapper;
 	});
 
@@ -1695,7 +1781,7 @@ suite('keyboardMapper - MAC zh_hant2', () => {
 	let mapper: MacLinuxKeyboardMapper;
 
 	suiteSetup(async () => {
-		const _mapper = await createKeyboardMapper(false, 'mac_zh_hant2', OperatingSystem.Macintosh);
+		const _mapper = await createKeyboardMapper(false, 'mac_zh_hant2', false, OperatingSystem.Macintosh);
 		mapper = _mapper;
 	});
 
diff --git a/src/vs/workbench/services/keybinding/test/node/windowsKeyboardMapper.test.ts b/src/vs/workbench/services/keybinding/test/node/windowsKeyboardMapper.test.ts
index 371d9b15f31efe..90d803e1c7b461 100644
--- a/src/vs/workbench/services/keybinding/test/node/windowsKeyboardMapper.test.ts
+++ b/src/vs/workbench/services/keybinding/test/node/windowsKeyboardMapper.test.ts
@@ -12,9 +12,9 @@ import { IWindowsKeyboardMapping } from 'vs/platform/keyboardLayout/common/keybo
 
 const WRITE_FILE_IF_DIFFERENT = false;
 
-async function createKeyboardMapper(isUSStandard: boolean, file: string): Promise<WindowsKeyboardMapper> {
+async function createKeyboardMapper(isUSStandard: boolean, file: string, mapAltGrToCtrlAlt: boolean): Promise<WindowsKeyboardMapper> {
 	const rawMappings = await readRawMapping<IWindowsKeyboardMapping>(file);
-	return new WindowsKeyboardMapper(isUSStandard, rawMappings);
+	return new WindowsKeyboardMapper(isUSStandard, rawMappings, mapAltGrToCtrlAlt);
 }
 
 function _assertResolveKeybinding(mapper: WindowsKeyboardMapper, k: number, expected: IResolvedKeybinding[]): void {
@@ -27,7 +27,7 @@ suite('keyboardMapper - WINDOWS de_ch', () => {
 	let mapper: WindowsKeyboardMapper;
 
 	suiteSetup(async () => {
-		mapper = await createKeyboardMapper(false, 'win_de_ch');
+		mapper = await createKeyboardMapper(false, 'win_de_ch', false);
 	});
 
 	test('mapping', () => {
@@ -77,6 +77,7 @@ suite('keyboardMapper - WINDOWS de_ch', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: KeyCode.KeyZ,
 				code: null!
 			},
@@ -119,6 +120,7 @@ suite('keyboardMapper - WINDOWS de_ch', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: KeyCode.BracketRight,
 				code: null!
 			},
@@ -271,6 +273,7 @@ suite('keyboardMapper - WINDOWS de_ch', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: KeyCode.Home,
 				code: null!
 			},
@@ -319,6 +322,7 @@ suite('keyboardMapper - WINDOWS de_ch', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: KeyCode.Ctrl,
 				code: null!
 			},
@@ -341,7 +345,7 @@ suite('keyboardMapper - WINDOWS en_us', () => {
 	let mapper: WindowsKeyboardMapper;
 
 	suiteSetup(async () => {
-		mapper = await createKeyboardMapper(true, 'win_en_us');
+		mapper = await createKeyboardMapper(true, 'win_en_us', false);
 	});
 
 	test('mapping', () => {
@@ -411,6 +415,7 @@ suite('keyboardMapper - WINDOWS en_us', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: KeyCode.Ctrl,
 				code: null!
 			},
@@ -436,6 +441,7 @@ suite('keyboardMapper - WINDOWS en_us', () => {
 				shiftKey: true,
 				altKey: false,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: KeyCode.Shift,
 				code: null!
 			},
@@ -461,6 +467,7 @@ suite('keyboardMapper - WINDOWS en_us', () => {
 				shiftKey: false,
 				altKey: true,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: KeyCode.Alt,
 				code: null!
 			},
@@ -486,6 +493,7 @@ suite('keyboardMapper - WINDOWS en_us', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: true,
+				altGraphKey: false,
 				keyCode: KeyCode.Meta,
 				code: null!
 			},
@@ -511,6 +519,7 @@ suite('keyboardMapper - WINDOWS en_us', () => {
 				shiftKey: true,
 				altKey: false,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: KeyCode.Shift,
 				code: null!
 			},
@@ -526,6 +535,34 @@ suite('keyboardMapper - WINDOWS en_us', () => {
 			}
 		);
 	});
+
+	test('resolveKeyboardEvent mapAltGrToCtrlAlt AltGr+Z', async () => {
+		const mapper = await createKeyboardMapper(true, 'win_en_us', true);
+
+		assertResolveKeyboardEvent(
+			mapper,
+			{
+				_standardKeyboardEventBrand: true,
+				ctrlKey: false,
+				shiftKey: false,
+				altKey: false,
+				metaKey: false,
+				altGraphKey: true,
+				keyCode: KeyCode.KeyZ,
+				code: null!
+			},
+			{
+				label: 'Ctrl+Alt+Z',
+				ariaLabel: 'Control+Alt+Z',
+				electronAccelerator: 'Ctrl+Alt+Z',
+				userSettingsLabel: 'ctrl+alt+z',
+				isWYSIWYG: true,
+				isChord: false,
+				dispatchParts: ['ctrl+alt+Z'],
+				singleModifierDispatchParts: [null],
+			}
+		);
+	});
 });
 
 suite('keyboardMapper - WINDOWS por_ptb', () => {
@@ -533,7 +570,7 @@ suite('keyboardMapper - WINDOWS por_ptb', () => {
 	let mapper: WindowsKeyboardMapper;
 
 	suiteSetup(async () => {
-		mapper = await createKeyboardMapper(false, 'win_por_ptb');
+		mapper = await createKeyboardMapper(false, 'win_por_ptb', false);
 	});
 
 	test('mapping', () => {
@@ -549,6 +586,7 @@ suite('keyboardMapper - WINDOWS por_ptb', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: KeyCode.ABNT_C1,
 				code: null!
 			},
@@ -574,6 +612,7 @@ suite('keyboardMapper - WINDOWS por_ptb', () => {
 				shiftKey: false,
 				altKey: false,
 				metaKey: false,
+				altGraphKey: false,
 				keyCode: KeyCode.ABNT_C2,
 				code: null!
 			},
@@ -596,7 +635,7 @@ suite('keyboardMapper - WINDOWS ru', () => {
 	let mapper: WindowsKeyboardMapper;
 
 	suiteSetup(async () => {
-		mapper = await createKeyboardMapper(false, 'win_ru');
+		mapper = await createKeyboardMapper(false, 'win_ru', false);
 	});
 
 	test('mapping', () => {
@@ -638,7 +677,7 @@ suite('keyboardMapper - misc', () => {
 				'withAltGr': '',
 				'withShiftAltGr': ''
 			}
-		});
+		}, false);
 
 		_assertResolveKeybinding(
 			mapper,
diff --git a/src/vs/workbench/services/label/common/labelService.ts b/src/vs/workbench/services/label/common/labelService.ts
index 5e3e0114503cb6..a39e7a17720ddb 100644
--- a/src/vs/workbench/services/label/common/labelService.ts
+++ b/src/vs/workbench/services/label/common/labelService.ts
@@ -14,7 +14,7 @@ import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/
 import { IWorkspaceContextService, IWorkspace, isWorkspace, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IWorkspaceIdentifier, toWorkspaceIdentifier, WORKSPACE_EXTENSION, isUntitledWorkspace, isTemporaryWorkspace } from 'vs/platform/workspace/common/workspace';
 import { basenameOrAuthority, basename, joinPath, dirname } from 'vs/base/common/resources';
 import { tildify, getPathLabel } from 'vs/base/common/labels';
-import { ILabelService, ResourceLabelFormatter, ResourceLabelFormatting, IFormatterChangeEvent } from 'vs/platform/label/common/label';
+import { ILabelService, ResourceLabelFormatter, ResourceLabelFormatting, IFormatterChangeEvent, Verbosity } from 'vs/platform/label/common/label';
 import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
 import { match } from 'vs/base/common/glob';
 import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
@@ -287,10 +287,10 @@ export class LabelService extends Disposable implements ILabelService {
 		return pathLib.basename(label);
 	}
 
-	getWorkspaceLabel(workspace: IWorkspace | IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI, options?: { verbose: boolean }): string {
+	getWorkspaceLabel(workspace: IWorkspace | IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI, options?: { verbose: Verbosity }): string {
 		if (isWorkspace(workspace)) {
 			const identifier = toWorkspaceIdentifier(workspace);
-			if (identifier) {
+			if (isSingleFolderWorkspaceIdentifier(identifier) || isWorkspaceIdentifier(identifier)) {
 				return this.getWorkspaceLabel(identifier, options);
 			}
 
@@ -315,7 +315,7 @@ export class LabelService extends Disposable implements ILabelService {
 		return '';
 	}
 
-	private doGetWorkspaceLabel(workspaceUri: URI, options?: { verbose: boolean }): string {
+	private doGetWorkspaceLabel(workspaceUri: URI, options?: { verbose: Verbosity }): string {
 
 		// Workspace: Untitled
 		if (isUntitledWorkspace(workspaceUri, this.environmentService)) {
@@ -334,17 +334,42 @@ export class LabelService extends Disposable implements ILabelService {
 		}
 
 		let label: string;
-		if (options?.verbose) {
-			label = localize('workspaceNameVerbose', "{0} (Workspace)", this.getUriLabel(joinPath(dirname(workspaceUri), filename)));
-		} else {
-			label = localize('workspaceName', "{0} (Workspace)", filename);
+		switch (options?.verbose) {
+			case Verbosity.SHORT:
+				label = filename; // skip suffix for short label
+				break;
+			case Verbosity.LONG:
+				label = localize('workspaceNameVerbose', "{0} (Workspace)", this.getUriLabel(joinPath(dirname(workspaceUri), filename)));
+				break;
+			case Verbosity.MEDIUM:
+			default:
+				label = localize('workspaceName', "{0} (Workspace)", filename);
+				break;
+		}
+
+		if (options?.verbose === Verbosity.SHORT) {
+			return label; // skip suffix for short label
 		}
 
 		return this.appendWorkspaceSuffix(label, workspaceUri);
 	}
 
-	private doGetSingleFolderWorkspaceLabel(folderUri: URI, options?: { verbose: boolean }): string {
-		const label = options?.verbose ? this.getUriLabel(folderUri) : basename(folderUri) || posix.sep;
+	private doGetSingleFolderWorkspaceLabel(folderUri: URI, options?: { verbose: Verbosity }): string {
+		let label: string;
+		switch (options?.verbose) {
+			case Verbosity.LONG:
+				label = this.getUriLabel(folderUri);
+				break;
+			case Verbosity.SHORT:
+			case Verbosity.MEDIUM:
+			default:
+				label = basename(folderUri) || posix.sep;
+				break;
+		}
+
+		if (options?.verbose === Verbosity.SHORT) {
+			return label; // skip suffix for short label
+		}
 
 		return this.appendWorkspaceSuffix(label, folderUri);
 	}
diff --git a/src/vs/workbench/services/label/test/common/mockLabelService.ts b/src/vs/workbench/services/label/test/common/mockLabelService.ts
index 0338dd144a23cc..9d46b1dd84b53a 100644
--- a/src/vs/workbench/services/label/test/common/mockLabelService.ts
+++ b/src/vs/workbench/services/label/test/common/mockLabelService.ts
@@ -7,7 +7,7 @@ import { Emitter, Event } from 'vs/base/common/event';
 import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
 import { basename, normalize } from 'vs/base/common/path';
 import { URI } from 'vs/base/common/uri';
-import { IFormatterChangeEvent, ILabelService, ResourceLabelFormatter } from 'vs/platform/label/common/label';
+import { IFormatterChangeEvent, ILabelService, ResourceLabelFormatter, Verbosity } from 'vs/platform/label/common/label';
 import { IWorkspace, IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
 
 export class MockLabelService implements ILabelService {
@@ -22,7 +22,7 @@ export class MockLabelService implements ILabelService {
 	getUriBasenameLabel(resource: URI): string {
 		return basename(resource.fsPath);
 	}
-	getWorkspaceLabel(workspace: URI | IWorkspaceIdentifier | IWorkspace, options?: { verbose: boolean }): string {
+	getWorkspaceLabel(workspace: URI | IWorkspaceIdentifier | IWorkspace, options?: { verbose: Verbosity }): string {
 		return '';
 	}
 	getHostLabel(scheme: string, authority?: string): string {
diff --git a/src/vs/workbench/services/language/common/languageService.ts b/src/vs/workbench/services/language/common/languageService.ts
index a87ae844996aa4..4c5dbafa574df2 100644
--- a/src/vs/workbench/services/language/common/languageService.ts
+++ b/src/vs/workbench/services/language/common/languageService.ts
@@ -104,6 +104,13 @@ export const languagesExtPoint: IExtensionPoint<IRawLanguageExtensionPoint[]> =
 				}
 			}
 		}
+	},
+	activationEventsGenerator: (languageContributions, result) => {
+		for (const languageContribution of languageContributions) {
+			if (languageContribution.id) {
+				result.push(`onLanguage:${languageContribution.id}`);
+			}
+		}
 	}
 });
 
@@ -173,6 +180,7 @@ export class WorkbenchLanguageService extends LanguageService {
 
 		this.onDidEncounterLanguage((languageId) => {
 			this._extensionService.activateByEvent(`onLanguage:${languageId}`);
+			this._extensionService.activateByEvent(`onLanguage`);
 		});
 	}
 
@@ -187,7 +195,7 @@ export class WorkbenchLanguageService extends LanguageService {
 			Object.keys(configuration.files.associations).forEach(pattern => {
 				const langId = configuration.files.associations[pattern];
 				if (typeof langId !== 'string') {
-					this.logService.warn(`Ingnoing configured 'files.associations' for '${pattern}' because its type is not a string but '${typeof langId}'`);
+					this.logService.warn(`Ignoring configured 'files.associations' for '${pattern}' because its type is not a string but '${typeof langId}'`);
 
 					return; // https://github.com/microsoft/vscode/issues/147284
 				}
diff --git a/src/vs/workbench/services/remote/common/remoteExplorerService.ts b/src/vs/workbench/services/remote/common/remoteExplorerService.ts
index 1993302a228562..5f40c8ecb0b634 100644
--- a/src/vs/workbench/services/remote/common/remoteExplorerService.ts
+++ b/src/vs/workbench/services/remote/common/remoteExplorerService.ts
@@ -597,7 +597,7 @@ export class TunnelModel extends Disposable {
 		return this.dialogService.show(Severity.Info, mismatchString);
 	}
 
-	async forward(tunnelProperties: TunnelProperties, attributes?: Attributes | null): Promise<RemoteTunnel | void> {
+	async forward(tunnelProperties: TunnelProperties, attributes?: Attributes | null): Promise<RemoteTunnel | undefined> {
 		const existingTunnel = mapHasAddressLocalhostOrAllInterfaces(this.forwarded, tunnelProperties.remote.host, tunnelProperties.remote.port);
 		attributes = attributes ??
 			((attributes !== null)
@@ -655,6 +655,8 @@ export class TunnelModel extends Disposable {
 			}
 			return mapHasAddressLocalhostOrAllInterfaces(this.remoteTunnels, tunnelProperties.remote.host, tunnelProperties.remote.port);
 		}
+
+		return undefined;
 	}
 
 	async name(host: string, port: number, name: string) {
@@ -894,7 +896,7 @@ export interface IRemoteExplorerService {
 	onDidChangeEditable: Event<{ tunnel: ITunnelItem; editId: TunnelEditId } | undefined>;
 	setEditable(tunnelItem: ITunnelItem | undefined, editId: TunnelEditId, data: IEditableData | null): void;
 	getEditableData(tunnelItem: ITunnelItem | undefined, editId?: TunnelEditId): IEditableData | undefined;
-	forward(tunnelProperties: TunnelProperties, attributes?: Attributes | null): Promise<RemoteTunnel | void>;
+	forward(tunnelProperties: TunnelProperties, attributes?: Attributes | null): Promise<RemoteTunnel | undefined>;
 	close(remote: { host: string; port: number }): Promise<void>;
 	setTunnelInformation(tunnelInformation: TunnelInformation | undefined): void;
 	setCandidateFilter(filter: ((candidates: CandidatePort[]) => Promise<CandidatePort[]>) | undefined): IDisposable;
@@ -953,7 +955,7 @@ class RemoteExplorerService implements IRemoteExplorerService {
 		return this._tunnelModel;
 	}
 
-	forward(tunnelProperties: TunnelProperties, attributes?: Attributes | null): Promise<RemoteTunnel | void> {
+	forward(tunnelProperties: TunnelProperties, attributes?: Attributes | null): Promise<RemoteTunnel | undefined> {
 		return this.tunnelModel.forward(tunnelProperties, attributes);
 	}
 
diff --git a/src/vs/workbench/services/search/browser/searchService.ts b/src/vs/workbench/services/search/browser/searchService.ts
index bea85f71a437db..f1fc4a45c5b0dc 100644
--- a/src/vs/workbench/services/search/browser/searchService.ts
+++ b/src/vs/workbench/services/search/browser/searchService.ts
@@ -35,7 +35,7 @@ export class RemoteSearchService extends SearchService {
 		@ILogService logService: ILogService,
 		@IExtensionService extensionService: IExtensionService,
 		@IFileService fileService: IFileService,
-		@IInstantiationService readonly instantiationService: IInstantiationService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IUriIdentityService uriIdentityService: IUriIdentityService,
 	) {
 		super(modelService, editorService, telemetryService, logService, extensionService, fileService, uriIdentityService);
diff --git a/src/vs/workbench/services/search/common/fileSearchManager.ts b/src/vs/workbench/services/search/common/fileSearchManager.ts
index 4a1199ecbaf21e..3fb1237e17801a 100644
--- a/src/vs/workbench/services/search/common/fileSearchManager.ts
+++ b/src/vs/workbench/services/search/common/fileSearchManager.ts
@@ -13,7 +13,7 @@ import { URI } from 'vs/base/common/uri';
 import { IFileMatch, IFileSearchProviderStats, IFolderQuery, ISearchCompleteStats, IFileQuery, QueryGlobTester, resolvePatternsForProvider, hasSiblingFn } from 'vs/workbench/services/search/common/search';
 import { FileSearchProvider, FileSearchOptions } from 'vs/workbench/services/search/common/searchExtTypes';
 
-export interface IInternalFileMatch {
+interface IInternalFileMatch {
 	base: URI;
 	original?: URI;
 	relativePath?: string; // Not present for extraFiles or absolute path matches
@@ -21,13 +21,13 @@ export interface IInternalFileMatch {
 	size?: number;
 }
 
-export interface IDirectoryEntry {
+interface IDirectoryEntry {
 	base: URI;
 	relativePath: string;
 	basename: string;
 }
 
-export interface IDirectoryTree {
+interface IDirectoryTree {
 	rootEntries: IDirectoryEntry[];
 	pathToEntries: { [relativePath: string]: IDirectoryEntry[] };
 }
diff --git a/src/vs/workbench/services/search/common/queryBuilder.ts b/src/vs/workbench/services/search/common/queryBuilder.ts
index 02d6c607ade7b5..d02db90040f3ca 100644
--- a/src/vs/workbench/services/search/common/queryBuilder.ts
+++ b/src/vs/workbench/services/search/common/queryBuilder.ts
@@ -26,7 +26,7 @@ import { getExcludes, ICommonQueryProps, IFileQuery, IFolderQuery, IPatternInfo,
 /**
  * One folder to search and a glob expression that should be applied.
  */
-export interface IOneSearchPathPattern {
+interface IOneSearchPathPattern {
 	searchPath: uri;
 	pattern?: string;
 }
@@ -47,7 +47,7 @@ export interface ISearchPathsInfo {
 	pattern?: glob.IExpression;
 }
 
-export interface ICommonQueryBuilderOptions {
+interface ICommonQueryBuilderOptions {
 	_reason?: string;
 	excludePattern?: string | string[];
 	includePattern?: string | string[];
@@ -345,22 +345,20 @@ export class QueryBuilder {
 			return [];
 		}
 
-		const expandedSearchPaths = arrays.flatten(
-			searchPaths.map(searchPath => {
-				// 1 open folder => just resolve the search paths to absolute paths
-				let { pathPortion, globPortion } = splitGlobFromPath(searchPath);
+		const expandedSearchPaths = searchPaths.flatMap(searchPath => {
+			// 1 open folder => just resolve the search paths to absolute paths
+			let { pathPortion, globPortion } = splitGlobFromPath(searchPath);
 
-				if (globPortion) {
-					globPortion = normalizeGlobPattern(globPortion);
-				}
+			if (globPortion) {
+				globPortion = normalizeGlobPattern(globPortion);
+			}
 
-				// One pathPortion to multiple expanded search paths (e.g. duplicate matching workspace folders)
-				const oneExpanded = this.expandOneSearchPath(pathPortion);
+			// One pathPortion to multiple expanded search paths (e.g. duplicate matching workspace folders)
+			const oneExpanded = this.expandOneSearchPath(pathPortion);
 
-				// Expanded search paths to multiple resolved patterns (with ** and without)
-				return arrays.flatten(
-					oneExpanded.map(oneExpandedResult => this.resolveOneSearchPathPattern(oneExpandedResult, globPortion)));
-			}));
+			// Expanded search paths to multiple resolved patterns (with ** and without)
+			return oneExpanded.flatMap(oneExpandedResult => this.resolveOneSearchPathPattern(oneExpandedResult, globPortion));
+		});
 
 		const searchPathPatternMap = new Map<string, ISearchPathPattern>();
 		expandedSearchPaths.forEach(oneSearchPathPattern => {
diff --git a/src/vs/workbench/services/search/node/fileSearch.ts b/src/vs/workbench/services/search/node/fileSearch.ts
index 76eec9e5ad6abb..3abfea8d4f32ae 100644
--- a/src/vs/workbench/services/search/node/fileSearch.ts
+++ b/src/vs/workbench/services/search/node/fileSearch.ts
@@ -716,7 +716,7 @@ class AbsoluteAndRelativeParsedExpression {
 	}
 }
 
-export function rgErrorMsgForDisplay(msg: string): string | undefined {
+function rgErrorMsgForDisplay(msg: string): string | undefined {
 	const lines = msg.trim().split('\n');
 	const firstLine = lines[0].trim();
 
diff --git a/src/vs/workbench/services/search/node/rawSearchService.ts b/src/vs/workbench/services/search/node/rawSearchService.ts
index c7a18abfff2785..c3a27f7440ae27 100644
--- a/src/vs/workbench/services/search/node/rawSearchService.ts
+++ b/src/vs/workbench/services/search/node/rawSearchService.ts
@@ -18,7 +18,7 @@ import { Engine as FileSearchEngine } from 'vs/workbench/services/search/node/fi
 import { TextSearchEngineAdapter } from 'vs/workbench/services/search/node/textSearchAdapter';
 
 export type IProgressCallback = (p: ISerializedSearchProgressItem) => void;
-export type IFileProgressCallback = (p: IFileSearchProgressItem) => void;
+type IFileProgressCallback = (p: IFileSearchProgressItem) => void;
 
 export class SearchService implements IRawSearchService {
 
diff --git a/src/vs/workbench/services/search/node/ripgrepFileSearch.ts b/src/vs/workbench/services/search/node/ripgrepFileSearch.ts
index 480b5e6a12f7b1..81db4f37b82734 100644
--- a/src/vs/workbench/services/search/node/ripgrepFileSearch.ts
+++ b/src/vs/workbench/services/search/node/ripgrepFileSearch.ts
@@ -82,12 +82,12 @@ function getRgArgs(config: IFileQuery, folderQuery: IFolderQuery, includePattern
 	};
 }
 
-export interface IRgGlobResult {
+interface IRgGlobResult {
 	globArgs: string[];
 	siblingClauses: glob.IExpression;
 }
 
-export function foldersToRgExcludeGlobs(folderQueries: IFolderQuery[], globalExclude?: glob.IExpression, excludesToSkip?: Set<string>, absoluteGlobs = true): IRgGlobResult {
+function foldersToRgExcludeGlobs(folderQueries: IFolderQuery[], globalExclude?: glob.IExpression, excludesToSkip?: Set<string>, absoluteGlobs = true): IRgGlobResult {
 	const globArgs: string[] = [];
 	let siblingClauses: glob.IExpression = {};
 	folderQueries.forEach(folderQuery => {
@@ -102,7 +102,7 @@ export function foldersToRgExcludeGlobs(folderQueries: IFolderQuery[], globalExc
 	return { globArgs, siblingClauses };
 }
 
-export function foldersToIncludeGlobs(folderQueries: IFolderQuery[], globalInclude?: glob.IExpression, absoluteGlobs = true): string[] {
+function foldersToIncludeGlobs(folderQueries: IFolderQuery[], globalInclude?: glob.IExpression, absoluteGlobs = true): string[] {
 	const globArgs: string[] = [];
 	folderQueries.forEach(folderQuery => {
 		const totalIncludePattern = Object.assign({}, globalInclude || {}, folderQuery.includePattern || {});
diff --git a/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts b/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
index d5eaafc1d197d4..c70e5b554ff1d2 100644
--- a/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
+++ b/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
@@ -131,7 +131,7 @@ export class RipgrepTextSearchEngine {
  * Ripgrep produces stderr output which is not from a fatal error, and we only want the search to be
  * "failed" when a fatal error was produced.
  */
-export function rgErrorMsgForDisplay(msg: string): Maybe<SearchError> {
+function rgErrorMsgForDisplay(msg: string): Maybe<SearchError> {
 	const lines = msg.split('\n');
 	const firstLine = lines[0].trim();
 
@@ -161,7 +161,7 @@ export function rgErrorMsgForDisplay(msg: string): Maybe<SearchError> {
 	return undefined;
 }
 
-export function buildRegexParseError(lines: string[]): string {
+function buildRegexParseError(lines: string[]): string {
 	const errorMessage: string[] = ['Regex parse error'];
 	const pcre2ErrorLine = lines.filter(l => (l.startsWith('PCRE2:')));
 	if (pcre2ErrorLine.length >= 1) {
@@ -495,7 +495,7 @@ function getRgArgs(query: TextSearchQuery, options: TextSearchOptions): string[]
 /**
  * `"foo/*bar/something"` -> `["foo", "foo/*bar", "foo/*bar/something", "foo/*bar/something/**"]`
  */
-export function spreadGlobComponents(globArg: string): string[] {
+function spreadGlobComponents(globArg: string): string[] {
 	const components = splitGlobAware(globArg, '/');
 	return components.map((_, i) => components.slice(0, i + 1).join('/'));
 }
diff --git a/src/vs/workbench/services/storage/electron-sandbox/storageService.ts b/src/vs/workbench/services/storage/electron-sandbox/storageService.ts
index 6c69b79301af89..ed30c87c45c8a0 100644
--- a/src/vs/workbench/services/storage/electron-sandbox/storageService.ts
+++ b/src/vs/workbench/services/storage/electron-sandbox/storageService.ts
@@ -7,13 +7,13 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
 import { IMainProcessService } from 'vs/platform/ipc/electron-sandbox/services';
 import { NativeStorageService } from 'vs/platform/storage/electron-sandbox/storageService';
 import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IEmptyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import { IAnyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
 import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
 
 export class NativeWorkbenchStorageService extends NativeStorageService {
 
 	constructor(
-		workspace: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | IEmptyWorkspaceIdentifier | undefined,
+		workspace: IAnyWorkspaceIdentifier | undefined,
 		private readonly userDataProfileService: IUserDataProfileService,
 		userDataProfilesService: IUserDataProfilesService,
 		mainProcessService: IMainProcessService,
diff --git a/src/vs/workbench/services/textMate/browser/abstractTextMateService.ts b/src/vs/workbench/services/textMate/browser/abstractTextMateService.ts
index 2f45c4699cf232..f2454a73bbcb25 100644
--- a/src/vs/workbench/services/textMate/browser/abstractTextMateService.ts
+++ b/src/vs/workbench/services/textMate/browser/abstractTextMateService.ts
@@ -23,7 +23,7 @@ import { ExtensionMessageCollector } from 'vs/workbench/services/extensions/comm
 import { ITMSyntaxExtensionPoint, grammarsExtPoint } from 'vs/workbench/services/textMate/common/TMGrammars';
 import { ITextMateService } from 'vs/workbench/services/textMate/browser/textMate';
 import { ITextMateThemingRule, IWorkbenchThemeService, IWorkbenchColorTheme } from 'vs/workbench/services/themes/common/workbenchThemeService';
-import type { IGrammar, StackElement, IOnigLib, IRawTheme } from 'vscode-textmate';
+import type { IGrammar, StateStack, IOnigLib, IRawTheme } from 'vscode-textmate';
 import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IValidGrammarDefinition, IValidEmbeddedLanguagesMap, IValidTokenTypeMap } from 'vs/workbench/services/textMate/common/TMScopeRegistry';
@@ -449,7 +449,7 @@ class TMTokenizationSupportWithLineLimit implements ITokenizationSupport {
 		throw new Error('Not supported!');
 	}
 
-	tokenizeEncoded(line: string, hasEOL: boolean, state: StackElement): EncodedTokenizationResult {
+	tokenizeEncoded(line: string, hasEOL: boolean, state: StateStack): EncodedTokenizationResult {
 		// Do not attempt to tokenize if a line is too long
 		if (line.length >= this._maxTokenizationLineLength) {
 			return nullTokenizeEncoded(this._encodedLanguageId, state);
diff --git a/src/vs/workbench/services/textMate/common/TMGrammarFactory.ts b/src/vs/workbench/services/textMate/common/TMGrammarFactory.ts
index 1e9480e81a3186..618df4a7da67a5 100644
--- a/src/vs/workbench/services/textMate/common/TMGrammarFactory.ts
+++ b/src/vs/workbench/services/textMate/common/TMGrammarFactory.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { URI } from 'vs/base/common/uri';
-import type { IGrammar, Registry, StackElement, IRawTheme, IOnigLib } from 'vscode-textmate';
+import type { IGrammar, Registry, StateStack, IOnigLib, IRawTheme } from 'vscode-textmate';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { TMScopeRegistry, IValidGrammarDefinition, IValidEmbeddedLanguagesMap } from 'vs/workbench/services/textMate/common/TMScopeRegistry';
 
@@ -17,7 +17,7 @@ interface ITMGrammarFactoryHost {
 export interface ICreateGrammarResult {
 	languageId: string;
 	grammar: IGrammar | null;
-	initialState: StackElement;
+	initialState: StateStack;
 	containsEmbeddedLanguages: boolean;
 }
 
@@ -26,7 +26,7 @@ export const missingTMGrammarErrorMessage = 'No TM Grammar registered for this l
 export class TMGrammarFactory extends Disposable {
 
 	private readonly _host: ITMGrammarFactoryHost;
-	private readonly _initialState: StackElement;
+	private readonly _initialState: StateStack;
 	private readonly _scopeRegistry: TMScopeRegistry;
 	private readonly _injections: { [scopeName: string]: string[] };
 	private readonly _injectedEmbeddedLanguages: { [scopeName: string]: IValidEmbeddedLanguagesMap[] };
diff --git a/src/vs/workbench/services/textMate/common/TMTokenization.ts b/src/vs/workbench/services/textMate/common/TMTokenization.ts
index d5265f8181c0bb..3e250fc4266c09 100644
--- a/src/vs/workbench/services/textMate/common/TMTokenization.ts
+++ b/src/vs/workbench/services/textMate/common/TMTokenization.ts
@@ -6,7 +6,7 @@
 import { Emitter, Event } from 'vs/base/common/event';
 import { IState, ITokenizationSupport, TokenizationResult, EncodedTokenizationResult } from 'vs/editor/common/languages';
 import { LanguageId, TokenMetadata } from 'vs/editor/common/encodedTokenAttributes';
-import type { IGrammar, StackElement } from 'vscode-textmate';
+import type { IGrammar, StateStack } from 'vscode-textmate';
 import { Disposable } from 'vs/base/common/lifecycle';
 
 export class TMTokenization extends Disposable implements ITokenizationSupport {
@@ -14,12 +14,12 @@ export class TMTokenization extends Disposable implements ITokenizationSupport {
 	private readonly _grammar: IGrammar;
 	private readonly _containsEmbeddedLanguages: boolean;
 	private readonly _seenLanguages: boolean[];
-	private readonly _initialState: StackElement;
+	private readonly _initialState: StateStack;
 
 	private readonly _onDidEncounterLanguage: Emitter<LanguageId> = this._register(new Emitter<LanguageId>());
 	public readonly onDidEncounterLanguage: Event<LanguageId> = this._onDidEncounterLanguage.event;
 
-	constructor(grammar: IGrammar, initialState: StackElement, containsEmbeddedLanguages: boolean) {
+	constructor(grammar: IGrammar, initialState: StateStack, containsEmbeddedLanguages: boolean) {
 		super();
 		this._grammar = grammar;
 		this._initialState = initialState;
@@ -35,7 +35,7 @@ export class TMTokenization extends Disposable implements ITokenizationSupport {
 		throw new Error('Not supported!');
 	}
 
-	public tokenizeEncoded(line: string, hasEOL: boolean, state: StackElement): EncodedTokenizationResult {
+	public tokenizeEncoded(line: string, hasEOL: boolean, state: StateStack): EncodedTokenizationResult {
 		const textMateResult = this._grammar.tokenizeLine2(line, state, 500);
 
 		if (textMateResult.stoppedEarly) {
@@ -60,7 +60,7 @@ export class TMTokenization extends Disposable implements ITokenizationSupport {
 			}
 		}
 
-		let endState: StackElement;
+		let endState: StateStack;
 		// try to save an object if possible
 		if (state.equals(textMateResult.ruleStack)) {
 			endState = state;
diff --git a/src/vs/workbench/services/textfile/browser/textFileService.ts b/src/vs/workbench/services/textfile/browser/textFileService.ts
index ba53fb83171123..b774f447750d77 100644
--- a/src/vs/workbench/services/textfile/browser/textFileService.ts
+++ b/src/vs/workbench/services/textfile/browser/textFileService.ts
@@ -10,6 +10,7 @@ import { IRevertOptions, SaveSourceRegistry } from 'vs/workbench/common/editor';
 import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
 import { IFileService, FileOperationError, FileOperationResult, IFileStatWithMetadata, ICreateFileOptions, IFileStreamContent } from 'vs/platform/files/common/files';
 import { Disposable } from 'vs/base/common/lifecycle';
+import { extname as pathExtname } from 'vs/base/common/path';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { IUntitledTextEditorService, IUntitledTextEditorModelManager } from 'vs/workbench/services/untitled/common/untitledTextEditorService';
 import { UntitledTextEditorModel } from 'vs/workbench/services/untitled/common/untitledTextEditorModel';
@@ -43,6 +44,7 @@ import { Emitter } from 'vs/base/common/event';
 import { Codicon } from 'vs/base/common/codicons';
 import { listErrorForeground } from 'vs/platform/theme/common/colorRegistry';
 import { withNullAsUndefined } from 'vs/base/common/types';
+import { firstOrDefault } from 'vs/base/common/arrays';
 
 /**
  * The workbench file service implementation implements the raw file service spec and adds additional methods on top.
@@ -425,7 +427,17 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
 		}
 
 		// Revert the source
-		await this.revert(source);
+		try {
+			await this.revert(source);
+		} catch (error) {
+
+			// It is possible that reverting the source fails, for example
+			// when a remote is disconnected and we cannot read it anymore.
+			// However, this should not interrupt the "Save As" flow, so
+			// we gracefully catch the error and just log it.
+
+			this.logService.error(error);
+		}
 
 		return target;
 	}
@@ -576,19 +588,16 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
 				}
 
 				// Untitled without associated file path: use name
-				// of untitled model if it is a valid path name,
-				// otherwise fallback to `basename`.
-				let untitledName = model.name;
-				if (!(await this.pathService.hasValidBasename(joinPath(defaultFilePath, untitledName), untitledName))) {
-					untitledName = basename(resource);
-				}
-
-				// Add language file extension if specified
-				const languageId = model.getLanguageId();
-				if (languageId && languageId !== PLAINTEXT_LANGUAGE_ID) {
-					suggestedFilename = this.suggestFilename(languageId, untitledName);
-				} else {
-					suggestedFilename = untitledName;
+				// of untitled model if it is a valid path name and
+				// figure out the file extension from the mode if any.
+
+				if (await this.pathService.hasValidBasename(joinPath(defaultFilePath, model.name), model.name)) {
+					const languageId = model.getLanguageId();
+					if (languageId && languageId !== PLAINTEXT_LANGUAGE_ID) {
+						suggestedFilename = this.suggestFilename(languageId, model.name);
+					} else {
+						suggestedFilename = model.name;
+					}
 				}
 			}
 		}
@@ -606,18 +615,31 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
 	suggestFilename(languageId: string, untitledName: string) {
 		const languageName = this.languageService.getLanguageName(languageId);
 		if (!languageName) {
-			return untitledName;
+			return untitledName; // unknown language, so we cannot suggest a better name
+		}
+
+		const untitledExtension = pathExtname(untitledName);
+
+		const extensions = this.languageService.getExtensions(languageId);
+		if (extensions.includes(untitledExtension)) {
+			return untitledName; // preserve extension if it is compatible with the mode
 		}
 
-		const extension = this.languageService.getExtensions(languageId)[0];
-		if (extension) {
-			if (!untitledName.endsWith(extension)) {
-				return untitledName + extension;
+		const primaryExtension = firstOrDefault(extensions);
+		if (primaryExtension) {
+			if (untitledExtension) {
+				return `${untitledName.substring(0, untitledName.indexOf(untitledExtension))}${primaryExtension}`;
 			}
+
+			return `${untitledName}${primaryExtension}`;
+		}
+
+		const filenames = this.languageService.getFilenames(languageId);
+		if (filenames.includes(untitledName)) {
+			return untitledName; // preserve name if it is compatible with the mode
 		}
 
-		const filename = this.languageService.getFilenames(languageId)[0];
-		return filename || untitledName;
+		return firstOrDefault(filenames) ?? untitledName;
 	}
 
 	//#endregion
diff --git a/src/vs/workbench/services/textfile/test/browser/textFileService.test.ts b/src/vs/workbench/services/textfile/test/browser/textFileService.test.ts
index ad1be2b0dade7e..45bd9ba71fdfef 100644
--- a/src/vs/workbench/services/textfile/test/browser/textFileService.test.ts
+++ b/src/vs/workbench/services/textfile/test/browser/textFileService.test.ts
@@ -160,6 +160,28 @@ suite('Files - TextFileService', () => {
 		registration.dispose();
 	});
 
+	test('Filename Suggestion - Preserve extension if it matchers', () => {
+		const registration = accessor.languageService.registerLanguage({
+			id: 'plumbus2',
+			extensions: ['.shleem', '.gazorpazorp'],
+		});
+
+		const suggested = accessor.textFileService.suggestFilename('plumbus2', 'Untitled-1.gazorpazorp');
+		assert.strictEqual(suggested, 'Untitled-1.gazorpazorp');
+		registration.dispose();
+	});
+
+	test('Filename Suggestion - Rewrite extension according to language', () => {
+		const registration = accessor.languageService.registerLanguage({
+			id: 'plumbus2',
+			extensions: ['.shleem', '.gazorpazorp'],
+		});
+
+		const suggested = accessor.textFileService.suggestFilename('plumbus2', 'Untitled-1.foobar');
+		assert.strictEqual(suggested, 'Untitled-1.shleem');
+		registration.dispose();
+	});
+
 	test('Filename Suggestion - Suggest filename if there are no extensions', () => {
 		const registration = accessor.languageService.registerLanguage({
 			id: 'plumbus2',
@@ -170,4 +192,26 @@ suite('Files - TextFileService', () => {
 		assert.strictEqual(suggested, 'plumbus');
 		registration.dispose();
 	});
+
+	test('Filename Suggestion - Preserve filename if it matches', () => {
+		const registration = accessor.languageService.registerLanguage({
+			id: 'plumbus2',
+			filenames: ['plumbus', 'shleem', 'gazorpazorp']
+		});
+
+		const suggested = accessor.textFileService.suggestFilename('plumbus2', 'gazorpazorp');
+		assert.strictEqual(suggested, 'gazorpazorp');
+		registration.dispose();
+	});
+
+	test('Filename Suggestion - Rewrites filename according to language', () => {
+		const registration = accessor.languageService.registerLanguage({
+			id: 'plumbus2',
+			filenames: ['plumbus', 'shleem', 'gazorpazorp']
+		});
+
+		const suggested = accessor.textFileService.suggestFilename('plumbus2', 'foobar');
+		assert.strictEqual(suggested, 'plumbus');
+		registration.dispose();
+	});
 });
diff --git a/src/vs/workbench/services/themes/browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
index 9e8bad431cb55c..41b75f7daf4d72 100644
--- a/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
+++ b/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
@@ -109,14 +109,14 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 		@IStorageService private readonly storageService: IStorageService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@IBrowserWorkbenchEnvironmentService readonly environmentService: IBrowserWorkbenchEnvironmentService,
+		@IBrowserWorkbenchEnvironmentService private readonly environmentService: IBrowserWorkbenchEnvironmentService,
 		@IFileService fileService: IFileService,
 		@IExtensionResourceLoaderService private readonly extensionResourceLoaderService: IExtensionResourceLoaderService,
-		@IWorkbenchLayoutService readonly layoutService: IWorkbenchLayoutService,
+		@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService,
 		@ILogService private readonly logService: ILogService,
 		@IHostColorSchemeService private readonly hostColorService: IHostColorSchemeService,
-		@IUserDataInitializationService readonly userDataInitializationService: IUserDataInitializationService,
-		@ILanguageService readonly languageService: ILanguageService
+		@IUserDataInitializationService userDataInitializationService: IUserDataInitializationService,
+		@ILanguageService languageService: ILanguageService
 	) {
 		this.container = layoutService.container;
 		this.settings = new ThemeConfiguration(configurationService);
diff --git a/src/vs/workbench/services/userDataProfile/browser/userDataProfileImportExportService.ts b/src/vs/workbench/services/userDataProfile/browser/userDataProfileImportExportService.ts
index 6ce8c8e2f1f831..86f56997c2f500 100644
--- a/src/vs/workbench/services/userDataProfile/browser/userDataProfileImportExportService.ts
+++ b/src/vs/workbench/services/userDataProfile/browser/userDataProfileImportExportService.ts
@@ -8,7 +8,7 @@ import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import * as DOM from 'vs/base/browser/dom';
-import { IUserDataProfileImportExportService, PROFILE_FILTER, PROFILE_EXTENSION, IUserDataProfileContentHandler, IS_PROFILE_IMPORT_EXPORT_IN_PROGRESS_CONTEXT, PROFILES_TTILE, defaultUserDataProfileIcon, IUserDataProfileService, IProfileResourceTreeItem, IProfileResourceChildTreeItem, PROFILES_CATEGORY, isUserDataProfileTemplate, IUserDataProfileManagementService, ProfileResourceType } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
+import { IUserDataProfileImportExportService, PROFILE_FILTER, PROFILE_EXTENSION, IUserDataProfileContentHandler, IS_PROFILE_IMPORT_EXPORT_IN_PROGRESS_CONTEXT, PROFILES_TTILE, defaultUserDataProfileIcon, IUserDataProfileService, IProfileResourceTreeItem, IProfileResourceChildTreeItem, PROFILES_CATEGORY, IUserDataProfileManagementService, ProfileResourceType } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
 import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { IDialogService, IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
@@ -42,7 +42,7 @@ import { defaultButtonStyles } from 'vs/platform/theme/browser/defaultStyles';
 import { generateUuid } from 'vs/base/common/uuid';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { EditorsOrder } from 'vs/workbench/common/editor';
-import { onUnexpectedError } from 'vs/base/common/errors';
+import { getErrorMessage, onUnexpectedError } from 'vs/base/common/errors';
 import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { IQuickInputService, QuickPickItem } from 'vs/platform/quickinput/common/quickInput';
@@ -56,6 +56,7 @@ import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService
 import { IURLHandler, IURLService } from 'vs/platform/url/common/url';
 import { asText, IRequestService } from 'vs/platform/request/common/request';
 import { IProductService } from 'vs/platform/product/common/productService';
+import { isUndefined } from 'vs/base/common/types';
 
 interface IUserDataProfileTemplate {
 	readonly name: string;
@@ -68,6 +69,18 @@ interface IUserDataProfileTemplate {
 	readonly extensions?: string;
 }
 
+function isUserDataProfileTemplate(thing: unknown): thing is IUserDataProfileTemplate {
+	const candidate = thing as IUserDataProfileTemplate | undefined;
+
+	return !!(candidate && typeof candidate === 'object'
+		&& (candidate.name && typeof candidate.name === 'string')
+		&& (isUndefined(candidate.shortName) || typeof candidate.shortName === 'string')
+		&& (isUndefined(candidate.settings) || typeof candidate.settings === 'string')
+		&& (isUndefined(candidate.globalState) || typeof candidate.globalState === 'string')
+		&& (isUndefined(candidate.extensions) || typeof candidate.extensions === 'string'));
+}
+
+
 export class UserDataProfileImportExportService extends Disposable implements IUserDataProfileImportExportService, IURLHandler {
 
 	private static readonly PROFILE_URL_AUTHORITY_PREFIX = 'profile-';
@@ -126,7 +139,11 @@ export class UserDataProfileImportExportService extends Disposable implements IU
 
 	async handleURL(uri: URI): Promise<boolean> {
 		if (this.isProfileURL(uri)) {
-			await this.importProfile(uri);
+			try {
+				await this.importProfile(uri);
+			} catch (error) {
+				this.notificationService.error(localize('profile import error', "Error while importing profile: {0}", getErrorMessage(error)));
+			}
 			return true;
 		}
 		return false;
@@ -165,7 +182,7 @@ export class UserDataProfileImportExportService extends Disposable implements IU
 				let exportProfile = await this.selectProfileResources(
 					userDataProfilesExportState,
 					localize('export title', "{0}: {1} ({2})", PROFILES_CATEGORY.value, title, this.userDataProfileService.currentProfile.name),
-					localize('export description', "Chose what to export")
+					localize('export description', "Choose what to export")
 				);
 
 				if (exportProfile === undefined) {
@@ -238,28 +255,30 @@ export class UserDataProfileImportExportService extends Disposable implements IU
 
 				let profileTemplate: IUserDataProfileTemplate = JSON.parse(profileContent);
 				if (!isUserDataProfileTemplate(profileTemplate)) {
-					this.notificationService.error('Invalid profile content.');
-					return;
+					throw new Error('Invalid profile content.');
 				}
 				const userDataProfileImportState = disposables.add(this.instantiationService.createInstance(UserDataProfileImportState, profileTemplate));
 
 				const title = localize('import profile preview', "Import");
-				let importProfile = await this.selectProfileResources(
-					userDataProfileImportState,
-					localize('import title', "{0}: {1} ({2})", PROFILES_CATEGORY.value, title, profileTemplate.name),
-					localize('import description', "Chose what to import")
-				);
 
-				if (importProfile === undefined) {
-					return;
-				}
+				if (!userDataProfileImportState.isEmpty()) {
+					let importProfile = await this.selectProfileResources(
+						userDataProfileImportState,
+						localize('import title', "{0}: {1} ({2})", PROFILES_CATEGORY.value, title, profileTemplate.name),
+						localize('import description', "Choose what to import")
+					);
 
-				if (!importProfile) {
-					importProfile = await this.showProfilePreviewView(`workbench.views.profiles.import.preview`, title, userDataProfileImportState);
-				}
+					if (importProfile === undefined) {
+						return;
+					}
 
-				if (!importProfile) {
-					return;
+					if (!importProfile) {
+						importProfile = await this.showProfilePreviewView(`workbench.views.profiles.import.preview`, title, userDataProfileImportState);
+					}
+
+					if (!importProfile) {
+						return;
+					}
 				}
 
 				profileTemplate = await userDataProfileImportState.getProfileTemplateToImport();
@@ -335,10 +354,8 @@ export class UserDataProfileImportExportService extends Disposable implements IU
 			return await asText(context);
 		} else {
 			const message = await asText(context);
-			this.logService.info(`Failed to get profile from URL: ${resource.toString()}. Status code: ${context.res.statusCode}. Message: ${message}`);
+			throw new Error(`Failed to get profile from URL: ${resource.toString()}. Status code: ${context.res.statusCode}. Message: ${message}`);
 		}
-
-		return null;
 	}
 
 	private async pickProfileContentHandler(name: string): Promise<string | undefined> {
@@ -942,6 +959,10 @@ class UserDataProfileImportState extends UserDataProfileImportExportState {
 		return roots;
 	}
 
+	isEmpty(): boolean {
+		return !(this.profile.settings || this.profile.keybindings || this.profile.tasks || this.profile.snippets || this.profile.globalState || this.profile.extensions);
+	}
+
 	async getProfileTemplateToImport(): Promise<IUserDataProfileTemplate> {
 		return this.getProfileTemplate(this.profile.name, this.profile.shortName);
 	}
diff --git a/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts b/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts
index 0bc2e066433d5d..eba6222fc4dad0 100644
--- a/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts
+++ b/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts
@@ -8,8 +8,8 @@ import { localize } from 'vs/nls';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { DidChangeProfilesEvent, IUserDataProfile, IUserDataProfileOptions, IUserDataProfilesService, IUserDataProfileUpdateOptions, WorkspaceIdentifier } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
+import { DidChangeProfilesEvent, IUserDataProfile, IUserDataProfileOptions, IUserDataProfilesService, IUserDataProfileUpdateOptions } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { IWorkspaceContextService, toWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { IHostService } from 'vs/workbench/services/host/browser/host';
@@ -65,14 +65,14 @@ export class UserDataProfileManagementService extends Disposable implements IUse
 	}
 
 	async createAndEnterProfile(name: string, options?: IUserDataProfileOptions, fromExisting?: boolean): Promise<IUserDataProfile> {
-		const profile = await this.userDataProfilesService.createNamedProfile(name, options, this.getWorkspaceIdentifier());
+		const profile = await this.userDataProfilesService.createNamedProfile(name, options, toWorkspaceIdentifier(this.workspaceContextService.getWorkspace()));
 		await this.enterProfile(profile, !!fromExisting);
 		this.telemetryService.publicLog2<ProfileManagementActionExecutedEvent, ProfileManagementActionExecutedClassification>('profileManagementActionExecuted', { id: 'createAndEnterProfile' });
 		return profile;
 	}
 
 	async createAndEnterTransientProfile(): Promise<IUserDataProfile> {
-		const profile = await this.userDataProfilesService.createTransientProfile(this.getWorkspaceIdentifier());
+		const profile = await this.userDataProfilesService.createTransientProfile(toWorkspaceIdentifier(this.workspaceContextService.getWorkspace()));
 		await this.enterProfile(profile, false);
 		this.telemetryService.publicLog2<ProfileManagementActionExecutedEvent, ProfileManagementActionExecutedClassification>('profileManagementActionExecuted', { id: 'createAndEnterTransientProfile' });
 		return profile;
@@ -101,7 +101,7 @@ export class UserDataProfileManagementService extends Disposable implements IUse
 	}
 
 	async switchProfile(profile: IUserDataProfile): Promise<void> {
-		const workspaceIdentifier = this.getWorkspaceIdentifier();
+		const workspaceIdentifier = toWorkspaceIdentifier(this.workspaceContextService.getWorkspace());
 		if (!this.userDataProfilesService.profiles.some(p => p.id === profile.id)) {
 			throw new Error(`Profile ${profile.name} does not exist`);
 		}
@@ -113,17 +113,6 @@ export class UserDataProfileManagementService extends Disposable implements IUse
 		this.telemetryService.publicLog2<ProfileManagementActionExecutedEvent, ProfileManagementActionExecutedClassification>('profileManagementActionExecuted', { id: 'switchProfile' });
 	}
 
-	private getWorkspaceIdentifier(): WorkspaceIdentifier {
-		const workspace = this.workspaceContextService.getWorkspace();
-		switch (this.workspaceContextService.getWorkbenchState()) {
-			case WorkbenchState.FOLDER:
-				return { uri: workspace.folders[0].uri, id: workspace.id };
-			case WorkbenchState.WORKSPACE:
-				return { configPath: workspace.configuration!, id: workspace.id };
-		}
-		return 'empty-window';
-	}
-
 	private async enterProfile(profile: IUserDataProfile, preserveData: boolean, reloadMessage?: string): Promise<void> {
 		const isRemoteWindow = !!this.environmentService.remoteAuthority;
 
diff --git a/src/vs/workbench/services/workingCopy/common/fileWorkingCopyManager.ts b/src/vs/workbench/services/workingCopy/common/fileWorkingCopyManager.ts
index 3d2df342bae45f..eb631f9719bad8 100644
--- a/src/vs/workbench/services/workingCopy/common/fileWorkingCopyManager.ts
+++ b/src/vs/workbench/services/workingCopy/common/fileWorkingCopyManager.ts
@@ -148,7 +148,7 @@ export class FileWorkingCopyManager<S extends IStoredFileWorkingCopyModel, U ext
 		@IFileService private readonly fileService: IFileService,
 		@ILifecycleService lifecycleService: ILifecycleService,
 		@ILabelService labelService: ILabelService,
-		@ILogService logService: ILogService,
+		@ILogService private readonly logService: ILogService,
 		@IWorkingCopyFileService private readonly workingCopyFileService: IWorkingCopyFileService,
 		@IWorkingCopyBackupService workingCopyBackupService: IWorkingCopyBackupService,
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
@@ -423,7 +423,17 @@ export class FileWorkingCopyManager<S extends IStoredFileWorkingCopyModel, U ext
 		}
 
 		// Revert the source
-		await sourceWorkingCopy?.revert();
+		try {
+			await sourceWorkingCopy?.revert();
+		} catch (error) {
+
+			// It is possible that reverting the source fails, for example
+			// when a remote is disconnected and we cannot read it anymore.
+			// However, this should not interrupt the "Save As" flow, so
+			// we gracefully catch the error and just log it.
+
+			this.logService.error(error);
+		}
 
 		return targetStoredFileWorkingCopy;
 	}
diff --git a/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.ts b/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.ts
index 47a2646ef4fd03..4653e395be9efe 100644
--- a/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.ts
+++ b/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.ts
@@ -6,7 +6,7 @@
 import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing';
 import { URI } from 'vs/base/common/uri';
 import { localize } from 'vs/nls';
-import { hasWorkspaceFileExtension, isSavedWorkspace, isUntitledWorkspace, IWorkspaceContextService, IWorkspaceIdentifier, WorkbenchState, WORKSPACE_EXTENSION, WORKSPACE_FILTER } from 'vs/platform/workspace/common/workspace';
+import { hasWorkspaceFileExtension, isSavedWorkspace, isUntitledWorkspace, isWorkspaceIdentifier, IWorkspaceContextService, IWorkspaceIdentifier, toWorkspaceIdentifier, WorkbenchState, WORKSPACE_EXTENSION, WORKSPACE_FILTER } from 'vs/platform/workspace/common/workspace';
 import { IJSONEditingService, JSONEditingError, JSONEditingErrorCode } from 'vs/workbench/services/configuration/common/jsonEditing';
 import { IWorkspaceFolderCreationData, IWorkspacesService, rewriteWorkspaceFileForNewLocation, IEnterWorkspaceResult, IStoredWorkspace } from 'vs/platform/workspaces/common/workspaces';
 import { WorkspaceService } from 'vs/workbench/services/configuration/browser/configurationService';
@@ -331,9 +331,6 @@ export abstract class AbstractWorkspaceEditingService implements IWorkspaceEditi
 			case JSONEditingErrorCode.ERROR_INVALID_FILE:
 				this.onInvalidWorkspaceConfigurationFileError();
 				break;
-			case JSONEditingErrorCode.ERROR_FILE_DIRTY:
-				this.onWorkspaceConfigurationFileDirtyError();
-				break;
 			default:
 				this.notificationService.error(error.message);
 		}
@@ -344,11 +341,6 @@ export abstract class AbstractWorkspaceEditingService implements IWorkspaceEditi
 		this.askToOpenWorkspaceConfigurationFile(message);
 	}
 
-	private onWorkspaceConfigurationFileDirtyError(): void {
-		const message = localize('errorWorkspaceConfigurationFileDirty', "Unable to write into workspace configuration file because the file has unsaved changes. Please save it and try again.");
-		this.askToOpenWorkspaceConfigurationFile(message);
-	}
-
 	private askToOpenWorkspaceConfigurationFile(message: string): void {
 		this.notificationService.prompt(Severity.Error, message,
 			[{
@@ -408,9 +400,9 @@ export abstract class AbstractWorkspaceEditingService implements IWorkspaceEditi
 	}
 
 	protected getCurrentWorkspaceIdentifier(): IWorkspaceIdentifier | undefined {
-		const workspace = this.contextService.getWorkspace();
-		if (workspace?.configuration) {
-			return { id: workspace.id, configPath: workspace.configuration };
+		const identifier = toWorkspaceIdentifier(this.contextService.getWorkspace());
+		if (isWorkspaceIdentifier(identifier)) {
+			return identifier;
 		}
 
 		return undefined;
diff --git a/src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts b/src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts
index 3d4f731f544c92..d754fcb05536ca 100644
--- a/src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts
+++ b/src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts
@@ -21,7 +21,7 @@ import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/enviro
 import { ILifecycleService, ShutdownReason } from 'vs/workbench/services/lifecycle/common/lifecycle';
 import { IFileDialogService, IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ILabelService } from 'vs/platform/label/common/label';
+import { ILabelService, Verbosity } from 'vs/platform/label/common/label';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { IHostService } from 'vs/workbench/services/host/browser/host';
 import { AbstractWorkspaceEditingService } from 'vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService';
@@ -127,7 +127,7 @@ export class NativeWorkspaceEditingService extends AbstractWorkspaceEditingServi
 					// Make sure to add the new workspace to the history to find it again
 					const newWorkspaceIdentifier = await this.workspacesService.getWorkspaceIdentifier(newWorkspacePath);
 					await this.workspacesService.addRecentlyOpened([{
-						label: this.labelService.getWorkspaceLabel(newWorkspaceIdentifier, { verbose: true }),
+						label: this.labelService.getWorkspaceLabel(newWorkspaceIdentifier, { verbose: Verbosity.LONG }),
 						workspace: newWorkspaceIdentifier,
 						remoteAuthority: this.environmentService.remoteAuthority // remember whether this was a remote window
 					}]);
diff --git a/src/vs/workbench/test/browser/workbenchTestServices.ts b/src/vs/workbench/test/browser/workbenchTestServices.ts
index 9fc4fb1c059a43..9733bf13d9e5b4 100644
--- a/src/vs/workbench/test/browser/workbenchTestServices.ts
+++ b/src/vs/workbench/test/browser/workbenchTestServices.ts
@@ -1762,7 +1762,7 @@ export class TestTerminalInstanceService implements ITerminalInstanceService {
 
 	convertProfileToShellLaunchConfig(shellLaunchConfigOrProfile?: IShellLaunchConfig | ITerminalProfile, cwd?: string | URI): IShellLaunchConfig { throw new Error('Method not implemented.'); }
 	preparePathForTerminalAsync(path: string, executable: string | undefined, title: string, shellType: TerminalShellType, remoteAuthority: string | undefined): Promise<string> { throw new Error('Method not implemented.'); }
-	createInstance(options: ICreateTerminalOptions, target?: TerminalLocation): ITerminalInstance { throw new Error('Method not implemented.'); }
+	createInstance(options: ICreateTerminalOptions, target: TerminalLocation): ITerminalInstance { throw new Error('Method not implemented.'); }
 	async getBackend(remoteAuthority?: string): Promise<ITerminalBackend | undefined> { throw new Error('Method not implemented.'); }
 }
 
diff --git a/src/vs/workbench/workbench.desktop.main.ts b/src/vs/workbench/workbench.desktop.main.ts
index e5879f4ecb3235..a082d3522e9137 100644
--- a/src/vs/workbench/workbench.desktop.main.ts
+++ b/src/vs/workbench/workbench.desktop.main.ts
@@ -51,6 +51,7 @@ import 'vs/workbench/services/contextmenu/electron-sandbox/contextmenuService';
 import 'vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService';
 import 'vs/workbench/services/configurationResolver/electron-sandbox/configurationResolverService';
 import 'vs/workbench/services/accessibility/electron-sandbox/accessibilityService';
+import 'vs/workbench/services/keybinding/electron-sandbox/nativeKeyboardLayout';
 import 'vs/workbench/services/path/electron-sandbox/pathService';
 import 'vs/workbench/services/themes/electron-sandbox/nativeHostColorSchemeService';
 import 'vs/workbench/services/extensionManagement/electron-sandbox/extensionManagementService';
diff --git a/src/vscode-dts/vscode.d.ts b/src/vscode-dts/vscode.d.ts
index afbdd45387ec5e..df03b4e8055b6b 100644
--- a/src/vscode-dts/vscode.d.ts
+++ b/src/vscode-dts/vscode.d.ts
@@ -3647,36 +3647,36 @@ declare module 'vscode' {
 		has(uri: Uri): boolean;
 
 		/**
-		 * Set (and replace) notebook edits for a resource.
+		 * Set (and replace) text edits or snippet edits for a resource.
 		 *
 		 * @param uri A resource identifier.
 		 * @param edits An array of edits.
 		 */
-		set(uri: Uri, edits: readonly NotebookEdit[]): void;
+		set(uri: Uri, edits: ReadonlyArray<TextEdit | SnippetTextEdit>): void;
 
 		/**
-		 * Set (and replace) notebook edits with metadata for a resource.
+		 * Set (and replace) text edits or snippet edits with metadata for a resource.
 		 *
 		 * @param uri A resource identifier.
 		 * @param edits An array of edits.
 		 */
-		set(uri: Uri, edits: ReadonlyArray<[NotebookEdit, WorkspaceEditEntryMetadata]>): void;
+		set(uri: Uri, edits: ReadonlyArray<[TextEdit | SnippetTextEdit, WorkspaceEditEntryMetadata]>): void;
 
 		/**
-		 * Set (and replace) text edits or snippet edits for a resource.
+		 * Set (and replace) notebook edits for a resource.
 		 *
 		 * @param uri A resource identifier.
 		 * @param edits An array of edits.
 		 */
-		set(uri: Uri, edits: ReadonlyArray<TextEdit | SnippetTextEdit>): void;
+		set(uri: Uri, edits: readonly NotebookEdit[]): void;
 
 		/**
-		 * Set (and replace) text edits or snippet edits with metadata for a resource.
+		 * Set (and replace) notebook edits with metadata for a resource.
 		 *
 		 * @param uri A resource identifier.
 		 * @param edits An array of edits.
 		 */
-		set(uri: Uri, edits: ReadonlyArray<[TextEdit | SnippetTextEdit, WorkspaceEditEntryMetadata]>): void;
+		set(uri: Uri, edits: ReadonlyArray<[NotebookEdit, WorkspaceEditEntryMetadata]>): void;
 
 		/**
 		 * Get the text edits for a resource.
@@ -6468,7 +6468,7 @@ declare module 'vscode' {
 	/**
 	 * A channel for containing log output.
 	 *
-	 * To get an instance of an `LogOutputChannel` use
+	 * To get an instance of a `LogOutputChannel` use
 	 * {@link window.createOutputChannel createOutputChannel}.
 	 */
 	export interface LogOutputChannel extends OutputChannel {
diff --git a/src/vscode-dts/vscode.proposed.contribCommentEditorActionsMenu.d.ts b/src/vscode-dts/vscode.proposed.contribCommentEditorActionsMenu.d.ts
new file mode 100644
index 00000000000000..9b24bcc32ea1c3
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.contribCommentEditorActionsMenu.d.ts
@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// empty placeholder declaration for the `comments/comment/editorActions` menu
diff --git a/src/vscode-dts/vscode.proposed.telemetryLogger.d.ts b/src/vscode-dts/vscode.proposed.telemetryLogger.d.ts
index 60a366386f49c5..5e8dd061963d57 100644
--- a/src/vscode-dts/vscode.proposed.telemetryLogger.d.ts
+++ b/src/vscode-dts/vscode.proposed.telemetryLogger.d.ts
@@ -14,8 +14,26 @@ declare module 'vscode' {
 		constructor(value: T);
 	}
 
+	export interface TelemetryInitializationOptions {
+		/**
+		 * Whether or not you want to avoid having the built-in common properties such as os, extension name, etc injected into the data object.
+		 * Defaults to false if not defined.
+		 */
+		readonly ignoreBuiltInCommonProperties?: boolean;
+
+		/**
+		 * Any additional common properties which should be injected into the data object.
+		 */
+		readonly additionalCommonProperties?: Record<string, any>;
+
+		/**
+		 * Whether or not unhandled errors on the extension host caused by your extension should be logged to your appender.
+		 * Defaults to false if not defined.
+		 */
+		readonly ignoreUnhandledErrors?: boolean;
+	}
+
 	export interface TelemetryLogger {
-		//TODO feels weird having this on all loggers
 		readonly onDidChangeEnableStates: Event<TelemetryLogger>;
 		readonly isUsageEnabled: boolean;
 		readonly isErrorsEnabled: boolean;
@@ -40,25 +58,15 @@ declare module 'vscode' {
 		 * Calls `TelemetryAppender.logException`. Does cleaning, telemetry checks, and data mix-in.
 		 * Automatically supports echoing to extension telemetry output channel.
 		 * Will also automatically log any exceptions thrown within the extension host process.
-		 * @param exception The error object which contains the stack trace cleaned of PII
+		 * @param error The error object which contains the stack trace cleaned of PII
 		 * @param data Additional data to log alongside the stack trace
 		 */
-		logError(exception: Error, data?: Record<string, any | TrustedTelemetryValue>): void;
+		logError(error: Error, data?: Record<string, any | TrustedTelemetryValue>): void;
 
 		dispose(): void;
 	}
 
 	export interface TelemetryAppender {
-		/**
-		 * Whether or not you want to avoid having the built-in common properties such as os, extension name, etc injected into the data object.
-		 */
-		readonly ignoreBuiltInCommonProperties: boolean;
-
-		/**
-		 * Any additional common properties which should be injected into the data object.
-		 */
-		readonly additionalCommonProperties?: Record<string, any>;
-
 		/**
 		 * User-defined function which logs an event, used within the TelemetryLogger
 		 * @param eventName The name of the event which you are logging
@@ -68,10 +76,10 @@ declare module 'vscode' {
 
 		/**
 		 * User-defined function which logs an error, used within the TelemetryLogger
-		 * @param exception The exception being logged
+		 * @param error The error being logged
 		 * @param data Any additional data to be collected with the exception
 		 */
-		logException(exception: Error, data?: Record<string, any>): void;
+		logError(error: Error, data?: Record<string, any>): void;
 
 		/**
 		 * Optional flush function which will give your appender one last chance to send any remaining events as the TelemetryLogger is being disposed
@@ -85,6 +93,6 @@ declare module 'vscode' {
 		 * @param appender The core piece which we call when it is time to log telemetry. It is highly recommended that you don't call the methods within the appender directly as the logger provides extra guards and cleaning.
 		 * @returns An instantiated telemetry logger which you can use for recording telemetry
 		 */
-		export function createTelemetryLogger(appender: TelemetryAppender): TelemetryLogger;
+		export function createTelemetryLogger(appender: TelemetryAppender, options?: TelemetryInitializationOptions): TelemetryLogger;
 	}
 }
diff --git a/src/vscode-dts/vscode.proposed.terminalQuickFixProvider.d.ts b/src/vscode-dts/vscode.proposed.terminalQuickFixProvider.d.ts
index 2e27d9925cc1ab..1206b8705ec160 100644
--- a/src/vscode-dts/vscode.proposed.terminalQuickFixProvider.d.ts
+++ b/src/vscode-dts/vscode.proposed.terminalQuickFixProvider.d.ts
@@ -12,19 +12,16 @@ declare module 'vscode' {
 		 * @param token A cancellation token indicating the result is no longer needed
 		 * @return Terminal quick fix(es) if any
 		 */
-		provideTerminalQuickFixes(commandMatchResult: TerminalCommandMatchResult, token: CancellationToken): TerminalQuickFix[] | TerminalQuickFix | undefined;
+		provideTerminalQuickFixes(commandMatchResult: TerminalCommandMatchResult, token: CancellationToken): ProviderResult<(TerminalQuickFixCommand | TerminalQuickFixOpener)[] | TerminalQuickFixCommand | TerminalQuickFixOpener>;
 	}
 
-	interface TerminalQuickFix {
-		type: TerminalQuickFixType;
-	}
 
 	export interface TerminalCommandMatchResult {
 		commandLine: string;
 		commandLineMatch: RegExpMatchArray;
 		outputMatch?: {
 			regexMatch: RegExpMatchArray;
-			outputLines?: string[];
+			outputLines: string[];
 		};
 	}
 
@@ -36,13 +33,19 @@ declare module 'vscode' {
 		export function registerTerminalQuickFixProvider(id: string, provider: TerminalQuickFixProvider): Disposable;
 	}
 
-	export interface TerminalQuickFixCommandAction extends TerminalQuickFix {
-		type: TerminalQuickFixType.command;
+	export class TerminalQuickFixCommand {
+		/**
+		 * The terminal command to run
+		 */
 		terminalCommand: string;
+		constructor(terminalCommand: string);
 	}
-	export interface TerminalQuickFixOpenerAction extends TerminalQuickFix {
-		type: TerminalQuickFixType.opener;
+	export class TerminalQuickFixOpener {
+		/**
+		 * The uri to open
+		 */
 		uri: Uri;
+		constructor(uri: Uri);
 	}
 
 	/**
@@ -67,21 +70,15 @@ declare module 'vscode' {
 		 * reasons. This is capped at 40.
 		 */
 		length: number;
-
-		/**
-		 * If multiple matches are expected - this will result in {@link outputLines} being returned
-		 * when there's a {@link regexMatch} from {@link offset} to {@link length}
-		 */
-		multipleMatches?: boolean;
 	}
 
 	enum TerminalOutputAnchor {
-		top = 'top',
-		bottom = 'bottom'
+		Top = 0,
+		Bottom = 1
 	}
 
 	enum TerminalQuickFixType {
-		command = 'command',
-		opener = 'opener'
+		Command = 0,
+		Opener = 1
 	}
 }
diff --git a/test/integration/electron/testrunner.d.ts b/test/integration/electron/testrunner.d.ts
new file mode 100644
index 00000000000000..041b7a7b9ba551
--- /dev/null
+++ b/test/integration/electron/testrunner.d.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 { MochaOptions } from 'mocha';
+
+export function configure(opts: MochaOptions): void;
+
+export function run(testsRoot: string[], clb: (error: Error | undefined, failures: number | undefined) => void): void;
diff --git a/test/smoke/package.json b/test/smoke/package.json
index 81812c0af5fbca..ef9ec20950158e 100644
--- a/test/smoke/package.json
+++ b/test/smoke/package.json
@@ -11,7 +11,7 @@
     "mocha": "node ../node_modules/mocha/bin/mocha"
   },
   "dependencies": {
-    "@vscode/test-electron": "2.1.4",
+    "@vscode/test-electron": "^2.2.1",
     "mkdirp": "^1.0.4",
     "ncp": "^2.0.0",
     "node-fetch": "^2.6.7",
diff --git a/test/smoke/yarn.lock b/test/smoke/yarn.lock
index 01f13b3a814f2d..ab0960284b8b6b 100644
--- a/test/smoke/yarn.lock
+++ b/test/smoke/yarn.lock
@@ -71,10 +71,10 @@
     "@types/glob" "*"
     "@types/node" "*"
 
-"@vscode/test-electron@2.1.4":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@vscode/test-electron/-/test-electron-2.1.4.tgz#fa1b8915246d0102e81d4fd664bb6c337ca7092f"
-  integrity sha512-tHHAWNVwl8C7nyezHAHdNPWkksdXWvmae6bt4k1tJ9hvMm6QIIk95Mkutl82XHcD60mdP46EHDGU+xFsAvygOQ==
+"@vscode/test-electron@^2.2.1":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@vscode/test-electron/-/test-electron-2.2.1.tgz#6d1ac128e27c18e1d20bcb299e830b50587f74ca"
+  integrity sha512-DUdwSYVc9p/PbGveaq20dbAAXHfvdq4zQ24ILp6PKizOBxrOfMsOq8Vts5nMzeIo0CxtA/RxZLFyDv001PiUSg==
   dependencies:
     http-proxy-agent "^4.0.1"
     https-proxy-agent "^5.0.0"
diff --git a/test/unit/README.md b/test/unit/README.md
index 8ac82b99d8cd98..9ad1c7a6a1579b 100644
--- a/test/unit/README.md
+++ b/test/unit/README.md
@@ -27,7 +27,7 @@ Unit tests from layers `common` and `browser` are run inside `chromium`, `webkit
 
 ## Run (with node)
 
-    yarn run mocha --ui tdd --run src/vs/editor/test/browser/controller/cursor.test.ts
+    yarn test-node --run src/vs/editor/test/browser/controller/cursor.test.ts
 
 ## Coverage
 
diff --git a/yarn.lock b/yarn.lock
index a9de0a8537461b..9830e7329127e4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -628,10 +628,10 @@
   resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.0.3.tgz#13a12ae9e05c2a782f7b5e84c3cbfda4225eaf80"
   integrity sha512-puWxACExDe9nxbBB3lOymQFrLYml2dVOrd7USiVRnSbgXE+KwBu+HxFvxrzfqsiSda9IWsXJG1ef7C1O2/GmKQ==
 
-"@parcel/watcher@2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.0.5.tgz#f913a54e1601b0aac972803829b0eece48de215b"
-  integrity sha512-x0hUbjv891omnkcHD7ZOhiyyUqUUR6MNjq89JhEI3BxppeKWAm6NPQsqqRrAkCJBogdT/o/My21sXtTI9rJIsw==
+"@parcel/watcher@2.0.7":
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.0.7.tgz#c95fe1370e8c6237cb9729c9c075264acc7e21a5"
+  integrity sha512-gc3hoS6e+2XdIQ4HHljDB1l0Yx2EWh/sBBtCEFNKGSMlwASWeAQsOY/fPbxOBcZ/pg0jBh4Ga+4xHlZc4faAEQ==
   dependencies:
     node-addon-api "^3.2.1"
     node-gyp-build "^4.3.0"
@@ -1252,15 +1252,15 @@
   resolved "https://registry.yarnpkg.com/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz#d2f1e0664ee6036408f9743fee264ea0699b0e48"
   integrity sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==
 
-"@vscode/l10n-dev@0.0.18":
-  version "0.0.18"
-  resolved "https://registry.yarnpkg.com/@vscode/l10n-dev/-/l10n-dev-0.0.18.tgz#80a8cf6ef13c7fe1796be7b0007d71993bd1832f"
-  integrity sha512-pEKLMnlg7hlxFrZLqcyJe08olmj6KVs2Rof7MVB5rN0D6NOKPBRtkQ176TuMUmW863EDV5WQUgNzOGa2nHBSSQ==
+"@vscode/l10n-dev@0.0.21":
+  version "0.0.21"
+  resolved "https://registry.yarnpkg.com/@vscode/l10n-dev/-/l10n-dev-0.0.21.tgz#c25a29c7d1484b1dacf4ba98fbd16c1b32a0087e"
+  integrity sha512-KR3OvvLs8AGCWM3LHAAKUfltltANdGjX4fn2jfY13Eb5z4c6smR81p7a9yTo6Kr///zSZuBHQ/hXMmMRtuPTBw==
   dependencies:
     deepmerge-json "^1.5.0"
     glob "^8.0.3"
     pseudo-localization "^2.4.0"
-    typescript "^4.7.4"
+    web-tree-sitter "^0.20.7"
     xml2js "^0.4.23"
     yargs "^17.5.1"
 
@@ -3513,9 +3513,9 @@ decamelize@^4.0.0:
   integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==
 
 decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
+  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
 
 decompress-response@^3.3.0:
   version "3.3.0"
@@ -3912,10 +3912,10 @@ electron-to-chromium@^1.4.202:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.207.tgz#9c3310ebace2952903d05dcaba8abe3a4ed44c01"
   integrity sha512-piH7MJDJp4rJCduWbVvmUd59AUne1AFBJ8JaRQvk0KzNTSUnZrVXHCZc+eg+CGE4OujkcLJznhGKD6tuAshj5Q==
 
-electron@19.1.6:
-  version "19.1.6"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-19.1.6.tgz#32443cd293d3d877cd3d224e45880e3fbf264e49"
-  integrity sha512-bT6Mr7JbHbONpr/U7R47lwTkMUvuAyOfnoLlbDqvGocQyZCCN3JB436wtf2+r3/IpMEz3T+dHLweFDY5i2wuxw==
+electron@19.1.8:
+  version "19.1.8"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-19.1.8.tgz#3ce19c270ca86d05bbf0df5ceeaea2d23edc7083"
+  integrity sha512-UfPQdFjgKI0xCm1V5sV3iAVOs0kCwAE91xWzV5tI7ij14yOkxTdXp9BqTzFaSbQYLYxn6q1BUUe1nlzjJjzAnw==
   dependencies:
     "@electron/get" "^1.14.1"
     "@types/node" "^16.11.26"
@@ -4609,10 +4609,10 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
-fast-plist@0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/fast-plist/-/fast-plist-0.1.2.tgz#a45aff345196006d406ca6cdcd05f69051ef35b8"
-  integrity sha1-pFr/NFGWAG1AbKbNzQX2kFHvNbg=
+fast-plist@0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/fast-plist/-/fast-plist-0.1.3.tgz#328cd9335e93a2479ac90814a1302437574ea925"
+  integrity sha512-d9cEfo/WcOezgPLAC/8t8wGb6YOD6JTCPMw2QcG2nAdFmyY+9rTUizCTaGjIZAloWENTEUMAPpkUAIJJJ0i96A==
 
 fastest-levenshtein@^1.0.12:
   version "1.0.12"
@@ -7611,15 +7611,15 @@ native-is-elevated@0.4.3:
   resolved "https://registry.yarnpkg.com/native-is-elevated/-/native-is-elevated-0.4.3.tgz#f1071c4a821acc71d43f36ff8051d3816d832e1c"
   integrity sha512-bHS3sCoh+raqFGIxmL/plER3eBQ+IEBy4RH/4uahhToZneTvqNKQrL0PgOTtnpL55XjBd3dy0pNtZMkCk0J48g==
 
-native-keymap@3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/native-keymap/-/native-keymap-3.3.0.tgz#927ca6afcf4ebd986b5dc1bddfab4270e750915d"
-  integrity sha512-nvhI1Cdr+ywhpqqGdM+JM8EjMYA1s6SW8EqhWNKtffHU07JcTKDhd8N3o0TLSFn8y2YuRFoOwfAIzdTU6TVhDA==
+native-keymap@3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/native-keymap/-/native-keymap-3.3.2.tgz#de3b3161b6041be80ac754bfed44a499aa8b3409"
+  integrity sha512-AKE9k0jVOPrpfSlmtNDVJaADW+Vo6dDHQf55Ystvc5Aj4REbmlMSqXIBU1LpMC2pEzxzg0O2zbtQYWmqETfhzg==
 
-native-watchdog@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/native-watchdog/-/native-watchdog-1.4.0.tgz#547a1f9f88754c38089c622d405ed1e324c7a545"
-  integrity sha512-4FynAeGtTpoQ2+5AxVJXGEGsOzPsNYDh8Xmawjgs7YWJe+bbbgt7CYlA/Qx6X+kwtN5Ey1aNSm9MqZa0iNKkGw==
+native-watchdog@1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/native-watchdog/-/native-watchdog-1.4.1.tgz#f5462cb878796c75f8a6c3c71aa0aa52d4992e05"
+  integrity sha512-RzGXNgoe54BmkkIFwegz7eeJm7xovTj/VG5qREfF+KeSqiVzHGnVwFoLzNLlYsqSSdIOIYoCOFlEhoS+asRVyQ==
 
 natural-compare@^1.4.0:
   version "1.4.0"
@@ -9008,9 +9008,9 @@ q@^1.1.2:
   integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
 qs@~6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
+  integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
 
 querystring-es3@^0.2.0:
   version "0.2.1"
@@ -10858,10 +10858,10 @@ typescript@^4.7.4:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6"
   integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==
 
-typescript@^5.0.0-dev.20221108:
-  version "5.0.0-dev.20221108"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.0-dev.20221108.tgz#52cecdf226b983a33eadb2e6c9a8c040f7a7349f"
-  integrity sha512-np7hLTLHztenzHetS6xnYYo/P+VcjgUYWkblyl8jCeKgrC7fHJt1QlcjL83uC7YQiHLz5o9zgMZKtZbQBHPzkg==
+typescript@^5.0.0-dev.20221214:
+  version "5.0.0-dev.20221214"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.0-dev.20221214.tgz#848b3bf9406a764a2d2105bcee0ecb7089189263"
+  integrity sha512-sg2HlS57Zxo1AbNpq+lUY9yHR3qA8DmP2nS8KBkvGO86PXCYtWYxkPhbwV8KtAlU50GNmj20fEVJK7kxvZdXfw==
 
 typical@^4.0.0:
   version "4.0.0"
@@ -11263,10 +11263,10 @@ vscode-nls-dev@^3.3.1:
     xml2js "^0.4.19"
     yargs "^13.2.4"
 
-vscode-oniguruma@1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.6.1.tgz#2bf4dfcfe3dd2e56eb549a3068c8ee39e6c30ce5"
-  integrity sha512-vc4WhSIaVpgJ0jJIejjYxPvURJavX6QG41vu0mGhqywMkQqulezEqEQ3cO3gc8GvcOpX6ycmKGqRoROEMBNXTQ==
+vscode-oniguruma@1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz#439bfad8fe71abd7798338d1cd3dc53a8beea94b"
+  integrity sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==
 
 vscode-policy-watcher@^1.1.1:
   version "1.1.1"
@@ -11295,10 +11295,10 @@ vscode-regexpp@^3.1.0:
   resolved "https://registry.yarnpkg.com/vscode-regexpp/-/vscode-regexpp-3.1.0.tgz#42d059b6fffe99bd42939c0d013f632f0cad823f"
   integrity sha512-pqtN65VC1jRLawfluX4Y80MMG0DHJydWhe5ZwMHewZD6sys4LbU6lHwFAHxeuaVE6Y6+xZOtAw+9hvq7/0ejkg==
 
-vscode-textmate@7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-7.0.1.tgz#8118a32b02735dccd14f893b495fa5389ad7de79"
-  integrity sha512-zQ5U/nuXAAMsh691FtV0wPz89nSkHbs+IQV8FDk+wew9BlSDhf4UmWGlWJfTR2Ti6xZv87Tj5fENzKf6Qk7aLw==
+vscode-textmate@8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-8.0.0.tgz#2c7a3b1163ef0441097e0b5d6389cd5504b59e5d"
+  integrity sha512-AFbieoL7a5LMqcnOF04ji+rpXadgOXnZsxQr//r83kLPr7biP7am3g9zbaZIaBGwBRWeSvoMD4mgPdX3e4NWBg==
 
 vscode-uri@^3.0.6:
   version "3.0.6"
@@ -11338,6 +11338,11 @@ watchpack@^2.2.0:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
 
+web-tree-sitter@^0.20.7:
+  version "0.20.7"
+  resolved "https://registry.yarnpkg.com/web-tree-sitter/-/web-tree-sitter-0.20.7.tgz#b0ddb78e8244221a3100f432c7e162516cd9cd09"
+  integrity sha512-flC9JJmTII9uAeeYpWF8hxDJ7bfY+leldQryetll8Nv4WgI+MXc6h7TiyAZASWl9uC9TvmfdgOjZn1DAQecb3A==
+
 webidl-conversions@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
@@ -11669,40 +11674,40 @@ xtend@~2.1.1:
   dependencies:
     object-keys "~0.4.0"
 
-xterm-addon-canvas@0.3.0-beta.27:
-  version "0.3.0-beta.27"
-  resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.3.0-beta.27.tgz#8b530a71473b2c2497e04ae27aa06aba213fef7c"
-  integrity sha512-8NZYm8mZXQms4aIMZFBwufakQQomnvzkwCUw3cPlJ5emErGD7OmXvV9zgJbSmhD1rnLOF5Z8AAIUqIvM3e+KUw==
+xterm-addon-canvas@0.4.0-beta.1:
+  version "0.4.0-beta.1"
+  resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.4.0-beta.1.tgz#f2742b88cd3eb1840b9e7f986c4bfe31e0f4684f"
+  integrity sha512-EfjaN0ujHJ4D8CsVpBig3xPvfRhbzAyOh8piAbNpePZmTpBzc2OQQQvEeklPriKVNDv28WbmY0Zzl5tgYM7vwg==
 
 xterm-addon-search@0.11.0-beta.7:
   version "0.11.0-beta.7"
   resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.11.0-beta.7.tgz#d90bcbe9e8f9238c18ba6145bd7ec2f8e3240052"
   integrity sha512-i/c774V0/Eon3BIFRsRR3OjKTnMGkccBo12yDkOa40tnAD4aa8FjspE3bxW/Hh1mUEhCSgBSLnMDlK/GwnUC+g==
 
-xterm-addon-serialize@0.9.0-beta.3:
-  version "0.9.0-beta.3"
-  resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.9.0-beta.3.tgz#bb4ed416db5748bcbe55a4b6d4c2151368fdae74"
-  integrity sha512-LaFuowtdxNdeuLm+KmtsoR4mgPOLu/I9k0hlWXbzAd1okJhthwMH4Y6cuL0/pFk1AclP5s+L42glv8PV0GnVsg==
+xterm-addon-serialize@0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.9.0.tgz#3eee5f5c34b16e48891ec59b213716bab2354bf4"
+  integrity sha512-qJju2YJFh8c8pbtCYtHaG7gDDHBpDJ4a4JQZvOzuiMxOjgeM1oCnFNjbhzMuK/fOUa59FmvIUGQyqn3WL9q7qw==
 
 xterm-addon-unicode11@0.5.0-beta.5:
   version "0.5.0-beta.5"
   resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.5.0-beta.5.tgz#6992a6f56349e67b903201d52b1ad41ba3469d93"
   integrity sha512-MaqnU34WTHCUAo7moB4KhynGn03RckI0JJ8E/gXe96EzuCP6bVJIKSc5pc9iFeLF4BX1SuemOqIHYl2Q3u3NTA==
 
-xterm-addon-webgl@0.14.0-beta.40:
-  version "0.14.0-beta.40"
-  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.14.0-beta.40.tgz#8152b293c07f921db3a7cd3c4996dfd4d90f340c"
-  integrity sha512-6E3KGqAFkTU6A32c6gUjkwCX+DfohN6y+j1IcTjwh5Cu92TWn4tMr5KwJlaULfmtO0e9BKZlhmucmuHTWi1F9w==
+xterm-addon-webgl@0.15.0-beta.1:
+  version "0.15.0-beta.1"
+  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.15.0-beta.1.tgz#bc3f784c3c467a70542b8a9a8998dbe996287796"
+  integrity sha512-8f4cNXG0+dBMqp+Nvk/ZQ8Wo8s4/KbF24b2VTHTt8DuY5QXt4wSA6+NEdnABV98VYDoHl+KfXl9yyFqkcJYr8Q==
 
-xterm-headless@5.1.0-beta.63:
-  version "5.1.0-beta.63"
-  resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-5.1.0-beta.63.tgz#0b152dbd356fdb2426b387759630946806fb223e"
-  integrity sha512-jNh5ZPQLUUVdAmkjiyhv4XBUWM9WIaz48JwK3fMiZKFYg8+VjN4my+AnoqhMhZy+BOmB+9NWWqb80KTVhQ4GDA==
+xterm-headless@5.2.0-beta.2:
+  version "5.2.0-beta.2"
+  resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-5.2.0-beta.2.tgz#db8d4cc45a2bba062622d7784a2264030aa7d56d"
+  integrity sha512-aP3+K47bJu5AkdtekML5LZZUh/zAkDc5ONNFgQ+7eUBh7RkFy3JYRuaG5Nj3LbdkUMjWqQZXzc3BW5Vo9KQNgA==
 
-xterm@5.1.0-beta.63:
-  version "5.1.0-beta.63"
-  resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.1.0-beta.63.tgz#c811680494922eab873bd36ac6fd9f5404a9e944"
-  integrity sha512-ar7SMARh6j3GUXb4tRgbqAO+kiNu4JTPx5FYXSDHr+HHt0jBgZ+lPh4AqIFwwG1pc90lRx2cvczpE5cJhG9sdw==
+xterm@5.2.0-beta.2:
+  version "5.2.0-beta.2"
+  resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.2.0-beta.2.tgz#67369235a54f41179922e662df40ff4c7c974787"
+  integrity sha512-MRAdWRfV80ae0Q3Caq/mfmCwnZZZ89Z8i/sAleio5g5dpsst9IXc0zeFpPnOvUWmtVy5P1LbfU9YCy47449DWw==
 
 y18n@^3.2.1:
   version "3.2.2"